Commit graph

21446 commits

Author SHA1 Message Date
mergify[bot]
f7eac203ca
Merge pull request #8322 from netchampfaris/reload-doctype-is-tree
fix(patch): Reload doctype
2019-09-03 06:28:41 +00:00
Faris Ansari
3ff9b0478f fix(patch): Reload doctype
To reload the new docfield `is_tree` introduced via  #8312
2019-09-03 11:44:05 +05:30
mergify[bot]
52504d73cb
Merge pull request #8319 from surajshetty3416/fix-events
fix: Load doc before save in db_set as well
2019-09-03 05:38:43 +00:00
Suraj Shetty
9068c17c61
Merge pull request #8162 from govindsmenokee/patch-6
fix: 2FA qrcode generation error
2019-09-03 10:56:24 +05:30
Suraj Shetty
bbfc4a9069 fix: Load doc before save in db_set as well
- Because db_set internally triggers on_change event
and on_change handlers might expect doc_before_save.
2019-09-03 08:37:11 +05:30
Faris Ansari
cdc5b2e752
fix: Ending div tag in footer_items.html 2019-09-02 23:41:13 +05:30
Saurabh
99671a4604 fix: handle data too long exception (#8292) 2019-09-02 23:30:10 +05:30
mergify[bot]
a9848ce333
Merge pull request #8316 from hrwX/patch-contacts-fix
fix(patch): use meta instead of version
2019-09-02 17:59:35 +00:00
Himanshu
5b1938afdd feat(Comments): add images in comments (#8283)
* feat: add images in comments

* fix: use extract images
2019-09-02 23:28:05 +05:30
Himanshu Warekar
d96b08d9c8 fix: use meta instead of version 2019-09-02 21:53:00 +05:30
mergify[bot]
317f64675f
Merge pull request #8269 from ernestoruiz89/patch-5
fix: Add translation function to string (develop)
2019-09-02 12:48:05 +00:00
mergify[bot]
d2c4090069
Merge pull request #8312 from netchampfaris/nested-set-doctype-configuration
feat: Create NestedSet doctypes via configuration
2019-09-02 12:42:24 +00:00
mergify[bot]
c8ee0c6815
Merge pull request #8239 from scmmishra/upload-guest-fix
refactor: allow guests to upload files
2019-09-02 12:20:15 +00:00
Shivam Mishra
82cb2d0cbb refactor: improved permission logic 2019-09-02 17:33:42 +05:30
mergify[bot]
a929705684
Merge pull request #8275 from deepeshgarg007/email_template
fix: Email template's subject not getting set on selection of email template
2019-09-02 12:01:53 +00:00
Faris Ansari
51be324411 fix: Add depends_on 2019-09-02 17:25:13 +05:30
Shivam Mishra
652483c225 Merge branch 'upload-guest-fix' of github.com:scmmishra/frappe into upload-guest-fix 2019-09-02 16:33:03 +05:30
Shivam Mishra
72228946e5 refactor: explicitly set ignore_permissions for file upload 2019-09-02 16:32:38 +05:30
Suraj Shetty
19dae7c3b3 fix(UX): Hide Amend button if the document has been already ame… (#8306)
* fix: Hide Amend button if the document has been already amended

* chore: Remove unused code to avoid confusion

* style: Remove unused variable

* refactor: Rename method
2019-09-02 16:18:56 +05:30
Faris Ansari
9cbd2b3c30 fix: Add column in framework.sql 2019-09-02 16:09:18 +05:30
Faris Ansari
bff94703cf feat: Create NestedSet doctypes via configuration 2019-09-02 15:58:52 +05:30
Suraj Shetty
e2b3c56902
Merge pull request #8311 from surajshetty3416/fix-failing-patch
fix: Fix patch by reloading contact email and contact phone
2019-09-02 15:45:03 +05:30
Suraj Shetty
7f618f6541 fix: Reload contact email and contact phone
Only reload  contact email and contact phone  if
version is greater than 11.
2019-09-02 15:25:57 +05:30
Deepesh Garg
6bb1350dfd fix: Do not throw error while reloading doctypes (#8290)
* fix: Do not throw error while reloading doctypes

* fix: Syntax error

* fix: Ignore doctype reload_exceptions from other apps
2019-09-02 12:12:53 +05:30
Shivam Mishra
6c3b84a6b5 Merge branch 'develop' of https://github.com/frappe/frappe into upload-guest-fix 2019-09-02 11:35:54 +05:30
mergify[bot]
17b77870c8
Merge pull request #8302 from hrwX/algn-fix
fix(Desk): Alignment
2019-09-02 05:42:30 +00:00
mergify[bot]
30757644a1
Merge pull request #8232 from barredterra/patch-1
fix(API): allow creation from request data (develop)
2019-09-02 05:03:41 +00:00
Suraj Shetty
3ac39f8ddc
Merge pull request #8308 from surajshetty3416/fix--Make-user-field-mandatory-in-review-dialog
fix(UX): Make User field mandatory in review dialog
2019-09-02 10:03:52 +05:30
Suraj Shetty
1a9d7e25cc fix(UX): Make User field mandatory in review dialog 2019-09-02 08:26:47 +05:30
mergify[bot]
99c73bfae1
Merge pull request #8243 from hrwX/contacts-ref
feat(Contacts): Multiple emails and phones in a contact
2019-08-31 18:08:58 +00:00
mergify[bot]
5eba2c0b2c
Merge pull request #8299 from surajshetty3416/skip-extra-list-in-menu
fix: Remove extra 'List' in the awesome bar option
2019-08-30 10:53:41 +00:00
Suraj Shetty
64303d0b52
revert: "fix: When autoname is not set, treat it as hash" (#8303)
revert: "fix: When autoname is not set, treat it as hash"
2019-08-30 15:47:37 +05:30
Suraj Shetty
afba9a0238
Revert "fix: When autoname is not set, treat it as hash" 2019-08-30 14:55:40 +05:30
Himanshu Warekar
2a95ed392b fix: remove important 2019-08-30 12:27:43 +05:30
Himanshu Warekar
f868164eae fix: module section name alignment 2019-08-30 12:27:05 +05:30
mergify[bot]
4b84ebd5a3
Merge pull request #8301 from deepeshgarg007/web_form_wrapper
fix: Add container attributes to web form list
2019-08-30 06:04:09 +00:00
deepeshgarg007
ad2c3514e5 fix: Add container attributes to web form list 2019-08-30 11:17:49 +05:30
Rushabh Mehta
64b409134a
Merge pull request #8264 from Alchez/dev-webhook-json
feat: allow forming JSON requests in webhook  (develop)
2019-08-30 09:31:03 +05:30
mergify[bot]
d4c801ef3d
Merge pull request #8288 from hrwX/gs-fix
fix: js translation for google settings
2019-08-29 13:07:34 +00:00
mergify[bot]
0e0ab678af
Merge pull request #8223 from scmmishra/fix-address-query
fix: added searchfield to address query
2019-08-29 13:05:41 +00:00
Himanshu Warekar
52d9b3b749 fix: translations 2019-08-29 18:12:57 +05:30
Aditya Hase
710441bac5
fix(requirements): Use googlemaps 3.1.1 (#8296)
fix(requirements): Use googlemaps 3.1.1
2019-08-29 17:56:39 +05:30
Aditya Hase
02b944b6db
Merge pull request #8159 from adityahase/fix-calendar
fix(event): Include Event Participants in query
2019-08-29 17:56:14 +05:30
mergify[bot]
b82248fa64
Merge pull request #8273 from scmmishra/desk-translate
fix: enabled translation for desk card categories
2019-08-29 11:55:20 +00:00
Shivam Mishra
5bc1d73039 feat: added translation text to desk.js
Found a better solution
2019-08-29 17:04:28 +05:30
mergify[bot]
85a3d7d6bd
Merge pull request #8298 from scmmishra/background-job-template-fix
fix: translation function for background jobs template
2019-08-29 11:16:23 +00:00
Shivam Mishra
64415b0e33 fix: translation function for background jobs template 2019-08-29 16:21:23 +05:30
Aditya Hase
3eb7e175fe
fix(requirements): Use googlemaps 3.1.1
Fixed with https://github.com/googlemaps/google-maps-services-python/pull/308
2019-08-29 16:17:53 +05:30
Aditya Hase
bf717cf832 fix(calendar): Use Event Participants in query iff referenced in filters 2019-08-29 15:41:22 +05:30
Aditya Hase
2db51be19a fix(event): Include Event Participants in query 2019-08-29 15:12:58 +05:30