Commit graph

24307 commits

Author SHA1 Message Date
Suraj Shetty
d93f8d8f3f
style: Remove unused import 2020-04-10 22:07:03 +05:30
Suraj Shetty
9a3c8aaee5
Merge branch 'develop' into feat-frontmatter 2020-04-10 22:03:09 +05:30
Suraj Shetty
a3dda3b8ff
Merge pull request #9899 from Thunderbottom/email-group-fix
fix: set welcome_email to None if template not found
2020-04-10 20:50:32 +05:30
Suraj Shetty
a02e940aac
Merge pull request #9896 from scmmishra/schema-breadcrumb
feat: use schema.org specs for breadcrumb meta
2020-04-10 20:20:32 +05:30
Suraj Shetty
ba8294ac4f
Merge branch 'develop' into schema-breadcrumb 2020-04-10 18:50:28 +05:30
Suraj Shetty
07bdf24e2e
Merge branch 'develop' into schema-breadcrumb 2020-04-10 18:49:54 +05:30
Shivam Mishra
46d1704f68
Merge pull request #9817 from scmmishra/desk-user-custom
feat: allow users to customize desk
2020-04-10 18:49:00 +05:30
Suraj Shetty
c8cdbf8a36
chore: Remove Backport Github Action
Because it does not work
2020-04-10 18:47:26 +05:30
Shivam Mishra
c03e11d254 fix: shortcut routing for new reports 2020-04-10 18:14:58 +05:30
Shivam Mishra
d4e6b89863 Merge branch 'develop' of github.com:frappe/frappe into desk-user-custom 2020-04-10 15:48:53 +05:30
Chinmay D. Pai
9df69d214c
fix: set welcome_email to None if template not found
fixes UnboundLocalError: welcome_email referenced before assignment

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-10 15:42:58 +05:30
Abhishek Kedar
5d92e7cf9f
fix: checking value of send_welcome_email (#9888)
* checking value of send_welcome_email

If send_welcome_email is set to 0 still it is triggering send_welcome_mail_to_user(). Need to check if send_welcome_email=1.
This is required.

* fix: cint(self.send_welcome_email) in user.py

Instead of checking self.send_welcome_email==1 used cint(self.send_welcome_email

Co-Authored-By: Chinmay Pai <chinmaydpai@gmail.com>

* chore: remove list from kwargs

Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2020-04-10 15:30:09 +05:30
Shivam Mishra
7a47659360 feat: use schema.org specs for breadcrumb meta 2020-04-10 15:24:42 +05:30
Shivam Mishra
a0f545bfa3 feat: add label field to options 2020-04-10 15:00:26 +05:30
Shivam Mishra
fae6ade6ae fix: section label for shortcuts 2020-04-10 14:51:29 +05:30
Shivam Mishra
bd070fd35e fix: remove unused variable 2020-04-10 14:47:33 +05:30
Shivam Mishra
0888424506 style: fix mixed spaces and tabs 2020-04-10 14:28:42 +05:30
Shivam Mishra
aa489186c6 feat: use eslint version 9 2020-04-10 14:25:12 +05:30
Shivam Mishra
458efd262d feat: remove unused variable 2020-04-10 14:24:59 +05:30
Shivam Mishra
5bc92adf6b style: fixes for better readability 2020-04-10 14:14:06 +05:30
Shivam Mishra
09be938b2f fix: use tabs 2020-04-10 14:08:54 +05:30
Shivam Mishra
96d131f832 fix: typos in docstrings 2020-04-10 14:08:30 +05:30
Shivam Mishra
466bed1a72 feat: excpet specific exception 2020-04-10 14:06:54 +05:30
Shivam Mishra
dd22f861a2 style: reduced verbosity 2020-04-10 14:03:29 +05:30
Shivam Mishra
58cff66417 style: fix indentations 2020-04-10 13:53:12 +05:30
Shivam Mishra
e500c82cdf style: use tabs 2020-04-10 13:51:28 +05:30
Shivam Mishra
798b8346b5 fix: remove exception added for testing 2020-04-10 13:50:36 +05:30
Shivam Mishra
d465fadd30 style: add space before title 2020-04-10 13:47:56 +05:30
Shivam Mishra
a22b15897c feat: add error logging to saving logic 2020-04-10 13:45:34 +05:30
mergify[bot]
428cfa3b25
Merge pull request #9815 from frappe/dependabot/pip/bleach-3.1.4
chore(deps): bump bleach from 3.1.2 to 3.1.4
2020-04-10 07:58:55 +00:00
Suraj Shetty
66448c5877
Merge pull request #9889 from surajshetty3416/handle-invalid-dates
fix: Handle invalid date parsing
2020-04-10 13:02:16 +05:30
Shivam Mishra
51259f1fa9 fix: update rule to apply only ot widget title 2020-04-10 12:59:59 +05:30
Shivam Mishra
42807b9844 fix: typo in function name 2020-04-10 12:56:23 +05:30
Shivam Mishra
605fa21888 refactor: use css rule to style icons 2020-04-10 12:55:02 +05:30
Shivam Mishra
27555d3c13 fix (linting): fix missing semi-colon and unused variable 2020-04-10 12:52:22 +05:30
Shivam Mishra
94c7c66608 feat: use this.editing flag 2020-04-10 12:45:24 +05:30
Shivam Mishra
777a9759f5 Merge branch 'desk-translate' into desk-user-custom 2020-04-10 12:43:31 +05:30
Gavin D'souza
2c1ffaae9c fix(test): update test for updated bleach behaviour
bug report: https://bugzilla.mozilla.org/show_bug.cgi?id=1623633
2020-04-10 12:13:48 +05:30
Shivam Mishra
a60ca51bd8 style: added this.editing flag 2020-04-10 12:13:48 +05:30
Shivam Mishra
ef4f7a91f7 fix: label not updating bug 2020-04-10 11:46:14 +05:30
Shivam Mishra
2a58e27335 Merge branch 'desk-user-custom' of github.com:scmmishra/frappe into desk-user-custom 2020-04-10 11:30:56 +05:30
Shivam Mishra
523292bd42 fix: add widget dialog not working for reports and pages 2020-04-10 11:30:18 +05:30
Shivam Mishra
92eb029cc6 fix: send is_query_report label to generating route 2020-04-10 11:29:57 +05:30
Shivam Mishra
705455b0b2 feat: truncate label 2020-04-10 11:29:33 +05:30
Gavin D'souza
608243b165 chore(deps): bump PyYAML to 5.3.1 2020-04-10 11:16:34 +05:30
gavin
b483c5c3c2
chore: update deprecated yaml API
Ref: https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation

Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-04-10 11:15:34 +05:30
Suraj Shetty
ad95fbf519 fix: Handle invalid date parsing 2020-04-10 10:17:01 +05:30
mergify[bot]
ba6415a88b
Merge pull request #9859 from Thunderbottom/newsletter-fix
fix: update newsletter status on sending
2020-04-10 03:26:27 +00:00
Suraj Shetty
e636e2a29a
Merge pull request #9857 from prssanna/sidebar-group-by-fix
fix: remove field if no docfield exists
2020-04-09 20:49:47 +05:30
Chinmay Pai
ad71b6804f
chore: use orm instead of sql
Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-04-09 20:18:55 +05:30