Commit graph

36088 commits

Author SHA1 Message Date
Mohammed Redah
247bf8f476
Merge branch 'frappe:develop' into develop 2021-11-20 19:01:22 +03:00
Mohammed Redah
ce7392cdc6
fix: Translate Strings 2021-11-20 19:01:05 +03:00
Shariq Ansari
2aa190f865
Merge branch 'frappe:develop' into blog-email-notification 2021-11-20 16:50:42 +05:30
mergify[bot]
4d158b8a8b
Merge pull request #14981 from sumaiya2908/frappe-issue-child-form
fix: parent doctype freezes
2021-11-20 09:33:13 +00:00
Aradhya
ed7b3f54a7 refactor: converted more queries 2021-11-20 15:02:22 +05:30
gavin
cc1ea5e357
Merge pull request #15027 from gavindsouza/update-installed-apps-on-uninstall
fix: Update installed apps on uninstall
2021-11-20 00:50:03 +05:30
Aradhya
ae59fd7c58 feat: added no_order to execute 2021-11-19 22:58:32 +05:30
Suraj Shetty
3c9384b001
Merge pull request #15020 from shariquerik/report-view-export-excel-fix 2021-11-19 11:30:08 +05:30
Daniel Gerhardt
16dca0b1c1 feat: add consecutive calendar week (WW) for naming series
The calendar week is based on ISO 8601 but behaves slightly different
for the first and last days of a year to ensure consecutiveness:

* If the first days of a year would be in week 53 then 00 is used
  instead.
* if the last days of a year would be in week 01 then 53 is used
  instead.

Closes #14413
2021-11-18 17:52:36 +01:00
Aradhya
d37aa55607 fix: fixed merged conflicts 2021-11-18 18:13:10 +05:30
mergify[bot]
a59c37465f
Merge pull request #14967 from Aradhya-Tripathi/at/fixes
fix: fixed list filters in get_values
2021-11-18 12:05:58 +00:00
Ankush Menat
abebd29ef4 test: fix expected failing test 2021-11-18 17:16:20 +05:30
Shariq Ansari
ba7024ca67 fix: deleting group_by argument 2021-11-18 17:11:12 +05:30
mergify[bot]
cbb6712008
Merge pull request #15016 from shariquerik/report-view-empty-result-fix
fix: Only show report when there is data
2021-11-18 11:15:41 +00:00
Ankush Menat
ed312fc22e fix: change subject data type from Data to Text
Subject can be longer than 140 characters. No real reason to restrict it
to arbirary length.

