Commit graph

11900 commits

Author SHA1 Message Date
mbauskar
e7b520d443 [minor] don't allow transactions in contact/address link_doctype field 2017-03-13 10:39:31 +05:30
Rushabh Mehta
3c95bd36c6 [minor] fixes to router.py 2017-03-13 09:52:14 +05:30
Nabin Hait
66e998401a Merge pull request #2850 from rohitwaghchaure/enhance_page_and_report
[Enhance] Keep page and report fields read only, if developer mode if disabled
2017-03-12 16:31:11 +05:30
Nabin Hait
4833f7285f Merge pull request #2847 from rohitwaghchaure/custom_role_issue
[Enhance] Role permission for page and report, added reset roles button
2017-03-12 16:30:53 +05:30
Nabin Hait
8b1f4e2fe0 Merge pull request #2849 from mbauskar/develop
[minor] hide custom buttons in customize form if form type is not sel…
2017-03-12 16:30:39 +05:30
Rohit Waghchaure
f16c2b76e7 [Enhance] Keep page and report fields read only, if developer mode if disabled 2017-03-12 14:51:00 +05:30
mbauskar
e9ba98660e [minor] hide custom buttons in customize form if form type is not selected 2017-03-11 16:28:47 +05:30
Rohit Waghchaure
da424049a1 [Enhance] Role permission for page and report, added reset roles button 2017-03-11 13:49:25 +05:30
Faris Ansari
ed15f52980 [setupwizard] active color on completed steps (#2845) 2017-03-11 13:24:06 +05:30
Nabin Hait
40608add4f Updated modified in email account json 2017-03-10 13:08:59 +05:30
Rushabh Mehta
479b4f37ee [fix] tab in grid, fixes frappe/erpnext#7974 2017-03-10 11:41:38 +05:30
Rushabh Mehta
7a735739e1 [minor] show develop_version in branch 2017-03-10 09:38:19 +05:30
Rushabh Mehta
23e340ab80 [minor] indicator_color in message 2017-03-10 08:57:09 +05:30
Makarand Bauskar
cc8df1c4cd [fixes] removed frappe.throw from feedback trigger (#2838)
* [fixes] removed frappe.throw from feedback trigger

* Update feedback_trigger.py
2017-03-09 16:30:51 +05:30
Nabin Hait
5f7a84cd5f Merge pull request #2840 from pratu16x7/search-fix
[fix] child tables inclusion condition
2017-03-09 16:09:39 +05:30
Nabin Hait
ab6c1252e0 Merge pull request #2839 from manassolanki/di_fix
[Fix] Updating the child doc
2017-03-09 15:58:27 +05:30
pratu16x7
5a62375ee5 generic doctype check 2017-03-09 15:55:28 +05:30
pratu16x7
82c122ecea child table (__) exclusion 2017-03-09 15:54:18 +05:30
pratu16x7
1f6e2d93aa child tables not in search, diminish placeholder 2017-03-09 15:54:07 +05:30
Manas Solanki
f18721a0f8 [Fix] Updating the child doc 2017-03-09 15:26:20 +05:30
Nabin Hait
7fe50c885a Merge branch 'master' into develop 2017-03-09 14:59:02 +05:30
Nabin Hait
1b222d20c9 Merge branch 'hotfix' 2017-03-09 14:59:01 +05:30
Nabin Hait
24b43bfc42 bumped to version 7.2.29 2017-03-09 15:29:01 +06:00
Nabin Hait
7da8688eea Merge pull request #2835 from manassolanki/di_fix
Data Import - User Doctype
2017-03-09 14:56:19 +05:30
Nabin Hait
0f71ba0d3f Merge pull request #2836 from rmehta/fix-html5lib
[fix] fix html5lib compatibility issue
2017-03-09 14:44:41 +05:30
Rushabh Mehta
2e1d0fe71e [minor] html_utils.py, bleach.linkify remove tokenizer 2017-03-09 14:02:26 +05:30
Rushabh Mehta
70db4e7fc7 [fix] welcome mail if no other app 2017-03-09 13:27:38 +05:30
Rushabh Mehta
8a83a9bfed [fix] fix html5lib compatibility issue 2017-03-09 13:20:40 +05:30
Manas Solanki
2775af2506 Setting the recipient status as not sent before inserting in the email queue 2017-03-09 13:17:08 +05:30
Nabin Hait
81ba846926 Fixed patch order 2017-03-09 13:08:36 +05:30
robert schouten
a855a6050d [fix] email online style sheets hidden in link removal (#2658)
* [fix] email online style sheets hidden in link removal

* Update dom.js
2017-03-09 12:18:44 +05:30
robulik
efaaf4aa2b Translatable "Ctrl+enter to save" and "Edit in full window" in quick entry dialog (#2830)
Quick entry dialog window now with translatable footer notes.
2017-03-09 11:17:07 +05:30
Nabin Hait
0e85e30789 Merge pull request #2833 from rmehta/grid-mandatory
[fixes] mandatory css in grids, better welcome email
2017-03-09 11:04:22 +05:30
Nabin Hait
af70ae8071 Merge pull request #2829 from neilLasrado/develop
[minor] Added priority & due date in list view to ToDo
2017-03-09 10:47:02 +05:30
Nabin Hait
deee6ca0e0 Merge pull request #2832 from mbauskar/imap
[fixes] removed the fingerprint and used the message-id to check emai…
2017-03-09 10:46:01 +05:30
Nabin Hait
8cfa582af2 Merge pull request #2812 from mbauskar/inbox-view
Inbox view
2017-03-09 10:45:25 +05:30
Rushabh Mehta
614098a84a [fixes] mandatory css in grids, better welcome email 2017-03-08 22:52:54 +05:30
mbauskar
10868dfe0c [fixes] removed the fingerprint and used the message-id to check email duplications 2017-03-08 16:44:00 +05:30
mbauskar
e541249b8a [minor] mark mail as read, unread added actions like reply, reply-all and forword 2017-03-08 14:42:04 +05:30
mbauskar
6852f2d4d3 [minor] check if email has an attachments 2017-03-08 14:42:04 +05:30
mbauskar
fd04aacb10 removed the Email Inbox Page 2017-03-08 14:42:04 +05:30
mbauskar
7fa6b295a4 [minor] minor fixes in list_view.js 2017-03-08 14:41:43 +05:30
mbauskar
71393391b1 [minor] mark as read and unread option in communication 2017-03-08 14:41:43 +05:30
mbauskar
eda7b659a3 [WIP] Email Inbox view for Communication 2017-03-08 14:41:43 +05:30
Neil Trini Lasrado
4bf5724ad7 Added priority & due date in list view to ToDo 2017-03-08 14:41:33 +05:30
Rushabh Mehta
867107b904 [fix] patch, socket_client 2017-03-08 14:40:43 +05:30
Rushabh Mehta
e9bc57b56e [fix] patch, socket_client 2017-03-08 14:40:06 +05:30
Nabin Hait
ad4a334561 Merge pull request #2827 from RobertSchouten/remove_attachment_newlines_dev
[fix] remove newlines from email attachments as cannot be handled
2017-03-08 14:18:33 +05:30
Nabin Hait
54b56b1ff5 Merge pull request #2820 from mbauskar/develop
contact only available on doctypes with contact_html
2017-03-08 14:17:38 +05:30
Nabin Hait
622c244ce5 Merge pull request #2697 from mbauskar/imap
[enhancement] IMAP mail syncing
2017-03-08 14:14:55 +05:30