Commit graph

24597 commits

Author SHA1 Message Date
Suraj Shetty
dbee5931d2 test: Fix form.js test
- By waiting for form save
2020-04-25 16:18:10 +05:30
Suraj Shetty
8dbc7ecff4 test: Force weblink input 2020-04-25 15:26:59 +05:30
Suraj Shetty
ba9b8a4060 test: Remove unnecessary website page visit 2020-04-25 14:55:12 +05:30
Suraj Shetty
6ecd83a27d test: Add type delay while typing file-web-link 2020-04-25 14:24:34 +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
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
c0d4d37d9e
Merge branch 'develop' into barcode-width 2020-04-25 09:18:21 +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
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
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
Shivam Mishra
1dfd194b2e fix: remove unused red indicator from the legend 2020-04-24 14:09:41 +05:30
Suraj Shetty
a3b9761f76
style: Fix formatting 2020-04-24 13:43:35 +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
Suraj Shetty
5bb787ef94
Merge branch 'develop' into update-cypress 2020-04-23 20:42:51 +05:30
Suraj Shetty
9122866c62
fix: Consider __unsaved flag while getting doc as_dict (#10067)
Co-authored-by: Prssanna Desai <prssud@gmail.com>

Co-authored-by: Prssanna Desai <prssud@gmail.com>
2020-04-23 20:38:33 +05:30
Chinmay Pai
0296908f18
fix: only allow ldap reset password for system manager (#10076)
* fix: only allow ldap reset password for system manager

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* chore: only check for system manager

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* fix: Syntax error

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-04-23 17:52:15 +05:30
Suraj Shetty
22f4a074cf chore: Update cypress
- To leverage testing performance enhancements made in cypress v3.3.0

https://www.cypress.io/blog/2019/05/22/how-we-improved-network-speed-by-300-in-cypress-3-3-0/
2020-04-23 14:41:50 +05:30
Suraj Shetty
b2a8d1ee8f
Merge branch 'develop' into barcode-width 2020-04-23 13:46:47 +05:30
mergify[bot]
6a75ae229d
Merge pull request #10068 from ruchamahabal/fix-migrate
fix(minor): Value Error during importing or exporting doc files in migrate
2020-04-23 08:15:23 +00:00
mergify[bot]
20083c743e
Merge pull request #10065 from Thunderbottom/site-based-logging
feat: Separate frappe log by site
2020-04-23 08:00:41 +00:00
Rucha Mahabal
8c63e4de2e fix(minor): Value Error during importing or exporting document files in migrate 2020-04-23 01:49:43 +05:30
Chinmay D. Pai
1bd5c916ce
chore: separate frappe log by site
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-22 16:23:02 +05:30
mergify[bot]
c3befc5652
Merge pull request #10053 from Thunderbottom/version-upgrade-check-fix
fix: compare and sort release list to get latest release
2020-04-22 10:50:31 +00:00
mergify[bot]
fad6c59a98
Merge pull request #10034 from surajshetty3416/fix-print-format-builder
fix(print-format-builder): Retain customisation
2020-04-22 09:19:10 +00:00
Suraj Shetty
7b41e942f1
Merge pull request #10027 from surajshetty3416/fix-prepared-report-creation
fix: Translate only if column label exists
2020-04-22 14:46:29 +05:30
mergify[bot]
ff523c8341
Merge pull request #9974 from gavindsouza/email-domain-fixes
fix: Attribute errors and better msgprint
2020-04-22 09:09:54 +00:00
Chinmay D. Pai
96c5162c7e
fix: compare and sort release list to get latest release
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-22 14:18:38 +05:30
mergify[bot]
b18f7866d9
Merge pull request #10046 from rohitwaghchaure/fixed-user-permissions-issue-develop
fix: ignore user permissions not working from the JS side
2020-04-22 08:41:53 +00:00