PS: This is done because events are created from other doctypes
automatically and longer subject lines causes a failure where user can't
do much to recover from it.
2021-11-18 15:36:48 +05:30
Shariq Ansari
452146e564 fix: Only show report when there is data(removed from hide_loading_screen method) 2021-11-18 14:13:30 +05:30
Aradhya
fcd480b2a8 refactor: Converted queries in translate 2021-11-18 09:56:41 +05:30
Suraj Shetty
8aaf1b2dd9
Merge pull request #15008 from shariquerik/report-view-mulitple-items-fix 2021-11-17 21:01:48 +05:30
Shariq Ansari
26a49d5f14 fix: moved report view related code to report_view.js 2021-11-17 20:42:31 +05:30
Shariq Ansari
d896aefda8
Merge branch 'frappe:develop' into blog-email-notification 2021-11-17 20:24:38 +05:30
Shariq Ansari
bd61ae4675 fix: only allow group_by for list view data 2021-11-17 20:08:30 +05:30
Ankush Menat
3ee9c0492a
test: print view should not show warning/errors (#14972) 2021-11-17 19:40:38 +05:30
Suraj Shetty
6e7082908a
Merge pull request #15004 from surajshetty3416/fix-theme-issue 2021-11-17 17:55:51 +05:30
Suraj Shetty
58f2296c49 fix: Add fallback to desk theme to avoid failure 2021-11-17 17:52:08 +05:30
Shariq Ansari
34ccabe90e
Merge branch 'frappe:develop' into blog-email-notification 2021-11-17 17:28:14 +05:30
mergify[bot]
b56cb38da2
Merge pull request #15001 from resilient-tech/fix-seen
fix: optimise `mark_email_as_seen`
2021-11-17 11:57:46 +00:00
mergify[bot]
3dd78aa52b
Merge pull request #14997 from shariquerik/report-view-ui-test-fix
test: Cypress test fix for report_view
2021-11-17 11:54:53 +00:00
mergify[bot]
0f411d93af
Merge pull request #15002 from shariquerik/form-ui-broken-fix
fix: Form UI broken
2021-11-17 11:53:49 +00:00
mergify[bot]
4d4e51989d
Merge pull request #14993 from kennethsequeira/dis-eps
fix: Disable EPS by default
2021-11-17 11:45:36 +00:00
Shariq Ansari
0aaf906356 fix: sider fix 2021-11-17 16:46:06 +05:30
Suraj Shetty
4a9e6cfaf9
Merge pull request #14998 from surajshetty3416/sgtpepper9907-develop 2021-11-17 16:38:11 +05:30
Sagar Vora
cb97b49c78 fix: slightly better naming 2021-11-17 16:34:47 +05:30
Shariq Ansari
04b2191926 fix: broken collapsible section, + button missing, misplaced message section 2021-11-17 16:29:14 +05:30
Mitul David
8b343f27d0 fix: Invalid prop - type check failed in ProgressRing 2021-11-17 16:27:46 +05:30
Mitul David
648d24eca5 refactor: Limit file size of uploads by setting max_content_length 2021-11-17 16:26:00 +05:30
Mitul David
7aa578d992 refactor: Display errors in FilePreview 2021-11-17 16:23:45 +05:30
Ankush Menat
673c8baa2a test: fix EPS test after changing default value 2021-11-17 15:53:46 +05:30
Sagar Vora
7b7f74ce23 fix: move commit call to mark_email_as_seen 2021-11-17 15:44:49 +05:30
Ankush Menat
d79450c501
ci: add timeout to CI jobs (#15000)
once a day some job gets stuck and default timeout is 6 hours.

Changed timeout to 1 hour which is 3-4x more than max running time of
all jobs.
2021-11-17 15:37:28 +05:30
Suraj Shetty
8d10356c69
Merge branch 'develop' into sgtpepper9907-develop 2021-11-17 15:31:41 +05:30
Suraj Shetty
fc183e3767 style: Fix formatting issues 2021-11-17 15:31:03 +05:30
Shariq Ansari
a35bce53de
Merge branch 'frappe:develop' into report-view-ui-test-fix 2021-11-17 15:21:22 +05:30
Sagar Vora
a80cf47426 fix: enforce GET method 2021-11-17 14:55:20 +05:30
Sagar Vora
69c87e5cae fix: optimise mark_email_as_seen 2021-11-17 14:49:22 +05:30
Ankush Menat
3be669ed69
feat(ux): option to disable EPS notifications (#14992) 2021-11-17 14:07:20 +05:30
Suraj Shetty
1d8cd8e030 refactor: Revert unnecessary changes and update style 2021-11-17 14:03:02 +05:30
Suraj Shetty
3129e4d8ab feat: Add auto theme switcher
- Removed redundant code
- Added theme mode change listener to update theme realtime
2021-11-17 13:14:54 +05:30
Shariq Ansari
721f6c63da test: report_view.js cypress test fix 2021-11-17 12:54:39 +05:30
Manuel
09ad4478a7
Merge branch 'frappe:develop' into multiple_imap_folder 2021-11-17 08:01:49 +01:00
Suraj Shetty
c422a72875 Merge branch 'develop' of https://github.com/frappe/frappe into sgtpepper9907-develop 2021-11-17 11:10:57 +05:30