Commit graph

224 commits

Author SHA1 Message Date
Faris Ansari
7f24a3f71d fix: Show user fullname in mentions (#7592)
* fix: Show user fullname in mentions

* fix: Remove unused import

* fix: Update tests
2019-05-30 16:37:40 +05:30
Himanshu
51042b1359 fix(load): alias creation in get communications (#7538)
* fix: alias creation

* fix: fix update_timeline_doc

* fix: add timeline link irrespective of comm medium
2019-05-23 09:35:53 +05:30
Himanshu
2b14c95644 fix(Communication): New child doctype for Communication Timeline Links (#7524)
* fix: separate child doctype for communication

* fix: reload doc before running the patches

* fix: update_timeline_doc

* fix: manipulatetimeline fields in Comm Links

* fix: test cases

* fix: reload comm_link before communication

* patch: remove redundant patch
2019-05-21 20:48:55 +05:30
Faris Ansari
7d7b229438 perf: Optimize get_communications
Split query with OR condition into two subqueries with UNION
2019-05-21 12:03:58 +05:30
Himanshu Warekar
defe1b2eef fix: miscellaneous changes 2019-05-18 13:37:00 +05:30
Himanshu Warekar
a4478afcd5 Merge branch 'develop' of https://github.com/frappe/frappe into comm_ref 2019-05-16 13:03:46 +05:30
Himanshu Warekar
77d009747d fix: remove debug parameter 2019-05-15 14:00:25 +05:30
Himanshu Warekar
e29f07898b fix: query 2019-05-15 11:29:22 +05:30
Anurag Mishra
6f5ad343c9
fix: filters for sending hourly updates in document follow (#7481) 2019-05-14 18:40:34 +05:30
Himanshu Warekar
8828fcef24 fix: use inner join instead of left join 2019-05-14 17:22:24 +05:30
Himanshu Warekar
f114e03c8c Merge branch 'develop' into comm_ref 2019-05-14 16:18:32 +05:30
Shivam Mishra
398cb9d859
Merge pull request #7477 from Anurag810/followed_fix
fix: disable document follow check
2019-05-14 15:34:38 +05:30
Anurag Mishra
250ccaf9ba fix: mail was also sending after setting of hte document follow uncheck 2019-05-14 15:27:44 +05:30
Saurabh
abe1defb25
Merge pull request #7463 from rmehta/remove-feedback-trigger
BREAKING CHANGE: remove Feedback Trigger and Feedback Rating, this was not very configurable and can now be done better with Web Forms
2019-05-14 15:18:44 +05:30
Himanshu Warekar
5d09fb26a9 fix: timeline docs to dynamic links 2019-05-14 12:01:14 +05:30
Himanshu Warekar
8381e0048a feat: Communication refactor initial bringup 2019-05-13 20:39:49 +05:30
Anurag Mishra
b9170012b2 feat: added follow on creation and changes done by user will not send to him (#7460)
* feat: added follow on creation

* style: Missing comma and a parameter

* fix: travis

* removed print statement
2019-05-13 14:59:49 +05:30
Rushabh Mehta
3d26d2dd22 BREAKING CHANGE: remove Feedback Trigger and Feedback Rating, this was not very configurable and can now be done better with Web Forms 2019-05-13 14:18:02 +05:30
Rushabh Mehta
4c578e8238 fix: dont show double messages 2019-05-04 14:14:56 +05:30
Rushabh Mehta
5ebf688984 fix(recent): complete uncommitted changes 2019-05-03 08:49:51 +05:30
Rushabh Mehta
f72e74d8e8 fix: route history and allow longer energy point reviews 2019-05-02 15:51:57 +05:30
Chinmay Pai
81ee1870e0 feat(email): Add reply all option in timeline (#6733) 2019-04-29 17:43:52 +05:30
Rushabh Mehta
01242afc8f
Merge pull request #7304 from rmehta/milestone-tracker
feat: Milestone Tracker. Track document lifecycle with milestones
2019-04-22 11:08:49 +05:30
Rohit Waghchaure
a62a11044a fix: On assignment, system sending an email to the assigned user even if notify to email is disabled 2019-04-18 12:39:22 +05:30
Rushabh Mehta
7402f495d5 feat: Milestone Tracker. Track document lifecycle with milestones 2019-04-17 18:00:03 +05:30
Nabin Hait
8c91e46563 Fixed merge conflict 2019-04-11 11:56:37 +05:30
Suraj Shetty
7e8fc8f69e fix: Skip review logs
- while adding to enegy point logs to docinfo
2019-04-05 19:16:15 +05:30
Suraj Shetty
e0a1bc92f5 refactor: Get energy point log from docinfo 2019-04-05 12:52:24 +05:30
Himanshu Mishra
2f84cfb178 fix fieldname 2019-03-29 23:18:25 +05:30
Himanshu Mishra
19f5bb0422 No need to fetch complete user list to get two usernames 2019-03-29 23:13:23 +05:30
Rushabh Mehta
98b1608ce9
Merge pull request #7100 from netchampfaris/doctype-form-ux
fix: Doctype UX
2019-03-22 17:59:07 +05:30
Faris Ansari
f724cd84a1 fix: Remove usage of script_type 2019-03-22 00:32:50 +05:30
Faris Ansari
60a9b6cb06 wip: fields not mandatory 2019-03-22 00:31:28 +05:30
Rushabh Mehta
eaaeba5df2 Merge remote-tracking branch 'upstream/hotfix' into develop 2019-03-15 14:52:09 +05:30
Sagar Vora
280854fd6b feat: allow regional js in list view (#7066)
Required for https://github.com/frappe/erpnext/pull/16907
2019-03-13 13:58:34 +05:30
Rushabh Mehta
af605948bc fix(document_follow): ignore column missing if in patch 2019-03-11 08:55:12 +05:30
Rushabh Mehta
d7ebaa07e9
Merge pull request #7038 from rmehta/unassign-rule-fix
Unassignment rule
2019-03-07 17:03:28 +05:30
Rushabh Mehta
30f313e513 fix(assignment_rule): only apply unassign rule if assiged by the same rule 2019-03-07 16:31:56 +05:30
Anurag Mishra
cd191439fd feat: Document subscription (#6745) 2019-03-07 14:06:22 +05:30
Rushabh Mehta
626092e898 fix(test): test_assign.py 2019-03-04 21:13:14 +05:30
Rushabh Mehta
f7cf745fb5 fix: assginment rule only reassign if not assigned 2019-03-04 16:15:50 +05:30
Rushabh Mehta
02726ba3ed feat: multiple auto assigns 2019-02-28 17:11:44 +05:30
Rushabh Mehta
2130dd69de fix: add comment in communication 2019-02-18 16:37:51 +05:30
Rushabh Mehta
41d90fa6d1 BREAKING CHANGE: Comments are now handled separately from Communication and Version 2019-02-07 16:35:50 +05:30
Suraj Shetty
9acfebc0ae Return doctype field as well from get_communcation method
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-01-31 19:20:01 +05:30
Rushabh Mehta
b4ddd2c0b2 fix: view log messages 2019-01-29 17:56:22 +05:30
Frappe Bot
1197271700 Fixed merge conflict 2019-01-05 09:06:05 +00:00
Sagar Vora
53b11e3d0d fix(core): rename "View log" to "View Log" and patch (#6708) 2019-01-03 16:34:08 +05:30
Faris Ansari
3b86f16b73 New Control: Table MultiSelect (#6675)
* feat(control): Add Table MultiSelect control

* fix: Use btn-group instead of span

* fix: Remove functionality

* fix: Add 'Table MultiSelect' to Field doctypes

* fix: Replace usage of string 'Table' with array `table_fields`

* fix: Use internal array to store values instead of building from HTML elements

* fix(style): Add semicolon

* fix: Read only mode and click to navigate to form

* style: indent

* fix: fallback to empty array

* fix: Add formatters in js and py

* style: missing semicolon

* fix: Add docfield validation
2018-12-28 15:36:59 +05:30
Frappe Bot
0499b4a845 Merge branch 'staging' into develop 2018-12-26 12:03:03 +00:00