Rushabh Mehta
5bfc3f2a2e
[fix] for muted emails
2016-11-17 16:55:43 +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
Rushabh Mehta
3b93e04887
[fix] frappe.db.set_value
2016-11-17 09:45:44 +05:30
Rushabh Mehta
9ef8f18fcf
[fix] for tests, and db_set now accepts dict
2016-11-17 09:45:44 +05:30
Rushabh Mehta
427de16d79
[fix] for test
2016-11-17 09:45:44 +05:30
Rushabh Mehta
c97d372655
[fix] set message-id and sync threads
2016-11-17 09:45:44 +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
7960bc729a
Merge branch 'hotfix'
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
Rushabh Mehta
bd36f63a7b
[minor] supress duplicate icon error in setup wizard ( #2327 )
2016-11-16 11:19:36 +05:30
Rushabh Mehta
c5551201e4
[fix] frappe.client.set_value for unsetting value ( #2323 )
2016-11-16 11:08:39 +05:30
Rushabh Mehta
9fc234e63d
[fix] Custom HTML is now a Code field in Print Format Builder, fixes #2229 ( #2320 )
2016-11-16 11:08:23 +05:30
Rushabh Mehta
cf81fe25b0
[fix] ux for web forms that dont require login, fixes #2266 ( #2322 )
2016-11-16 11:08:09 +05:30
Rushabh Mehta
e4f279b580
[minor] [fix] extract images before sanitizing html for text editor ( #2319 )
2016-11-16 11:07:56 +05:30
Nabin Hait
90e63cae6d
setup integration service patch fixed ( #2310 )
2016-11-16 11:07:41 +05:30
clarkejj
24de8f6811
404 File not found error ( #2321 )
...
this file name causes 404 File not found error
https://frappe.github.io/frappe/user/en/bench/guides/production-setup.html
correct file name
https://frappe.github.io/frappe/user/en/bench/guides/setup-production.html
2016-11-15 16:31:38 +05:30
Rushabh Mehta
e6f4a89c70
[fix] weekly auto email report, fixes frappe/erpnext#6936
2016-11-15 14:40:14 +05:30
Nabin Hait
310ef1aaec
Merge pull request #2316 from saurabh6790/paypal_payament_fix_central
...
[urgent][fix] PayPal payemnt fix
2016-11-14 20:33:11 +05:30
Saurabh
8b4a9b7394
[urgent][fix] PayPal payemnt fix
2016-11-14 20:17:41 +05:30
Nabin Hait
342e3ec10a
Merge branch 'master' into develop
2016-11-14 17:39:07 +05:30
Nabin Hait
0d2674e714
Merge branch 'hotfix'
2016-11-14 17:39:06 +05:30
Nabin Hait
335df74b42
bumped to version 7.1.13
2016-11-14 18:09:06 +06:00
Rushabh Mehta
0f6420517a
[hot-fix] fix test and print format
2016-11-14 17:33:32 +05:30
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
4e45053d5d
Merge pull request #2311 from rmehta/website-css-fix
...
[fix] css for shopping cart
2016-11-14 17:18:22 +05:30
Rushabh Mehta
faba31b556
[fix] css for shopping cart
2016-11-14 14:54:26 +05:30
Nabin Hait
bfecd424c1
Delete paypal_integration.json
2016-11-14 13:17:57 +05:30
Nabin Hait
c41ef2de2d
Delete razorpay_integration.json
2016-11-14 13:17:47 +05:30
Nabin Hait
c62fff0c41
Merge branch 'master' into develop
2016-11-14 12:39:04 +05:30
Nabin Hait
9327d30d22
Merge branch 'hotfix'
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
Saurabh
500194a03a
[fix] added reference doctype and docname to integration request ( #2295 )
2016-11-14 12:15:13 +05:30
robert schouten
5cfe9c70c1
[fix] show timeline_emails on timeline_docname ( #2238 )
2016-11-14 12:09:46 +05:30
KanchanChauhan
ca22d756e3
Send unsubscribe message in email option added to Email Account ( #2298 )
2016-11-14 12:06:59 +05:30
Revant Nandgaonkar
7757aaef6a
[Fix] oauth url delimiter moved to function instead of global ( #2305 )
...
* [Fix] oauth url delimiter moved to function instead of global
* [Fix] renamed oauth_url_delimiter to get_url_delimiter
2016-11-14 12:05:47 +05:30
Nabin Hait
a73e5df9ba
Merge pull request #2285 from rmehta/setup-wizard-fix
...
[minor] do not throw an exception if user tries to complete setup again
2016-11-14 11:49:25 +05:30
Nabin Hait
a56505f044
Merge pull request #2309 from rmehta/print-format-layout-fix
...
[print format] show column even if empty to make consistent with original implementation
2016-11-14 11:48:32 +05:30
Rushabh Mehta
81e98a6cdf
[print format] show column even if empty to make consistent with original implementation
2016-11-14 11:38:45 +05:30
Nabin Hait
7d72d64e8a
Merge pull request #2308 from rmehta/setup-wizard-fix-1
...
[fix] for setup wizard in de, fr
2016-11-14 11:38:13 +05:30
Rushabh Mehta
6c91d78348
[fix] for setup wizard in de, fr
2016-11-14 11:16:35 +05:30
shubhamgupta123
b4859162f3
[Fix] Footer Address not showing in website ( #2287 )
...
* Fix for Footer Address not showing in website
This is a probable fix for https://github.com/frappe/frappe/issues/2267
Due to earlier condition, only either copyright or the footer address was showing.
This is my first pull request. Kindly merge if everything seems right.
* [Fix] Formatting for the footer address
2016-11-11 17:05:26 +05:30
Nabin Hait
eaf06c4271
Merge pull request #2289 from saurabh6790/set_last_active
...
Set last active
2016-11-11 15:29:40 +05:30
Nabin Hait
2ffa35b38a
Fixed merge conflict
2016-11-11 15:10:35 +05:30
Nabin Hait
f5fd11269b
Merge branch 'hotfix'
2016-11-11 15:06:58 +05:30
Nabin Hait
db9fad8e51
bumped to version 7.1.11
2016-11-11 15:36:58 +06:00
Nabin Hait
a069893db2
Merge pull request #2302 from rmehta/oauth-fix-2
...
Remove global variables in oauth
2016-11-11 15:02:06 +05:30
Rushabh Mehta
462972ec84
[fix] remove global variables in oauth
2016-11-11 14:59:27 +05:30
Rushabh Mehta
924510610b
[fix] remove global variables in oauth
2016-11-11 14:57:13 +05:30
