Commit graph

334 commits

Author SHA1 Message Date
Rushabh Mehta
43c6c47513 [email] threading based on message_id in Email Queue and test case 2016-11-17 16:47:04 +05:30
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
Nabin Hait
a2f2340f25 bumped to version 7.1.1 2016-10-27 13:08:27 +06:00
Nabin Hait
e0f09fe3dd bumped to version 7.1.0 2016-10-26 18:21:25 +06:00
Nabin Hait
a5abf3d6b4 Update __init__.py 2016-10-26 17:50:24 +05:30
Nabin Hait
f212851380 bumped to version 7.2.0 2016-10-26 18:16:25 +06:00
Rushabh Mehta
89a77016a5 [minor] dont show disabled roles in permission manager (#2180) 2016-10-25 10:59:41 +05:30
Rushabh Mehta
c36055d29e [minor] added frappe.format and validate_payment in web_form.html 2016-10-18 21:52:17 +05:30
Rushabh Mehta
5c783a57d2 [refactor] has_website_permission parameters 2016-10-12 10:30:48 +05:30
Rushabh Mehta
66b4c470e1 [fix] has_website_permissions 2016-10-12 10:26:20 +05:30
Rushabh Mehta
d2db71f8c4 [fixes] serverside validation in web form 2016-10-11 11:44:22 +05:30
Rushabh Mehta
9d7ee83c5e [refactor] scheduler log is now error log and as MyISAM (commit not required) (#2152)
* [refactor] scheduler log is now error log

* [minor] new naming series

* [fix] engine

* [fix] saved by tests
2016-10-06 17:17:55 +05:30
Rushabh Mehta
43a515c677 [fix] dont check permissions for setting log 2016-10-06 12:15:22 +05:30
Rushabh Mehta
7101066f1f [fixes] for razorpay 2016-10-04 16:11:16 +05:30
Rushabh Mehta
e091005b00 [logger] fix tests 2016-09-29 11:44:07 +05:30
KanchanChauhan
96e8be443e user can update image from website (#2089) 2016-09-23 21:14:18 +05:30
Nabin Hait
aef76fbb3f Fixed version conflict 2016-09-23 12:19:29 +05:30
Nabin Hait
d67a2cbc4a bumped to version 7.0.34 2016-09-23 12:49:09 +06:00
Rushabh Mehta
2c40d683a7 [fix] navbar and strip before translating 2016-09-22 15:21:06 +05:30
Nabin Hait
f3f0f6f291 Merge pull request #2083 from rmehta/email-retry
2 small fixes
2016-09-22 12:44:58 +05:30
Rushabh Mehta
ed8021c539 [minor] retry if disconnected while sending email 2016-09-22 11:41:50 +05:30
Nabin Hait
b64adb7045 bumped to version 7.0.33 2016-09-21 13:38:39 +06:00
Rushabh Mehta
ef3412b9cb [enhance] set doctype label via Customize Form frappe/frappe#2019 (#2061)
* [enhance] set doctype label via Customize Form frappe/erpnext#2019

* Update customize_form.py
2016-09-20 11:20:46 +05:30
Rushabh Mehta
2e66bd044b [docs] and other minor fixes 2016-09-15 13:55:37 +05:30