Commit graph

11027 commits

Author SHA1 Message Date
Omar Ali
b30780dc2a fixing when webpage get_context has any exception (#2338) 2016-11-18 14:06:27 +05:30
clarkejj
90cffeff6e [fix] 404 File not found errors (#2326)
specify full path
https://frappe.github.io/frappe/user/en/guides/app-development/

This file name matches the old one - I am guessing this image is correct!?
frappe/docs/assets/img/script-report.png
2016-11-18 14:05:59 +05:30
robert schouten
5ede870700 daterangepicker now as control for filtering (#2324)
* daterangepicker now as control for filtering

* rename daterange picker options

* cleanup name reference

* allow greater control of daterangepicker options

* Update data.py

comma + space
2016-11-18 14:03:56 +05:30
Makarand Bauskar
51fafcb18b [minor] check if file is image file using either file name or url (#2340) 2016-11-18 14:00:51 +05:30
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
4df583b1cf [fix] email, deprecate frappe.email.sendmail, use frappe.sendmail 2016-11-18 11:32:18 +05:30
Rushabh Mehta
f801a7c56c [fix] don't send email in test' 2016-11-18 08:12:06 +05:30
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
Nabin Hait
85c8bbab8d Merge branch 'master' into develop 2016-11-17 16:42:45 +05:30
Nabin Hait
02f98ab56c Merge branch 'hotfix' 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
Nabin Hait
efbe173440 Merge pull request #2331 from shreyasp/downloadable-backups
[Minor] Show only sql.gz in Downloadable Backups Page
2016-11-17 16:01:00 +05:30
Nabin Hait
01fe4b665f Merge pull request #2337 from shreyasp/translations-setup-wizard
[Fix] Setup wizard exception fix for unique_module_name_standard
2016-11-17 15:52:18 +05:30
Nabin Hait
2b64a657e5 Merge pull request #2332 from rmehta/print-format-heading-fix
[fix] print format heading bug
2016-11-17 15:42:32 +05:30
shreyas
743e157e03 [Fix] Setup wizard exception fix for unique_module_name_standard 2016-11-17 15:39:31 +05:30
Nabin Hait
43642df12f Merge pull request #2336 from saurabh6790/dropbox_typo_fix
[minor][fix] typo fix
2016-11-17 14:47:08 +05:30
Saurabh
4d7f1c33cf [minor][fix] typo fix 2016-11-17 12:25:41 +05:30
Faris Ansari
27030008b2 [gantt] set scroll position fix for ie11 (#2328) 2016-11-17 09:46:35 +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
shreyas
4ebbaac586 [Minor] Show only 'sql.gz' in Downloadable backups page 2016-11-16 16:58:17 +05:30
Rushabh Mehta
e037787c69 [fix] print format heading bug 2016-11-16 16:57:14 +05:30
Rushabh Mehta
7960bc729a Merge branch 'hotfix' 2016-11-16 11:20:42 +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
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