Commit graph

11529 commits

Author SHA1 Message Date
Faris Ansari
0490efd1af [minor] Kanban permission, Calendar route (#2692)
* [fix] Calendar route in desk, notification frappe/erpnext#7670

* [kanban] set permission rule to All
2017-02-09 12:52:01 +05:30
Rushabh Mehta
97764984e1 [style] use text color for summernote editor 2017-02-09 11:52:59 +05:30
Makarand Bauskar
99d97530b1 [enhancement] Feedback Feature (#2683) 2017-02-09 11:30:54 +05:30
Nabin Hait
b784138436 Fixed merge conflict 2017-02-08 11:31:58 +05:30
Nabin Hait
7a007a2cb4 Merge branch 'hotfix' 2017-02-08 11:26:38 +05:30
Nabin Hait
e4e26720e9 bumped to version 7.2.15 2017-02-08 11:56:37 +06:00
Rushabh Mehta
0af6de61bf [fix] email validate 2017-02-07 15:02:04 +05:30
Rushabh Mehta
53f12a8b75 [fix] email validate 2017-02-07 14:31:41 +05:30
Rushabh Mehta
5bc3473184 [minor] cleanups, allow comma in email validation 2017-02-07 14:01:18 +05:30
Makarand Bauskar
75550515d9 [minor] minor fixes in update-password.html (#2676)
* [minor] minor fixes in update-password.html

* [minor] minor permissions manager fixes
2017-02-06 12:58:09 +05:30
Rushabh Mehta
33d8db6d88 [fix] minor fixes 2017-02-03 16:42:23 +05:30
robert schouten
268e7ad644 [hotfix] stop frappe sending automatic responses from non user generated emails (#2674) 2017-02-03 14:29:21 +05:30
Rushabh Mehta
7b7152a5cb Update email_body.py 2017-02-03 12:14:10 +05:30
Rushabh Mehta
3848c657ca [fix] hotkeys 2017-02-03 10:13:25 +05:30
Faris Ansari
54b2a613d9 [fix] default actions in ControlLink, set date in datepicker (#2668) 2017-02-03 09:37:08 +05:30
Rushabh Mehta
35d7bc2d3e [minor] remove references from email, leads to conversation for all messages 2017-02-02 18:11:56 +05:30
Rushabh Mehta
2b191e81ed [minor] allow grid for modal 2017-02-02 17:40:40 +05:30
Faris Ansari
0a57b9ce77 [fix] date text in week mode frappe/erpnext#7635 (#2667) 2017-02-02 17:36:42 +05:30
Faris Ansari
d0bf9ae3d3 Summernote editor (#2665)
* [summernote] working commit

* fix set_input method, esc key fix

* styling fixes

* removed old texteditor
2017-02-02 15:15:51 +05:30
Makarand Bauskar
e422e16953 [WIP] Feedback Triggers (#2643)
* [wip] feedback

* [WIP] Feedback Trigger, Feedback Request, Feedback & Rating Timeline and Form Sidebar

* [minor] minor fixes in feedback trigger

* [Test Cases] Test Cases for Feedback Trigger

* [minor] replaced sql_list by get_all changed the button label

* [minor] removed whitespaces, fixed spelling mistakes
2017-02-02 15:15:23 +05:30
Rushabh Mehta
3add8e8a39 [minor] pass now in enqueue 2017-02-02 11:24:54 +05:30
Makarand Bauskar
2119e9aed2 [minor] minor fixes breadcrumbs & clear auth log (#2663) 2017-02-02 11:14:37 +05:30
Faris Ansari
562b37cd47 [gantt] fix multiple task updates (#2655) 2017-02-02 11:00:39 +05:30
Makarand Bauskar
5e4860b4e6 [minor] set contact query minor fixes (#2662) 2017-02-02 10:57:28 +05:30
Rushabh Mehta
a93294ce75 [minor] fixes to tag delete, added viewer in tree and other cleanups 2017-02-01 18:15:01 +05:30
Saurabh
b32cb3d203 [minor][fix] validate email using regex (#2656) 2017-01-31 17:57:03 +05:30
Saurabh
59775f2f48 [fix] consider route options only if report filters not exists (#2652) 2017-01-31 17:56:11 +05:30
Rushabh Mehta
e4cba51275 [fix] address_and_contacts hooks 2017-01-31 14:16:53 +05:30
Rushabh Mehta
039a241a56 [fix] address_and_contacts hooks 2017-01-31 14:11:40 +05:30
Rushabh Mehta
deecec5b15 [minor] fix for get_version_comment 2017-01-31 12:13:29 +05:30
Rushabh Mehta
52e85d83b1 [fix] patch for dropping in_filter 2017-01-31 11:06:45 +05:30
Faris Ansari
fb3f6ecb44 treeview fixes frappe/erpnext#7507 (#2653) 2017-01-30 17:38:02 +05:30
Rushabh Mehta
80e7e0bf29 [fix] apply permission in timeline (version) 2017-01-30 17:34:07 +05:30
Rushabh Mehta
e329962756 [minor] remove in_fitler, fixes #7381 (#2649) 2017-01-30 15:30:44 +05:30
Priyank Trivedi
7ad73e56cb Fix typo : intall to install (#2646)
Fixing a typo in installation doc.
2017-01-30 15:30:13 +05:30
Faris Ansari
ffdc5825dc [gantt] update lib and some fixes (#2645) 2017-01-30 15:29:50 +05:30
Faris Ansari
d17b5a0dce Calendar Redesign (#2639)
* wip

* added styling

* more styling

* and some more...

* first cut

* [fix] end date on events

* font awesome icons

* doclistview cleanups

* merged calendar_base into calendar
2017-01-30 15:27:05 +05:30
Felipe Orellana
0a2edc9ea7 [FIX] rss.xml broken on all instances of frappe (#2644)
rss.xml is broken on all frappe instances I've checked, including the frappe.io site. The culprit was a small column alias change a few months back. This fixes that change.
2017-01-30 15:22:13 +05:30
krnkris
dc527f12cd Update __init.py__ to master (#2641)
It is stable now only issue is the emoji use
2017-01-30 15:20:49 +05:30
Rushabh Mehta
385da2b7b1 [check] use utf8mb4 as the connection charset 2017-01-30 14:15:44 +05:30
Rushabh Mehta
28a09ee972 [fix] email encoding issues, fixes frappe/erpnext#7145 2017-01-30 12:57:12 +05:30
Makarand Bauskar
6dabc55096 [minor] listview & permissions minor fixes (#2647) 2017-01-30 10:45:35 +05:30
KanchanChauhan
71200e4f9a Merge pull request #2642 from rohitwaghchaure/translation_minor
[Fix] removed language code from translation
2017-01-27 17:37:22 +05:30
Rohit Waghchaure
6ac6d8ab84 [Fix] removed language code from translation 2017-01-27 17:18:52 +05:30
Rushabh Mehta
830f22be93 Merge branch 'hotfix' 2017-01-27 15:36:19 +05:30
Rushabh Mehta
73ff0dfb88 Merge branch 'master' into develop 2017-01-27 15:36:19 +05:30
Rushabh Mehta
6487604ca7 bumped to version 7.2.14 2017-01-27 16:06:18 +06:00
KanchanChauhan
3249272852 [Fix]Linked with not found (#2635) 2017-01-27 11:25:46 +05:30
Faris Ansari
54d7b82b1a [fix] Kanban save_filters, set_title (#2637)
* [wip] save filters fix

* [fix] save_filters

* set_title on refresh
2017-01-27 11:24:38 +05:30
Rushabh Mehta
9a23f808ff [minor] allow all roles for permission manager 2017-01-26 20:37:41 +05:30