Commit graph

10955 commits

Author SHA1 Message Date
Nabin Hait
d3cfd0bbb4 Merge branch 'hotfix' 2016-11-22 17:16:39 +05:30
Nabin Hait
fc69d03dc8 bumped to version 7.1.18 2016-11-22 17:46:39 +06:00
Nabin Hait
17879397c7 Merge pull request #2359 from rmehta/print-format-builder-custom-html-fix
[hot] [fix] editing multiple CUSTOM HTML values in field
2016-11-22 13:48:34 +05:30
Rushabh Mehta
8d67b99166 [hot] [fix] editing multiple CUSTOM HTML values in field 2016-11-22 13:29:26 +05:30
Nabin Hait
f1f4f20cb9 Merge pull request #2355 from saurabh6790/append_empty_field_dict
[fix] check for column field dict before appending child table data field
2016-11-22 12:55:41 +05:30
Nabin Hait
4940695966 Merge branch 'hotfix' 2016-11-22 12:16:11 +05:30
Nabin Hait
2adafeb95d bumped to version 7.1.17 2016-11-22 12:46:11 +06:00
Nabin Hait
9255c9589f Merge pull request #2356 from nabinhait/hotfix
Cherry-picked "set last active time to user" from develop
2016-11-22 12:14:48 +05:30
Saurabh
68186a4943 [fix] check if user exists while setting last active date 2016-11-22 12:12:42 +05:30
Saurabh
6b3bf22462 [enhance] set last active time to user 2016-11-22 12:12:34 +05:30
Saurabh
a5b7bff45a [fix] check for column field dict before appending child table data field 2016-11-22 11:53:11 +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
Rohit Waghchaure
fa49525406 [Fix] Rename autoname field on rename of docname 2016-11-21 16:35:11 +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
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
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
Rushabh Mehta
e6f4a89c70 [fix] weekly auto email report, fixes frappe/erpnext#6936 2016-11-15 14:40:14 +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
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
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