Commit graph

33415 commits

Author SHA1 Message Date
Suraj Shetty
70e4b8a459 fix: Use different key for RTL assets 2021-07-05 14:39:46 +05:30
Suraj Shetty
6df9fd2bf8 fix: Build asset file from results sequentially 2021-07-05 14:10:51 +05:30
Suraj Shetty
3d3d8bdfca Merge branch 'develop' of https://github.com/frappe/frappe into auto-generate-rtl-style 2021-07-05 12:04:04 +05:30
gavin
cd98d88a9f
Merge pull request #13646 from frappe/mergify/bp/develop/pr-13628
fix(Workspace): Pass doctype info for link item (backport #13628)
2021-07-05 10:57:23 +05:30
Gavin D'souza
bdfb53a50c fix(Workspace): Pass doctype info for link item
Without item.doctype, url for non standard reports in workspace cards doesn't set properly since doctype value is unidentified

Sometimes, the whole workspace won't render because slug function breaks while recieving undefined object

(cherry picked from commit 689e38b8610cc9e0b9b738d2774d0daa193dc309)
2021-07-05 05:16:21 +00:00
Suraj Shetty
4ddf8c18d8 feat: Execute separate build command for style files
- Execute style build twice (one for LTR and one for RTL) because rtlcss is dependant on comments and esbuild strips all comments so we cannot run rtlcss on built css files.
2021-07-05 10:38:55 +05:30
Suraj Shetty
4420ed1b20
Merge pull request #13641 from surajshetty3416/fix-minified-js-load 2021-07-03 14:40:35 +05:30
Suraj Shetty
fccd19a44c test: Add test to validate minified js load 2021-07-03 14:13:16 +05:30
Suraj Shetty
508f47e871 fix: Minified js load 2021-07-03 14:13:02 +05:30
Leela vadlamudi
f69615ac76
Merge pull request #13637 from leela/revert/prssanna/amended-doc-naming
fix: Revert "Merge pull request #13244 from prssanna/amended-doc-naming"
2021-07-02 18:10:53 +05:30
leela
f31d01a2a6 Revert "Merge pull request #13244 from prssanna/amended-doc-naming"
This reverts commit 58b95662c2, reversing
changes made to c553b7e23a.
2021-07-02 17:43:16 +05:30
mergify[bot]
dede680ceb
Merge pull request #13567 from alyf-de/bench_version_branch_commit
feat: print branch and commit on `bench version`
2021-07-02 08:24:55 +00:00
Leela vadlamudi
1e42272b32
Merge pull request #13575 from alyf-de/translate_connection_group_label
feat: translate connection group label
2021-07-02 13:39:24 +05:30
Leela vadlamudi
4d2a686960
Merge pull request #13500 from sunnyakaxd/develop
fix: Remove meta from pickling overhead
2021-07-02 13:36:48 +05:30
Leela vadlamudi
038649489e
Merge pull request #13632 from leela/remove-unnecessaty-imports
fix: remove not needed six import
2021-07-02 11:27:04 +05:30
leela
3552132789 fix: remove not needed six import 2021-07-02 11:25:20 +05:30
Leela vadlamudi
58b95662c2
Merge pull request #13244 from prssanna/amended-doc-naming
refactor: set amended docname to original docname
2021-07-02 11:23:10 +05:30
Leela vadlamudi
4800ee8725
Merge branch 'develop' into amended-doc-naming 2021-07-02 10:47:47 +05:30
Suraj Shetty
c553b7e23a
Merge pull request #13631 from surajshetty3416/fix-website-base-template 2021-07-02 09:17:16 +05:30
Suraj Shetty
4363e51c6d test: Fix improper tests for website rendering 2021-07-01 22:10:02 +05:30
Suraj Shetty
a93bb67030 test: Add test case to validate raw file load 2021-07-01 22:08:15 +05:30
Suraj Shetty
02e735da8e fix: Do not set base template for resource 2021-07-01 22:06:26 +05:30
gavin
3e92cf2f0e
Merge pull request #13619 from gavindsouza/hide-attachment-cond-dev
fix: Hide "Attach File" in form if max limit reached
2021-07-01 17:07:19 +05:30
gavin
f082db0a90
Merge pull request #13621 from frappe/dependabot/npm_and_yarn/socket.io-parser-3.3.2
chore(deps): [security] bump socket.io-parser from 3.3.0 to 3.3.2
2021-07-01 13:47:16 +05:30
gavin
4d36821273
Merge pull request #13617 from gavindsouza/safe-web-view-routes
fix: Safe checks while setting doctypes_with_web_view cache
2021-07-01 13:42:05 +05:30
Ankush
d58d2ac77f
ci(cypress): use env variable for key (#13616)
documentation ref: https://docs.cypress.io/guides/guides/command-line#cypress-run
2021-06-30 23:05:05 +05:30
dependabot-preview[bot]
fd51ba7fcc
chore(deps): [security] bump socket.io-parser from 3.3.0 to 3.3.2
Bumps [socket.io-parser](https://github.com/socketio/socket.io-parser) from 3.3.0 to 3.3.2. **This update includes a security fix.**
- [Release notes](https://github.com/socketio/socket.io-parser/releases)
- [Changelog](https://github.com/socketio/socket.io-parser/blob/3.3.2/CHANGELOG.md)
- [Commits](https://github.com/socketio/socket.io-parser/compare/3.3.0...3.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-30 16:58:54 +00:00
Gavin D'souza
3d36b67152 fix: Hide "Attach File" in form if max limit reached 2021-06-30 17:36:27 +05:30
gavin
dc514905f2
chore: Update CODEOWNERS 2021-06-30 15:49:14 +05:30
Gavin D'souza
6bb96419d4 fix: Safe checks while setting doctypes_with_web_view cache 2021-06-30 15:29:49 +05:30
gavin
a919761d8e
Merge pull request #13612 from marination/premature-commit-in-communication-develop
fix: Premature commit via notification's `send_an_email`
2021-06-30 11:56:34 +05:30
marination
36a3504b29 fix: Premature commit via notification's send_an_email 2021-06-30 11:07:43 +05:30
gavin
cceb44a7db
Merge pull request #13606 from conncampbell/12928-OTPLoginFix
fix: OTP login verification fails
2021-06-30 11:04:18 +05:30
gavin
117a729c8d
refactor(minor): login-content template
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-06-30 10:51:44 +05:30
Suraj Shetty
866c201fdc
Merge pull request #13503 from frappe/barredterra-patch-1 2021-06-29 10:53:38 +05:30
mergify[bot]
cfd1fac937
Merge pull request #13583 from leela/fix-workspace-loading-error
fix: workspace loading error
2021-06-29 05:11:21 +00:00
Suraj Shetty
2435d8a2e5 Merge branch 'develop' of https://github.com/frappe/frappe into auto-generate-rtl-style 2021-06-29 10:38:39 +05:30
mergify[bot]
cbfc0e6102
Merge pull request #13515 from hasnain2808/fix--route-to-orignal-form-after-creating-a-link-field
fix: route to orignal form after creating a new document
2021-06-29 04:29:52 +00:00
Suraj Shetty
c498562e3f
Merge branch 'develop' into barredterra-patch-1 2021-06-28 19:34:26 +05:30
mergify[bot]
744cc921a8
Merge pull request #13482 from rtdany10/patch-2
fix: ability to select email account even if only one account is allowed
2021-06-28 14:03:30 +00:00
Suraj Shetty
714b121e39
Merge pull request #13596 from surajshetty3416/fix-website-rendering
fix: Prioritse TemplatePage over ListPage
2021-06-28 18:20:17 +05:30
mergify[bot]
acf8ca79d9
Merge pull request #13593 from nextchamp-saqib/grid-depends-on-fix-2
fix: incorrect depends on evalutation with parent variables
2021-06-28 11:47:33 +00:00
Suraj Shetty
44536fac49 fix: Prioritse TemplatePage over ListPage 2021-06-28 15:53:34 +05:30
Suraj Shetty
d9962370dc fix: Add language to print_template 2021-06-28 12:06:26 +05:30
Suraj Shetty
31d8436979 refactor: Rename dir to layout_direction
- For readability
2021-06-28 12:04:57 +05:30
Suraj Shetty
6960a19208 fix: RTL for print views 2021-06-28 12:03:31 +05:30
Suraj Shetty
30f9207091 feat: Select css-rtl folder if language is rtl 2021-06-28 12:03:00 +05:30
Saqib Ansari
1f5bcd42ab fix: incorrect depends on evalutation with parent variables 2021-06-28 11:21:52 +05:30
Suraj Shetty
3fe02d2222
Merge branch 'develop' into fix-workspace-loading-error 2021-06-27 11:29:03 +05:30
Suraj Shetty
2e35ac80ba
Merge pull request #13589 from surajshetty3416/fix-styles-27-jun 2021-06-27 11:27:31 +05:30