Commit graph

10934 commits

Author SHA1 Message Date
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
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
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
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
Nabin Hait
47e7eabc57 Merge pull request #2297 from rohitwaghchaure/auto_email_report_issue
[Fix] break fieldtype issue in the auto email report, object split issue for the columns which has list and dictionary
2016-11-11 14:54:24 +05:30
Nabin Hait
5ea4a40791 Merge pull request #2300 from rmehta/datepicker-z-fix
[fix] z-index for datepicker should be above grid row
2016-11-11 14:53:33 +05:30
Nabin Hait
97b01ae887 Merge pull request #2301 from rmehta/outhfix
[fix] global variable import issue
2016-11-11 14:53:10 +05:30
Rushabh Mehta
80a3a3f8f1 [fix] global variable import issue 2016-11-11 14:50:12 +05:30
Rushabh Mehta
33a48cd957 [fix] z-index for datepicker should be above grid row 2016-11-11 13:24:11 +05:30
Rohit Waghchaure
fc454e014d [Fix] break fieldtype issue in the auto email report, object split issue for the columns which has list and dictionary 2016-11-10 19:16:15 +05:30
pratu16x7
aa019291b6 Add a span showing the number of selected entries (#2286)
* Add a span showing the number of selected entries

* Make the item status string translatable

* Indentation fix
2016-11-10 17:35:36 +05:30
Nabin Hait
0672f50b26 Merge branch 'hotfix' 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
784f58a27c Update disabled_print_settings_for_custom_print_format.py 2016-11-10 16:14:41 +05:30
Nabin Hait
715933c237 Merge branch 'hotfix' 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
rohitwaghchaure
d8204d0891 [Fix] Disabled print settings for the custom print format (#2291) 2016-11-10 14:55:24 +05:30
Rushabh Mehta
9610e32d08 [minor] do not throw an exception if user tries to complete setup again 2016-11-10 12:56:17 +05:30