Commit graph

21413 commits

Author SHA1 Message Date
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
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
Suraj Shetty
ac4e0388ec fix: Remove extra List in the awesome bar option 2019-08-29 12:20:58 +05:30
mergify[bot]
b901fe4ffc
Merge pull request #8289 from surajshetty3416/fix-language-code
fix: Use sr_BA instead of sr_SP since sr_SP is not supported by Babel
2019-08-29 06:24:08 +00:00
Suraj Shetty
b3f2fc98b5
fix: When autoname is not set, treat it as hash (#8260)
fix: When autoname is not set, treat it as hash
2019-08-29 11:07:58 +05:30
mergify[bot]
89f29a7a10
Merge pull request #8107 from ernestoruiz89/patch-2
feat: Add color red and green to form-message for alert or success
2019-08-29 05:34:46 +00:00
mergify[bot]
e039167dc1
Merge pull request #8122 from danielmorlock/develop
feat: properly support multiple email values in ldap entries.
2019-08-29 05:31:11 +00:00
Suraj Shetty
488049f25d fix: Use sr_BA instead of sr_SP since sr_SP is not supported by Babel 2019-08-29 10:58:30 +05:30
mergify[bot]
b26ff3c512
Merge pull request #8271 from ernestoruiz89/patch-7
fix: Add translation function to string (develop)
2019-08-29 05:15:14 +00:00
mergify[bot]
fe4b4b1c1f
Merge pull request #8286 from ruchamahabal/auto-repeat-fix
fix: Email Notification in Auto Repeat
2019-08-29 05:12:40 +00:00
Himanshu Warekar
9e5f68d025 fix: patch 2019-08-29 09:28:09 +05:30
Himanshu Warekar
4b750f7c02 fix: js translation for google settings 2019-08-29 02:08:45 +05:30
mergify[bot]
98c2a402dd
Merge pull request #8261 from hrwX/escape_docname_goal
fix(Customer): Escape quotes
2019-08-28 20:36:29 +00:00
Rucha Mahabal
adf662a3f8 fix: codacy fix 2019-08-28 22:05:35 +05:30
Rucha Mahabal
e97a5e1b41 Merge branch 'develop' of https://github.com/frappe/frappe into auto-repeat-fixes 2019-08-28 20:30:04 +05:30
Rucha Mahabal
25874573e1 fix: email notification in auto repeat 2019-08-28 20:29:36 +05:30
Rohan Bansal
85614fa8be test: fix header assertion 2019-08-28 16:55:15 +05:30
Rohan Bansal
d768763da4 test: fix tests 2019-08-28 16:55:10 +05:30
mergify[bot]
270b67fb67
Merge pull request #8247 from frappe/clarkejj-patch-1
fix: Change El Salvador currency to USD
2019-08-28 10:27:16 +00:00
Shivam Mishra
2e4991ba1a
Merge pull request #8281 from scmmishra/logged-in
refactor: added logged in status in body tag
2019-08-28 15:41:49 +05:30
Aditya Hase
1eee1baa12 fix(requirements): Use googlemaps 3.0.2 (#8282)
MANIFEST.IN for googlemaps doesn't include CHANGELOG.md
https://travis-ci.org/frappe/frappe/jobs/577721078
2019-08-28 15:39:51 +05:30
mergify[bot]
4a79ffd6bb
Merge pull request #8272 from deepeshgarg007/multi_print
fix: Error while printing multiple docs
2019-08-28 09:52:00 +00:00
Shivam Mishra
e4c009c514 refactor: added logged in status in body tag 2019-08-28 13:20:00 +05:30
Himanshu
880b2559f2
Update frappe/utils/goal.py
Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2019-08-28 10:06:13 +05:30
Himanshu Warekar
9e181d0bb1 fix: show field only if present 2019-08-28 09:38:03 +05:30
Himanshu Warekar
3d73ef3c13 fix: use escape 2019-08-28 00:07:00 +05:30