Commit graph

34362 commits

Author SHA1 Message Date
Suraj Shetty
a9e0ff548e
Merge branch 'develop' into folder-navigation 2021-08-25 13:11:43 +05:30
Suraj Shetty
b0e1802936
Merge branch 'develop' into dashboard-links 2021-08-25 13:11:03 +05:30
Suraj Shetty
30f5edf1bc
Merge branch 'develop' into cli 2021-08-25 13:10:11 +05:30
Suraj Shetty
2e12a10cc8
Merge pull request #14037 from surajshetty3416/fix-flaky-timeline-email-tests
test: Fix flaky test in timeline_email.js
2021-08-25 13:08:12 +05:30
Faris Ansari
ebfe4c2fd4
Merge pull request #14038 from shariquerik/wspace-patch-fix
patch: set title as label if extends is empty
2021-08-25 13:05:08 +05:30
shariquerik
82c354e918 fix: updated patch 2021-08-25 13:03:40 +05:30
shariquerik
4a468c14d3 fix: updated pah 2021-08-25 13:02:27 +05:30
shariquerik
2865b35673 patch: set title as label if extends is empty 2021-08-25 12:43:03 +05:30
Gavin D'souza
e01ef7ff52 ci(roulette): Use GitHub REST to figure out changed files 2021-08-25 12:40:44 +05:30
Suraj Shetty
004891237e test: Fix flaky timeline_email tests 2021-08-25 12:34:48 +05:30
Gavin D'souza
8ba8d97f53 Merge branch 'develop' into img-processing-changes 2021-08-25 12:12:46 +05:30
Gavin D'souza
75ff78e6bd fix(File): Remove extra API endpoint
Got rid of frappe.core.doctype.file.file.optimize_saved_image in favour
of whitelisted Document Action File.optimize_file
2021-08-25 12:03:33 +05:30
Gavin D'souza
bc596e9681 fix: Revert file on disk if rolledback 2021-08-25 11:45:00 +05:30
mergify[bot]
efde73e3dd
Merge pull request #13956 from nextchamp-saqib/form-tour-fix-2
fix: dom element for sections breaks in form tours
2021-08-25 06:07:19 +00:00
Suraj Shetty
91b01ca18f
Merge pull request #14034 from surajshetty3416/fix-ui-flaky-tests 2021-08-25 11:37:09 +05:30
Gavin D'souza
0611c1698f refactor: File.optimize_file
Simplified method logic
2021-08-25 11:34:05 +05:30
Suraj Shetty
c07298648a test: Blur the phone_nos field to enable validation for the field 2021-08-25 10:49:37 +05:30
ChillarAnand
32759cfc90 fix: Passed failfast flag to unit test runner in all scenarios 2021-08-25 08:03:48 +05:30
mergify[bot]
87dee056fd
Merge pull request #13999 from netchampfaris/fix-system-console-ux
fix(ux): Disable button while executing script
2021-08-24 16:39:46 +00:00
Suraj Shetty
7988ea37f6
Merge branch 'develop' into fix-system-console-ux 2021-08-24 21:32:32 +05:30
Gavin D'souza
597d237f63 ci: Roulette for GHA 2021-08-24 20:41:24 +05:30
Suraj Shetty
b6f3cec3df
Merge pull request #14028 from surajshetty3416/fix-remove-all-import
fix: Use remove_all in file_manager.py
2021-08-24 16:21:04 +05:30
Suraj Shetty
311ca57cd8
Merge branch 'develop' into form-tour-fix-2 2021-08-24 14:36:25 +05:30
Suraj Shetty
af93d35471 fix: Use remove_all in file_manager.py 2021-08-24 14:33:53 +05:30
gavin
fedadee657
Merge pull request #14026 from frappe/revert-13932-ignore_js_in_ci
Revert "ci: ignore js only changes while running unittests"
2021-08-24 13:41:18 +05:30
gavin
850939ed13 Revert "ci: ignore js only changes while running unittests (#13932)"
This reverts commit ead26527b7.
2021-08-24 13:26:03 +05:30
Suraj Shetty
5bf5e70991
Merge pull request #13996 from surajshetty3416/core-test-coverage-1 2021-08-24 11:47:47 +05:30
Suraj Shetty
14783a1ba1 fix: Remove unnecessary raise after throw 2021-08-24 10:25:33 +05:30
Suraj Shetty
9797c1ad18
Merge branch 'develop' into core-test-coverage-1 2021-08-24 10:23:24 +05:30
Shariq Ansari
7caae74004
build: Update datatable to 1.15.4 (#14016)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-08-24 10:15:37 +05:30
mergify[bot]
c5aa876724
Merge pull request #13978 from shariquerik/workspace-2-fixes
fix: Workspace 2.0 Miscellaneous Fixes
2021-08-24 04:24:56 +00:00
Rushabh Mehta
52d58ae958
Merge pull request #14020 from rmehta/login-page-options
feat(minor): Added app_name and app_logo in Website Settings
2021-08-23 21:45:01 +05:30
Rushabh Mehta
70899a7a95 feat(minor): Added app_name and app_logo in Website Settings 2021-08-23 21:43:29 +05:30
Suraj Shetty
3819e4caf3
Merge branch 'develop' into workspace-2-fixes 2021-08-23 15:00:13 +05:30
shariquerik
7e9b78bf7d test: Type on focused block fix 2021-08-23 13:45:14 +05:30
Suraj Shetty
30f9572122
chore: Let maintainer raise a PR on stable branch 2021-08-23 12:32:14 +05:30
mergify[bot]
257b41dcee
Merge pull request #13822 from resilient-tech/fix-inbox
fix: multiple issues with Email Inbox
2021-08-23 06:09:24 +00:00
mergify[bot]
7c178ae18c
fix(ux): better message for removal of assignment (#14008)
(cherry picked from commit 40352d9df6418e0c435e0ae9f9dd8f96095c70db)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-08-23 11:28:33 +05:30
shariquerik
d01335ab91 fix: Faulty Export All rows visibility condition 2021-08-23 11:26:43 +05:30
MitulDavid
cc5a23411b refactor: Image cropping and optimization 2021-08-23 11:15:02 +05:30
Suraj Shetty
743e361449
Merge branch 'develop' into core-test-coverage-1 2021-08-23 11:02:50 +05:30
Deepesh Garg
cd9b07b3bb test: Add test case for docfield length property update 2021-08-21 19:07:44 +05:30
Deepesh Garg
80be431478 Merge branch 'develop' of https://github.com/frappe/frappe into custom_doctype_length 2021-08-21 18:33:21 +05:30
Faris Ansari
399629da45 fix(ux): Disable button while executing script
- page.set_action will now pass the btn in the handler callback
2021-08-21 13:47:42 +05:30
Suraj Shetty
5587ab5a91 style: Fix liinter warnings 2021-08-20 23:54:42 +05:30
Suraj Shetty
9e4c8cc28e chore: Remove commented text 2021-08-20 23:35:55 +05:30
Suraj Shetty
6f72e79f1a test: Add more assertions for reset password 2021-08-20 22:35:01 +05:30
Suraj Shetty
9781fb758f fix: Rate limiter to allow kwargs 2021-08-20 22:06:50 +05:30
gavin
d3f3df2ce1
Merge pull request #13984 from gavindsouza/newsletter-unset-autocommit
fix: Revert auto_commit after frappe.sendmail
2021-08-20 16:23:48 +05:30
gavin
3198ab8249
Merge pull request #13985 from gavindsouza/use-db_delete
refactor(minor): Use frappe.db.delete instead of frappe.db.sql queries
2021-08-20 16:21:13 +05:30