mergify[bot]
|
eabdb84947
|
Merge pull request #10528 from gavindsouza/migrate-to-new-feat
feat(migrate-to): switch Teams and restore existing Sites
|
2020-06-02 06:57:42 +00:00 |
|
sahil28297
|
025af5bbad
|
Merge pull request #10561 from prssanna/date-filters-patch
fix: check if filters exist and is list
|
2020-06-02 11:52:12 +05:30 |
|
prssanna
|
a3bb293def
|
fix: check if filters exist and is list
|
2020-06-02 11:05:15 +05:30 |
|
mergify[bot]
|
c98bfdb1ab
|
Merge pull request #10552 from scmmishra/fix-notification-translation
fix: translate label for open document counts
|
2020-06-01 17:11:45 +00:00 |
|
mergify[bot]
|
3dd424b87a
|
Merge pull request #10554 from gavindsouza/cmd-fix
fix(commands): Handle SiteNotSpecifiedError better
|
2020-06-01 16:55:18 +00:00 |
|
mergify[bot]
|
63d252c69a
|
fix: filter table multiselect fields for filters (bp #10476) (#10557)
* fix: filter table multiselect fields for filters
* Update frappe/public/js/frappe/ui/filters/field_select.js
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
* Update field_select.js
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
(cherry picked from commit 750ea36162b40d2c6cc705678937fd0fce3987cf)
Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
|
2020-06-01 22:22:45 +05:30 |
|
Suraj Shetty
|
075d009e70
|
fix: _assign should also have closed assignments (#10532)
|
2020-06-01 22:05:46 +05:30 |
|
Suraj Shetty
|
f13ea3e878
|
Merge branch 'develop' into fix-notification-translation
|
2020-06-01 22:04:59 +05:30 |
|
mergify[bot]
|
e1f20594a4
|
Merge pull request #10463 from prssanna/date-filters
feat: Date filter improvements
|
2020-06-01 16:30:35 +00:00 |
|
mergify[bot]
|
3f5e90bb09
|
Merge pull request #10543 from prssanna/rename-doc-todo-fix
fix: update assignments on merging docs
|
2020-06-01 16:28:46 +00:00 |
|
Suraj Shetty
|
a7aefdfb88
|
fix: Syntax error
|
2020-06-01 21:13:13 +05:30 |
|
Gavin D'souza
|
9d11f2c44f
|
fix: redo improper merge commit
|
2020-06-01 19:31:41 +05:30 |
|
Gavin D'souza
|
56624996a4
|
Merge branch 'develop' of github.com:frappe/frappe into cmd-fix
|
2020-06-01 19:02:06 +05:30 |
|
Gavin D'souza
|
07c15d0fe1
|
fix: replace terrible code with bad one
|
2020-06-01 18:44:47 +05:30 |
|
mergify[bot]
|
6719904e6e
|
Merge pull request #10382 from gavindsouza/no-site-specified
fix(commands): raise SiteNotSpecifiedError if site not found in context
|
2020-06-01 08:39:02 +00:00 |
|
Shivam Mishra
|
5245119772
|
fix: translate label for open document counts
|
2020-06-01 12:51:14 +05:30 |
|
Gavin D'souza
|
2149283fd1
|
fix: raise SitNotSpecifiedError via get_site
|
2020-06-01 12:43:41 +05:30 |
|
Gavin D'souza
|
079da0b645
|
Merge branch 'develop' of github.com:frappe/frappe into no-site-specified
|
2020-06-01 12:23:16 +05:30 |
|
prssanna
|
59eff3df40
|
Merge branch 'rename-doc-todo-fix' of https://github.com/prssanna/frappe into rename-doc-todo-fix
|
2020-06-01 12:21:09 +05:30 |
|
prssanna
|
f9b8637060
|
fix: remove unused import
|
2020-06-01 12:20:34 +05:30 |
|
Prssanna Desai
|
454a574d43
|
fix: use frappe.as_json
Co-authored-by: gavin <gavin18d@gmail.com>
|
2020-06-01 12:19:04 +05:30 |
|
mergify[bot]
|
246acfc649
|
Merge pull request #10545 from gavindsouza/restore-fix
fix(command): Restore site
|
2020-06-01 06:40:52 +00:00 |
|
Suraj Shetty
|
7aaf15a804
|
Merge branch 'develop' into restore-fix
|
2020-06-01 11:54:52 +05:30 |
|
mergify[bot]
|
90cd0b786b
|
Merge pull request #10292 from prssanna/notification-in-notifications
feat: Show Notification in notifications dropdown
|
2020-06-01 05:35:20 +00:00 |
|
mergify[bot]
|
2441e93dca
|
Merge pull request #10458 from scmmishra/rpay-webhook-verification
feat: added webhook hmac verification
|
2020-06-01 05:28:55 +00:00 |
|
mergify[bot]
|
d3b54e01fb
|
Merge pull request #10542 from netchampfaris/remove-web-page-block-from-website-theme
fix: Remove web page script from Website Theme
|
2020-06-01 05:26:20 +00:00 |
|
prssanna
|
d50070d513
|
fix: fix relative filters test
|
2020-06-01 10:52:07 +05:30 |
|
prssanna
|
b291e0aaa9
|
feat: add timespan option for today
|
2020-06-01 10:52:07 +05:30 |
|
prssanna
|
1b691c799d
|
refactor: refactor get_date_range
|
2020-06-01 10:52:07 +05:30 |
|
prssanna
|
5eceaf5911
|
fix: remove unused import
|
2020-06-01 10:52:07 +05:30 |
|
prssanna
|
3a55ba0d58
|
fix: missing newline
|
2020-06-01 10:52:06 +05:30 |
|
Prssanna Desai
|
55cdd20fea
|
fix: use map to calculate period value
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
|
2020-06-01 10:52:06 +05:30 |
|
prssanna
|
b6acba6446
|
fix(patch): patch to replace filters in user settings
|
2020-06-01 10:52:06 +05:30 |
|
prssanna
|
d9e8b7ef4f
|
fix: handle old date filters in query
|
2020-06-01 10:51:38 +05:30 |
|
prssanna
|
f7f2be5926
|
fix: rename function
|
2020-06-01 10:51:38 +05:30 |
|
prssanna
|
17bb72d234
|
fix: check if filter config exists
|
2020-06-01 10:51:38 +05:30 |
|
prssanna
|
2ebf67af39
|
fix: remove freeze
|
2020-06-01 10:51:38 +05:30 |
|
prssanna
|
548813af69
|
fix: fieldtype doesn't change on condition change
|
2020-06-01 10:51:38 +05:30 |
|
prssanna
|
4b2d730a8c
|
fix: variable naming
|
2020-06-01 10:51:38 +05:30 |
|
prssanna
|
6495ee2426
|
style: fix formatting
|
2020-06-01 10:51:38 +05:30 |
|
prssanna
|
2fcd8c2905
|
fix: move timespan function to data.py
|
2020-06-01 10:51:38 +05:30 |
|
prssanna
|
f0d62d4007
|
fix: all periods in timespan filter
|
2020-06-01 10:51:38 +05:30 |
|
prssanna
|
4c16b2a608
|
feat: api to get additional filters
|
2020-06-01 10:51:38 +05:30 |
|
prssanna
|
53e2e60cab
|
feat: filter for current timespan
|
2020-06-01 10:51:38 +05:30 |
|
Suraj Shetty
|
d29197fd14
|
Merge branch 'develop' into remove-web-page-block-from-website-theme
|
2020-06-01 10:40:47 +05:30 |
|
Mathieu Brunot
|
c8928aa774
|
fix: File upload fallback (#10163)
Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>
|
2020-06-01 10:14:04 +05:30 |
|
mergify[bot]
|
62f1d92966
|
Merge pull request #10233 from gavindsouza/site-wise-logging
feat: Site wise logging
|
2020-06-01 03:49:29 +00:00 |
|
mergify[bot]
|
ab9566c6ff
|
Merge pull request #10473 from prssanna/workflow-action-fix
fix: add update_after_submit to actions while setting workflow state
|
2020-06-01 03:32:02 +00:00 |
|
Suraj Shetty
|
9cc1589926
|
Merge branch 'develop' into workflow-action-fix
|
2020-06-01 08:50:39 +05:30 |
|
Suraj Shetty
|
4e1ad550ec
|
Merge branch 'develop' into rpay-webhook-verification
|
2020-06-01 07:58:04 +05:30 |
|