Commit graph

35823 commits

Author SHA1 Message Date
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
Shariq Ansari
a6515ce489
Merge branch 'frappe:develop' into blog-email-notification 2021-11-17 11:05:27 +05:30
mergify[bot]
6eb8b3e64b
fix: Set assigned_by to interaction_values for ToDos (backport #14932) (#14995)
Co-authored-by: ci2014 <christoph.isik@wpci.de>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-11-17 10:32:02 +05:30
mergify[bot]
5652483176
Merge pull request #14935 from shariquerik/editable-grid-pagination
feat: Editable grid/table pagination
2021-11-17 04:42:00 +00:00
Raffael Meyer
7c0078d8e4
feat: Convenience methods for NestedSet {get_parent, get_children} (#13579)
* feat: new properties `NestedSet.{parent, children}`

* fix: typo

* refactor: remove unused kwargs

* feat: method instead of property

* feat: use generator

* docs: fix docstring to match modified method

* refactor: add type hints

* refactor: type hints as string for compatibility with python <3.7

https://stackoverflow.com/questions/33533148/how-do-i-type-hint-a-method-with-the-type-of-the-enclosing-class

* refactor: import Iterator for type annotation

* refactor: Apply suggestions from code review

Co-authored-by: gavin <gavin18d@gmail.com>

Co-authored-by: gavin <gavin18d@gmail.com>
2021-11-17 04:32:11 +00:00
Aradhya
a3c992bce4 fix: fixed order in get_values tests 2021-11-16 23:41:23 +05:30
Kenneth Sequeira
6ec6fbaa8d
chore: disable eps by default 2021-11-16 23:28:19 +05:30
Aradhya-Tripathi
b081496912 fix: added additional conditions when filters are None 2021-11-16 22:44:51 +05:30
Shariq Ansari
a6cd8e0d8e fix: Added checkbox to enable disable email notification for blog comment and feedback 2021-11-16 16:45:22 +05:30
Pruthvi Patel
0b9a5a4c46 feat: add for query report 2021-11-16 15:27:46 +05:30
Aradhya-Tripathi
09e7af70ab refactor: converted raw queries 2021-11-16 15:12:58 +05:30
Aradhya-Tripathi
6a8515af85 feat: Added pluck to get_values 2021-11-16 15:12:39 +05:30
Aradhya-Tripathi
008954aed8 feat: added Pseudocolumn to qb utils 2021-11-16 15:12:18 +05:30
Rushabh Mehta
76df92ffda
Merge pull request #14985 from shariquerik/feedback-position-fix
fix: Fixed position of feedback(like, comment)
2021-11-16 13:42:56 +05:30
Shariq Ansari
9466b35344 fix: Fixed position of feedback(like, comment) 2021-11-16 13:06:42 +05:30
Rushabh Mehta
f4eff6f7c4
Merge pull request #14614 from shariquerik/new-feedback-comment
refactor: New Feedback & Comment Design for Blog Post
2021-11-16 12:40:35 +05:30