Commit graph

24685 commits

Author SHA1 Message Date
Suraj Shetty
6922241d51
Merge branch 'develop' into patch-1 2020-04-25 14:06:25 +05:30
Suraj Shetty
0b6e1cb78e test: Remove unnecessary website visit 2020-04-25 13:59:26 +05:30
Suraj Shetty
01246db252 Merge branch 'update-cypress' of https://github.com/surajshetty3416/frappe into update-cypress 2020-04-25 12:52:22 +05:30
Suraj Shetty
2ed8cacd2f chore: Use chrome browser for test
- Remove unused cypress:run command from package.json
2020-04-25 12:52:14 +05:30
Suraj Shetty
e4a566b877
Merge branch 'develop' into file-permission-fix 2020-04-25 12:40:56 +05:30
Suraj Shetty
cc4e7b4865
Merge branch 'develop' into update-cypress 2020-04-25 12:33:10 +05:30
Suraj Shetty
d1e68d95ad chore: Fix travis config
used https://config.travis-ci.com/explore to verify
2020-04-25 12:17:27 +05:30
Suraj Shetty
1c3077b259
fix: Clear __unsaved flag in insert method (#10094) 2020-04-25 11:56:55 +05:30
Suraj Shetty
6c9b5db2c7 Merge branch 'update-cypress' of https://github.com/surajshetty3416/frappe into update-cypress 2020-04-25 11:56:21 +05:30
Suraj Shetty
15ac34d84f chore: Install chrome to travis 2020-04-25 11:56:08 +05:30
Suraj Shetty
78f2833e64
Merge branch 'develop' into update-cypress 2020-04-25 11:52:31 +05:30
Suraj Shetty
cbaa3b2f8e chore: Use chrome browser for test 2020-04-25 11:48:26 +05:30
Suraj Shetty
6344360132 chore: Cache cypress binary to save time 2020-04-25 11:24:16 +05:30
mergify[bot]
8d8d4afa29
Merge pull request #10087 from scmmishra/remove-red
fix: remove unused red indicator from the legend
2020-04-25 05:43:47 +00:00
mergify[bot]
4bddb0b9f6
Merge pull request #10050 from scmmishra/barcode-width
fix: Override barcode svg width to fit in html area
2020-04-25 05:31:01 +00:00
rohitwaghchaure
9c78c5b564
fix: don't reset the child doc fields value for new record (#10090) 2020-04-25 10:47:13 +05:30
mergify[bot]
ce31e795c9
Merge pull request #10063 from rohitwaghchaure/test-case-for-default-user-permission-develop
fix: added test case for default user permission
2020-04-25 04:09:47 +00:00
Suraj Shetty
e08213e098
Merge branch 'develop' into update-cypress 2020-04-25 09:23:10 +05:30
Suraj Shetty
73c05fbb60
Merge branch 'develop' into test-case-for-default-user-permission-develop 2020-04-25 09:20:20 +05:30
Suraj Shetty
5675144dee
Merge branch 'develop' into file-permission-fix 2020-04-25 09:18:37 +05:30
Suraj Shetty
c0d4d37d9e
Merge branch 'develop' into barcode-width 2020-04-25 09:18:21 +05:30
Faris Ansari
e485439ab7 chore: Install node requirements for python tests 2020-04-25 00:53:11 +05:30
Faris Ansari
77281c6207 fix: tests 2020-04-25 00:43:31 +05:30
Faris Ansari
ebf0e04e5e style: Fix linting errors 2020-04-25 00:15:31 +05:30
Faris Ansari
aeabcfdb02 fix: Merge with new theme changes 2020-04-25 00:08:33 +05:30
Faris Ansari
caa068932c Merge branch 'develop' of https://github.com/frappe/frappe into page-builder-tailwind 2020-04-24 23:48:29 +05:30
Faris Ansari
543bd89475 feat: Extract scripts and render them separately 2020-04-24 23:37:54 +05:30
mergify[bot]
852741581a
Merge pull request #10044 from prssanna/code-expand-button
fix: move expand button after description and change label according to state
2020-04-24 18:03:06 +00:00
Suraj Shetty
92c43f70fb
Merge branch 'develop' into file-permission-fix 2020-04-24 23:17:23 +05:30
Suraj Shetty
2aee5f64ef
Merge branch 'develop' into patch-1 2020-04-24 23:07:12 +05:30
Suraj Shetty
c5b40565a4
Merge branch 'develop' into test-case-for-default-user-permission-develop 2020-04-24 23:05:03 +05:30
mergify[bot]
4e3706763a
Merge pull request #10040 from Thunderbottom/data-validation-fix
fix: skip validation if oldfieldtype is not set to data
2020-04-24 17:26:11 +00:00
mergify[bot]
c4f8471960
Merge pull request #10011 from gavindsouza/update-password
fix: Message on reset password
2020-04-24 17:25:02 +00:00
Faris Ansari
ec79595b69 fix: Add confetti and CTA description to CTA Section 2020-04-24 22:02:39 +05:30
Gavin D'souza
442810e7c0 fix: updated http_status_code and message 2020-04-24 18:33:53 +05:30
Gavin D'souza
e0d9cf50df fix: update password API mapping for /update-password 2020-04-24 18:32:03 +05:30
Rohit Waghchaure
8600e4e150 fix: added test case for default user permission 2020-04-24 18:23:39 +05:30
Rohan Verma
46d35308fe
feat: add support for golang mode in ace-editor
Closes #10088 10088
2020-04-24 18:11:27 +05:30
Rohit Waghchaure
99f818d9fe added donut option in the chart option type 2020-04-24 17:19:48 +05:30
Shivam Mishra
1dfd194b2e fix: remove unused red indicator from the legend 2020-04-24 14:09:41 +05:30
prssanna
b9baa63cfd fix: fix file permissions
Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>
2020-04-24 13:44:41 +05:30
Suraj Shetty
a3b9761f76
style: Fix formatting 2020-04-24 13:43:35 +05:30
Gavin D'souza
a55589ec8d chore: remove unused imports 2020-04-24 13:06:02 +05:30
Gavin D'souza
8144ae3bff style: sort imports 2020-04-24 13:01:13 +05:30
Gavin D'souza
ce4560078a fix: allow truncated image files
Reason: "IOError: broken data stream when reading image file"
Reference: https://github.com/python-pillow/Pillow/issues/1510
2020-04-24 12:58:22 +05:30
Suraj Shetty
723eb6e6c3
Merge branch 'develop' into barcode-width 2020-04-24 12:06:28 +05:30
Suraj Shetty
d678fc62ab
fix: Clear __unsaved flag after document save (#10082) 2020-04-24 11:25:36 +05:30
Suraj Shetty
c3519b5a12
fix: Do not check for module for custom doctypes (#10081) 2020-04-24 10:31:08 +05:30
Suraj Shetty
4a5c7bd025
Merge branch 'develop' into barcode-width 2020-04-23 21:49:50 +05:30
Faris Ansari
422f8d2123 fix: Better styling for smaller breakpoints
- Add extra large breakpoint
2020-04-23 21:38:55 +05:30