Commit graph

20181 commits

Author SHA1 Message Date
Rushabh Mehta
dc93ff8be3
Merge pull request #7712 from deepeshgarg007/user-fix-develop
fix: Do not send password update notification to disabled users
2019-06-20 14:16:26 +05:30
Rushabh Mehta
9d83791066 fix(minor): allow api users to be website users too 2019-06-20 12:45:29 +05:30
Aditya Hase
8b64879d5a fix: Rounding behavior in Python 3 (#7730) 2019-06-20 11:30:02 +05:30
Himanshu
dceb0d1b85 feat(Integration): Google Contacts Integration (#7625) 2019-06-20 11:26:07 +05:30
Aditya Hase
8705ddfb0a fix(assignment-rule): Notify user on assignment (#7732) 2019-06-20 11:24:03 +05:30
Rushabh Mehta
e7f98b414f
Merge pull request #7734 from rmehta/random-in-awesomebar
feat: try "random" in awesomebar
2019-06-20 11:19:36 +05:30
Rushabh Mehta
d8a75d08be
Merge pull request #7735 from adityahase/fix-login-notification-new
fix: Trigger notifications after updating last_login, last_ip fields
2019-06-20 11:18:48 +05:30
Aditya Hase
71fc4cbd3a fix: Trigger notifications after updating last_login, last_ip fields
Notifications for User doctype based on Value Change in last_ip,
last_login, last_active aren't triggered because of updates performed
through frappe.db.sql. This behavior is fixed by explicitly triggering
notifications.
2019-06-20 11:16:48 +05:30
Rushabh Mehta
e539b4b25a feat: try "random" in awesomebar 2019-06-20 11:13:50 +05:30
Aditya Hase
4baf4247e8
fix(communication): Rememeber cc and bcc fields from last message as well (#7714)
fix(communication): Rememeber cc and bcc fields from last message as well
2019-06-20 09:40:08 +05:30
gavin
7b7289431e fix: Title on web list view (#7728) 2019-06-19 20:37:36 +05:30
Rushabh Mehta
06956cf718
Merge pull request #7726 from hrwX/timeline_sender
fix: Show Contact Name in Timeline Item
2019-06-19 17:22:02 +05:30
Himanshu Warekar
0a2edf0649 fix: if not sender_name then show contact name 2019-06-19 14:50:29 +05:30
Rushabh Mehta
f40ace38aa
Merge pull request #7719 from prssanna/mobile-refactor
fix: Improvements for mobile view
2019-06-19 14:35:50 +05:30
Faris Ansari
e02fce6ac6
Merge branch 'develop' into fix-comm-last 2019-06-19 13:25:21 +05:30
Faris Ansari
2d3058551f test: Fix awesomebar test 2019-06-19 13:24:09 +05:30
Suraj Shetty
af65cc58e0 fix: Use get_link_to_form to get complete url (#7722) 2019-06-19 13:19:28 +05:30
Himanshu Warekar
642cc32d7a Merge branch 'develop' of https://github.com/frappe/frappe into timeline_sender 2019-06-19 12:49:52 +05:30
Himanshu Warekar
994c32bffa fix: set sender full name from contacts 2019-06-19 12:49:28 +05:30
Faris Ansari
b330fc3a52 Merge branch 'mobile-refactor' of https://github.com/prssanna/frappe into mobile-refactor 2019-06-19 12:18:34 +05:30
Faris Ansari
97a7e90e14
fix(MultiSelectList): Trigger get_data on input (#7713) 2019-06-19 12:15:17 +05:30
Deepesh Garg
aae730fe2a
Merge pull request #7727 from surajshetty3416/fix-postgres
fix(postgres): Pass tuple of all_ids instead of an array
2019-06-19 12:06:58 +05:30
Suraj Shetty
15b98ea737 Merge branch 'travis-fix' of https://github.com/deepeshgarg007/frappe into fix-postgres 2019-06-19 11:50:30 +05:30
Suraj Shetty
b6c56ff94f fix(postres): Pass tuple of all_ids instead of an array
- Fixes failing build for postgres
2019-06-19 11:18:57 +05:30
Himanshu Warekar
caa6455866 fix: show sender name 2019-06-18 22:05:21 +05:30
Prssanna Desai
8ecd9c35db fix: more improvements 2019-06-18 20:22:13 +05:30
Prssanna Desai
abbafc7f11 fix: improvements for mobile view 2019-06-18 20:22:13 +05:30
deepeshgarg007
8fac582082 fix: Use hasattr instead of get 2019-06-18 19:20:34 +05:30
Faris Ansari
02081a8b13 fix: Reports dropdown for mobile 2019-06-18 19:05:54 +05:30
Faris Ansari
0c7392a597 fix: Fetch app_logo via hooks 2019-06-18 19:05:25 +05:30
deepeshgarg007
6ded721da4 fix: Assign exception_type only if exception name available 2019-06-18 18:56:50 +05:30
Nabin Hait
b375ee9eef fix: merge conflict 2019-06-18 18:45:21 +05:30
Faris Ansari
55914b9572 fix: Styles for Grid 2019-06-18 17:53:42 +05:30
Rushabh Mehta
8355f04aea
Merge pull request #7721 from frappe/revert-7720-revert-7716-error_handlers
Revert "Revert "feat: Error handlers""
2019-06-18 15:53:10 +05:30
Rushabh Mehta
5273c41089
Revert "Revert "feat: Error handlers"" 2019-06-18 15:52:56 +05:30
Rushabh Mehta
8f89106a12
Merge pull request #7720 from frappe/revert-7716-error_handlers
Revert "feat: Error handlers"
2019-06-18 15:52:42 +05:30
Rushabh Mehta
3f9aa734a3
Revert "feat: Error handlers" 2019-06-18 15:52:26 +05:30
Rushabh Mehta
3676ccf7b0
Merge pull request #7716 from deepeshgarg007/error_handlers
feat: Error handlers
2019-06-18 15:50:00 +05:30
Rushabh Mehta
54450ef6ce
Merge pull request #7717 from deepeshgarg007/error_handlers_hotfix
feat: Error handlers
2019-06-18 15:49:47 +05:30
Rushabh Mehta
7e67076feb
Merge pull request #7718 from hrwX/travis_fix
fix: travis
2019-06-18 14:46:31 +05:30
Sahil Khan
65b727ef6b Merge branch 'hotfix' 2019-06-18 14:40:40 +05:30
Sahil Khan
1e25e66c37 bumped to version 11.1.36 2019-06-18 15:00:40 +05:50
Himanshu Warekar
f5ee86fc8c fix: travis 2019-06-18 13:11:09 +05:30
Prssanna Desai
79a5a7d358 fix: more improvements 2019-06-18 12:58:09 +05:30
Prssanna Desai
883a62083d fix: improvements for mobile view 2019-06-18 12:58:09 +05:30
deepeshgarg007
e2a8cfd6a7 feat: Server side error handlers 2019-06-18 12:28:57 +05:30
deepeshgarg007
da07dfb217 feat: Server side error handlers 2019-06-18 12:22:44 +05:30
Aditya Hase
005a28654b fix(communication): Remember cc and bcc fields from last message as well (#7715)
After closing New Email dialog, unlike content, recipients and subject fields
cc and bcc fields were not stored.
2019-06-18 11:29:00 +05:30
Faris Ansari
5ce0a97070
fix(chat): Add check for sys_defaults (#7710) 2019-06-18 11:27:42 +05:30
Himanshu
c64851de47 fix(Activity): Communication Query (#7696) 2019-06-18 10:52:59 +05:30