Commit graph

25751 commits

Author SHA1 Message Date
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
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
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
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
prssanna
b8a3f53c3c fix: fix translation syntax 2020-05-31 22:48:35 +05:30
prssanna
e6f9e7fe39 fix: unused import 2020-05-31 22:45:56 +05:30
prssanna
73d3d1f409 fix: pass attached_doc to doc 2020-05-31 22:43:14 +05:30
prssanna
bc7ffcab21 hide sidebar in notification log 2020-05-31 22:37:37 +05:30
prssanna
5dcc36d145 fix: remove create and write permission for notification log 2020-05-31 22:30:52 +05:30
prssanna
809937dfae fix: rename argument 2020-05-31 22:19:08 +05:30
prssanna
6c500c463e fix: delete unused field 2020-05-31 22:18:30 +05:30
sahil28297
1026272328
Merge pull request #10541 from scmmishra/breadcrumb-fix-desk
fix: breadcrumb routing bug for desk pages
2020-05-31 13:54:11 +05:30
mergify[bot]
1df1abf4f9
Merge pull request #10540 from gavindsouza/dont-always-be-runnin-travis
perf: We don't need to run Cypress tests for a README update
2020-05-30 15:30:06 +00:00
mergify[bot]
33882c0bf2
Merge pull request #10547 from theopen-institute/oi-custom-field-warning
fix(custom): Added warning if field with same fieldname already exists
2020-05-30 10:46:06 +00:00
mergify[bot]
57431df6d1
Merge pull request #10537 from scmmishra/fix-apply-filter-when-routing
fix: shortcut routing and filters
2020-05-30 09:54:05 +00:00
prssanna
6b2efc5f5d fix: fix translation syntax 2020-05-30 14:51:48 +05:30
theopen-institute
e8a0b5b873
Update frappe/custom/doctype/custom_field/custom_field.py
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2020-05-30 14:34:27 +05:45
theopen-institute
b1dd6f8545 Added warning if field with same fieldname already exists in doctype when creating custom field 2020-05-30 07:34:51 +05:45
Gavin D'souza
1f329a5c46 fix: maintain path for files in args and remove temporary files only 2020-05-29 19:35:41 +05:30
Gavin D'souza
2e5740682b fix: maintain original file of .gz to uncompress 2020-05-29 18:28:51 +05:30
Gavin D'souza
e3ae498e4d fix: fixed imports 2020-05-29 17:45:43 +05:30
Gavin D'souza
56eba9cb5d fix: handle SiteNotSpecifiedError in passcontext 2020-05-29 17:37:35 +05:30
Gavin D'souza
a3d64fb4c5 fix: use fallback attr for web logging 2020-05-29 16:51:07 +05:30
Gavin D'souza
d13a217db8 fix: check if request status code is ok instead of specific codes 2020-05-29 16:46:13 +05:30
prssanna
12f9e9f4c1 fix: separate channel for system notifications 2020-05-29 16:35:50 +05:30
Gavin D'souza
fe387a24d8 fix: synatx errors from manual bash script runs 2020-05-29 16:31:49 +05:30
Gavin D'souza
000864b12c chore: travis builds as needed
Co-authored-by Suraj Shetty <surajshetty3416@gmail.com>
2020-05-29 16:16:40 +05:30
Faris Ansari
95bfedfff5 fix: Remove web page script from Website Theme 2020-05-29 15:16:46 +05:30
Shivam Mishra
71442033c4 fix: breadcrumb routing bug for desk pages 2020-05-29 15:14:18 +05:30
Gavin D'souza
f71585ec74 Merge branch 'develop' of github.com:frappe/frappe into site-wise-logging 2020-05-29 14:56:29 +05:30
Shivam Mishra
55aca943c3 feat: make verification function python 3 only 2020-05-29 14:09:19 +05:30
Shivam Mishra
2ef76f2572 style: linting fixes 2020-05-29 13:24:04 +05:30
Shivam Mishra
5e7fcb46f2 refactor: use six instead of sys.version_info 2020-05-29 13:22:52 +05:30
Faris Ansari
a7f941bcd9
fix: Better logging if form script handler throws (#10536) 2020-05-29 13:17:14 +05:30
Shivam Mishra
a6bf1bd979 fix: don't show count for empty filter 2020-05-29 13:14:40 +05:30
Shivam Mishra
5793be6565
chore: cleanup website desk pages (#10519) 2020-05-29 13:11:26 +05:30
Shivam Mishra
447b3f65c8 feat: minor linting fixes 2020-05-29 13:05:51 +05:30
Shivam Mishra
b3e22411b9 fix: save filter JSON only if it is not empty 2020-05-29 13:01:01 +05:30