Commit graph

14692 commits

Author SHA1 Message Date
mbauskar
0e36c988f7 Merge branch 'develop' of https://github.com/mbauskar/frappe into develop 2017-03-08 12:04:01 +05:30
Rushabh Mehta
28b38d45e7 [fix] patches 2017-03-08 11:57:33 +05:30
Faris Ansari
00e1cf0598 [ui] hide row index in 6 column child table 2017-03-08 11:50:05 +05:30
Faris Ansari
d17aad5016 [fix] show_no_result in reportview 2017-03-08 11:21:49 +05:30
Rushabh Mehta
27312e2129 [minor] allow float in amount 2017-03-08 11:16:04 +05:30
Nabin Hait
46423117b8 Fixed merge conflict 2017-03-08 11:15:10 +05:30
Nabin Hait
1652460f2a Merge branch 'hotfix' 2017-03-08 11:08:16 +05:30
Nabin Hait
64a10c0543 bumped to version 7.2.28 2017-03-08 11:38:16 +06:00
Wael AlShurafa
d3c6ac6d8a Fix operator validation 2017-03-07 21:53:43 +02:00
Wael AlShurafa
3033aa4d5b Fix condition operator case sensitivity 2017-03-07 21:52:20 +02:00
Nabin Hait
dcc170d1b5 minor patch fix 2017-03-07 22:34:52 +05:30
Nabin Hait
3cc2a5e3c8 Merge pull request #2814 from netchampfaris/listview-fixes
[kanban] open form when card clicked
2017-03-07 19:45:09 +05:30
Nabin Hait
ee16a6ff4f Merge pull request #2818 from KanchanChauhan/file-view
[Fix] File list view fixed
2017-03-07 19:44:34 +05:30
Nabin Hait
960c27eef1 Merge pull request #2819 from nabinhait/report_date_filter
Fixed recursive call on setting date filter from route options
2017-03-07 19:44:07 +05:30
Nabin Hait
464db607cf Merge pull request #2821 from pratu16x7/search-fixes
[fix] Broken list results
2017-03-07 19:42:58 +05:30
Prateeksha Singh
5595a21a24 fix list types, exclude specifics 2017-03-07 18:03:28 +05:30
Prateeksha Singh
88f3e14191 fix list cases 2017-03-07 17:49:17 +05:30
pratu16x7
ffd604acc8 Glaring equals error, add specifics 2017-03-07 17:29:35 +05:30
mbauskar
1465f818b3 Merge branch 'RobertSchouten-email-inbox-contact-dev' into develop 2017-03-07 17:18:19 +05:30
mbauskar
0bd9f37ebe [minor] filters for both address and contact dynamic link lin_doctype field 2017-03-07 17:17:14 +05:30
Nabin Hait
78ed1b75df Fixed recursive call on setting date filter from route options 2017-03-07 17:14:19 +05:30
Rushabh Mehta
1e7229c45f [enhance] global search in website (#2810)
* [enhance] global search in website

* [fix] create table query

* [website] navbar search in header if set

* [minor] navbar_search in website settings
2017-03-07 16:37:50 +05:30
Rushabh Mehta
92939089a8 [fix] error message for custom script 2017-03-07 16:34:58 +05:30
Rushabh Mehta
697a85f88d [fix] error message for custom script 2017-03-07 16:20:48 +05:30
Kanchan Chauhan
4b2116e644 [Fix] File list view fixed 2017-03-07 16:09:38 +05:30
mbauskar
6f9016ab13 Merge branch 'email-inbox-contact-dev' of https://github.com/RobertSchouten/frappe into RobertSchouten-email-inbox-contact-dev 2017-03-07 15:59:05 +05:30
Nabin Hait
cd07ddd97e Merge pull request #2817 from manassolanki/news
Newsletter Doctype Naming
2017-03-07 15:26:47 +05:30
Manas Solanki
a724e3ed7d Newsletter doc naming 2017-03-07 15:07:27 +05:30
mbauskar
da3e4627d3 checked the message id before creating communication 2017-03-07 14:50:41 +05:30
mbauskar
b8dc800ea3 [minor] set email sync rule to UNSEEN if pulling email for first time 2017-03-07 13:57:28 +05:30
mbauskar
ac1c08f477 minor fixes for sync ALL option 2017-03-07 13:57:28 +05:30
mbauskar
0ab2af1715 [inbox] js clean ups, other minor fixes in imap 2017-03-07 13:57:28 +05:30
mbauskar
1d272da47f [minor] minor fixes for email inbox and imap sync 2017-03-07 13:57:28 +05:30
mbauskar
6839c145f6 [minor] minor fixes for imap sync 2017-03-07 13:57:28 +05:30
mbauskar
41c5ce8ffd [imap] saved email unique id from header and email reindexing 2017-03-07 13:57:28 +05:30
mbauskar
62fe7d19a4 [minor] mark email as seen once open in ERPNext 2017-03-07 13:57:28 +05:30
mbauskar
df257613ed [minor] synced the Mail Flags 2017-03-07 13:57:28 +05:30
mbauskar
d8bfa0210d [IMAP] uid based imap email sync 2017-03-07 13:57:28 +05:30
Nabin Hait
94af0d9943 Merge pull request #2761 from RobertSchouten/from_parse_dev
[hotfix] fix email from decode
2017-03-07 12:55:50 +05:30
Nabin Hait
53d6aefde9 Merge pull request #2816 from mbauskar/feedback
feedback url minor fix
2017-03-07 12:54:43 +05:30
mbauskar
a28b00dd37 feedback url minor fix 2017-03-07 12:44:39 +05:30
Faris Ansari
3a0cd99945 [ui] set max height on dropdown 2017-03-07 12:20:59 +05:30
Faris Ansari
a25506f42a [enhance] gantt custom popup 2017-03-07 12:03:31 +05:30
Nabin Hait
4cf3d83414 Merge pull request #2809 from pratu16x7/help-fix
[minor] remove special characters in help results
2017-03-07 11:50:22 +05:30
Nabin Hait
3d049a7a88 Merge pull request #2811 from netchampfaris/ui-fixes
enhance imageview grid
2017-03-07 11:49:57 +05:30
Makarand Bauskar
71d281b6b8 Merge pull request #2724 from RobertSchouten/email-fixes
assorted email fixes
2017-03-07 11:03:31 +05:30
Makarand Bauskar
835547db3b Merge branch 'develop' into email-fixes 2017-03-07 11:03:13 +05:30
Nabin Hait
86da93ca24 Merge pull request #2766 from manassolanki/newsletter
[Fix] Newsletter
2017-03-07 10:56:50 +05:30
Nabin Hait
870c565110 Update newsletter.py 2017-03-07 10:50:51 +05:30
Faris Ansari
7bbd6542ce [kanban] open form when card clicked 2017-03-07 10:49:02 +05:30