Commit graph

11049 commits

Author SHA1 Message Date
robert schouten
6917dea00e remove filter dash limit as no performance increase (#2318) 2016-11-22 10:55:59 +05:30
Rushabh Mehta
90bc926730 [minor] added flush feature in error log and apply filters from list only for link and select, fixes frappe/erpnext#6968 (#2350) 2016-11-22 10:55:43 +05:30
Rushabh Mehta
7c8652fbf2 [docs] added some style and some fixes (#2352) 2016-11-22 10:55:32 +05:30
Rushabh Mehta
a099690e8f Revert "[optimize] remove count(*) from queries" (#2353) 2016-11-22 10:55:13 +05:30
Nabin Hait
188c7390eb Merge branch 'master' into develop 2016-11-21 19:08:23 +05:30
Nabin Hait
ae197c37b1 Merge branch 'hotfix' 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
262920288e Merge pull request #2349 from rohitwaghchaure/rename_autoname_field
[Fix] Rename autoname field on rename of docname
2016-11-21 19:03:30 +05:30
Nabin Hait
bc9cd55cd9 Merge pull request #2351 from frappe/nabinhait-patch-2
Changed order of Rename scheduler log patch
2016-11-21 19:01:44 +05:30
Nabin Hait
066e91d077 Update patches.txt 2016-11-21 18:36:26 +05:30
Faris Ansari
ff98e29dd9 [gantt] always sort based on start_date field (#2342) 2016-11-21 16:51:01 +05:30
Omar Ali
d100c7f0c5 excepting frappe.Redirect exception from exception handling (#2348) 2016-11-21 16:45:43 +05:30
Rushabh Mehta
3c7c17215d [fix] fix toc for docs, url for local and other fixes #2293 (#2346) 2016-11-21 16:43:16 +05:30
Rohit Waghchaure
fa49525406 [Fix] Rename autoname field on rename of docname 2016-11-21 16:35:11 +05:30
Nabin Hait
e26e80cf5c Merge pull request #2347 from rmehta/remove-count-star
[optimize] remove count(*) from queries
2016-11-21 15:16:26 +05:30
Rushabh Mehta
0ff140fa2b [optimize] remove count(*) from queries 2016-11-21 14:58:18 +05:30
Rushabh Mehta
a256e029b6 [minor] UI fixes (#2345) 2016-11-21 13:29:36 +05:30
Rushabh Mehta
fac7f1e31b [fix] [hot] hset bug 2016-11-19 17:16:49 +05:30
rohitwaghchaure
abc4996a20 Added docstring for get_single_value, get_singles_dict methods (#2292) 2016-11-19 13:02:49 +05:30
Rushabh Mehta
ddbf3d2662 [fix] always save site encoded keys in local and redis 2016-11-18 18:37:15 +05:30
Rushabh Mehta
391aeb9979 [fix] condition for between 2016-11-18 18:10:20 +05:30
Rushabh Mehta
4a5365990f [hot] fix email threading 2016-11-18 18:05:34 +05:30
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
02f98ab56c Merge branch 'hotfix' 2016-11-17 16:42:45 +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
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