Commit graph

381 commits

Author SHA1 Message Date
Nabin Hait
0c3760c439 bumped to version 7.2.8 2017-01-10 18:30:51 +06:00
Nabin Hait
625565db5c bumped to version 7.2.7 2017-01-10 12:53:34 +06:00
Nabin Hait
02cc23cf89 bumped to version 7.2.6 2017-01-09 16:34:32 +06:00
Nabin Hait
4112407391 Reload in_standard_filter property 2017-01-06 12:56:04 +05:30
Nabin Hait
15d08e611b bumped to version 7.2.5 2016-12-30 15:15:57 +06:00
Nabin Hait
2d7c6ffa81 bumped to version 7.2.4 2016-12-28 12:48:30 +06:00
Nabin Hait
82448297c7 bumped to version 7.2.3 2016-12-28 11:38:12 +06:00
Nabin Hait
46229be379 bumped to version 7.2.2 2016-12-27 14:55:59 +06:00
Nabin Hait
37277b2a1e bumped to version 7.2.1 2016-12-24 15:27:07 +06:00
Nabin Hait
f2bc961e1b Fixed merge conflict 2016-12-23 17:35:38 +05:30
Nabin Hait
4b23110806 bumped to version 7.2.0 2016-12-23 18:05:03 +06:00
Nabin Hait
26507591d9 Update __init__.py 2016-12-23 16:59:42 +05:30
Nabin Hait
930e0bba9c bumped to version 7.1.29 2016-12-21 18:07:35 +06:00
Nabin Hait
865ecde1cb bumped to version 7.1.28 2016-12-21 12:10:52 +06:00
Rushabh Mehta
a6d5cec95c [minor] unicode fix for frappe/erpnext#7070 (#2478) 2016-12-20 16:21:50 +05:30
Rushabh Mehta
5d7eb494a0 [minor] frappe.as_unicode 2016-12-20 12:35:59 +05:30
Nabin Hait
b5e6589710 bumped to version 7.1.27 2016-12-20 12:04:42 +06:00
Nabin Hait
21e3f671d0 changed version to beta 2016-12-15 19:33:49 +05:30
Nabin Hait
dbc122f223 Merge branch 'master' into develop 2016-12-15 16:36:45 +05:30
Nabin Hait
f1633408f0 bumped to version 7.1.26 2016-12-15 17:06:44 +06:00
robert schouten
c044c476a8 move message_id threading to communication to work with inbox (#2458)
* move message_id threading to communication to work with inbox

* move message_id threading fix

* rebase fix

* reset threading to email queue but keep in communications
2016-12-15 14:50:52 +05:30
robert schouten
efa86c6e31 Email cc in headers if expose recipients (#2441)
* move email cc to header

* [test fixes] move email cc to header

* email cc additional tests

* email cc cleanup and unsubsribe link test

* email cc permit footer based cc with expose_recipient and tests + ui
2016-12-15 09:49:54 +05:30
Saurabh
7656d8b821 [fix][minor] dpctype as kargs to has_permissions 2016-12-13 19:36:09 +05:30
Nabin Hait
a70925926f Merge branch 'master' into develop 2016-12-13 14:21:19 +05:30
Nabin Hait
29025bf917 bumped to version 7.1.25 2016-12-13 14:51:18 +06:00
Nabin Hait
958d8ea6c0 Merge branch 'master' into develop 2016-12-08 12:32:20 +05:30
Nabin Hait
203ca857db bumped to version 7.1.24 2016-12-08 13:02:19 +06:00
Nabin Hait
f73e8d0404 Merge branch 'master' into develop 2016-12-06 16:53:54 +05:30
Nabin Hait
efd35845e3 bumped to version 7.1.23 2016-12-06 17:23:54 +06:00
Nabin Hait
c52dc83256 Fixed merge conflict 2016-12-06 16:12:32 +05:30
Nabin Hait
d48f6f433e bumped to version 7.1.22 2016-12-06 16:39:07 +06:00
Nabin Hait
47ecf4c513 Merge branch 'master' into develop 2016-11-30 12:13:56 +05:30
Nabin Hait
63f803e7b9 bumped to version 7.1.21 2016-11-30 12:43:56 +06:00
Nabin Hait
4cf123bd8f Fixed merge conflict 2016-11-28 14:25:11 +05:30
Nabin Hait
c3ab1cf86b bumped to version 7.1.20 2016-11-28 14:54:40 +06:00
rohitwaghchaure
e03d56adb6 [Fix] Multiple letter head printing issue on print format (#2365) 2016-11-25 16:10:42 +05:30
Nabin Hait
610ea6b47b Merge branch 'master' into develop 2016-11-23 14:48:48 +05:30
Nabin Hait
d39510f915 bumped to version 7.1.19 2016-11-23 15:18:48 +06:00
Nabin Hait
4dea45109b Merge branch 'master' into develop 2016-11-22 17:16:40 +05:30
Nabin Hait
fc69d03dc8 bumped to version 7.1.18 2016-11-22 17:46:39 +06:00
Nabin Hait
6add60e054 Merge branch 'master' into develop 2016-11-22 12:16:12 +05:30
Nabin Hait
2adafeb95d bumped to version 7.1.17 2016-11-22 12:46:11 +06:00
Nabin Hait
188c7390eb Merge branch 'master' into develop 2016-11-21 19:08:23 +05:30
Nabin Hait
b7316e55fe bumped to version 7.1.16 2016-11-21 19:38:23 +06:00
Nabin Hait
db7837414d Merge pull request #2333 from rmehta/email-reply-fix
Use Message-ID in emails for threading
2016-11-18 13:59:14 +05:30
Rushabh Mehta
43c6c47513 [email] threading based on message_id in Email Queue and test case 2016-11-17 16:47:04 +05:30
Nabin Hait
85c8bbab8d Merge branch 'master' into develop 2016-11-17 16:42:45 +05:30
Nabin Hait
331ff47ed3 bumped to version 7.1.15 2016-11-17 17:12:45 +06:00
Rushabh Mehta
2fe0e2acad [fix] set Message-Id in email based on reference and tag replies to the same object 2016-11-17 09:45:44 +05:30
Rushabh Mehta
819983a7b6 Merge branch 'master' into develop 2016-11-16 11:20:42 +05:30