Commit graph

356 commits

Author SHA1 Message Date
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
Rushabh Mehta
b03bf1cc96 bumped to version 7.1.14 2016-11-16 11:50:42 +06:00
Nabin Hait
342e3ec10a Merge branch 'master' into develop 2016-11-14 17:39:07 +05:30
Nabin Hait
335df74b42 bumped to version 7.1.13 2016-11-14 18:09:06 +06:00
Nabin Hait
b26ebbc60e Merge pull request #2315 from rmehta/cache-full-fix
[hot] fix bug that caused session crashing when cache was full
2016-11-14 17:27:18 +05:30
Rushabh Mehta
612d612b7e [hot] fix bug that caused session crashing when cache was full 2016-11-14 17:22:08 +05:30
Nabin Hait
c62fff0c41 Merge branch 'master' into develop 2016-11-14 12:39:04 +05:30
Nabin Hait
4f07ed9b4a bumped to version 7.1.12 2016-11-14 13:09:04 +06:00
Nabin Hait
2ffa35b38a Fixed merge conflict 2016-11-11 15:10:35 +05:30
Nabin Hait
db9fad8e51 bumped to version 7.1.11 2016-11-11 15:36:58 +06:00
Nabin Hait
a8d77be9df Merge branch 'master' into develop 2016-11-10 16:15:48 +05:30
Nabin Hait
837e3b75d0 bumped to version 7.1.10 2016-11-10 16:45:48 +06:00
Nabin Hait
a350d473a6 Merge branch 'master' into develop 2016-11-10 15:25:04 +05:30
Nabin Hait
e60d438a28 bumped to version 7.1.9 2016-11-10 15:55:03 +06:00
Nabin Hait
541891d5e1 Merge branch 'master' into develop 2016-11-09 14:50:05 +05:30
Nabin Hait
e4caa4e944 bumped to version 7.1.8 2016-11-09 15:20:05 +06:00
Nabin Hait
178be8893c Merge branch 'master' into develop 2016-11-08 15:20:34 +05:30
Nabin Hait
f17bae772c bumped to version 7.1.7 2016-11-08 15:50:34 +06:00
Rushabh Mehta
95fdfe44d3 [minor] added default standard filters (#2270)
* [minor] added default standard filters

* [fix] frappe.sendmail

* [fix] frappe.sendmail
2016-11-07 17:18:49 +05:30
Nabin Hait
fb377313ab Merge branch 'master' into develop 2016-11-04 16:52:13 +05:30
Nabin Hait
1e0f191408 bumped to version 7.1.6 2016-11-04 17:22:13 +06:00
Saurabh
66052b4747 [fix] pass kargs doctype in has_website_permission (#2251) 2016-11-04 13:32:37 +05:30
Nabin Hait
d44e6c759b bumped to version 7.1.5 2016-11-03 15:43:47 +06:00
Nabin Hait
4f4dd9c51c bumped to version 7.1.4 2016-11-01 13:08:50 +06:00
Nabin Hait
e68c2658e7 bumped to version 7.1.3 2016-10-31 15:35:36 +06:00
Nabin Hait
c7ebe79330 bumped to version 7.1.2 2016-10-27 19:37:25 +06:00