KanchanChauhan
96e8be443e
user can update image from website ( #2089 )
2016-09-23 21:14:18 +05:30
rohitwaghchaure
821ef103eb
[Fix] Print and PDF Button is not working for reports ( #2096 )
2016-09-23 21:13:19 +05:30
Felipe Orellana
b34b9b76eb
Fixes issue where field 'javascript' in 'Website Script' Doctype breaks scripts delivery on website_script.py ( #2082 )
2016-09-23 21:12:48 +05:30
Nabin Hait
2a2173033a
Fixed version conflict
2016-09-23 17:22:09 +05:30
Nabin Hait
76a57515a9
Merge branch 'hotfix'
2016-09-23 17:21:33 +05:30
Nabin Hait
edb87a649f
bumped to version 7.0.35
2016-09-23 17:51:33 +06:00
Shreyas Patil
43b281c29d
[Fix] Retry on Authentication error by Gmail, if emails are pulled from/pushed to server too frequently ( #2090 )
...
* [Fix] Authentication error is raised by Gmail, if emails are pulled from/pushed to server too frequently
* [Fix] Minor Fix
2016-09-23 17:19:53 +05:30
Nabin Hait
2613908ccf
[patch][fix] create private files folder
2016-09-23 17:17:42 +05:30
Shreyas Patil
4e4f5b2d53
[Fix] Retry on Authentication error by Gmail, if emails are pulled from/pushed to server too frequently ( #2090 )
...
* [Fix] Authentication error is raised by Gmail, if emails are pulled from/pushed to server too frequently
* [Fix] Minor Fix
2016-09-23 17:16:22 +05:30
Rushabh Mehta
5eb7e67322
[minor] refactor
2016-09-23 14:47:56 +05:30
Rushabh Mehta
80bab7d73f
[minor] refactor
2016-09-23 14:46:38 +05:30
Rushabh Mehta
9670bed459
[minor] option in auto email report to send if data
2016-09-23 14:46:38 +05:30
Nabin Hait
aef76fbb3f
Fixed version conflict
2016-09-23 12:19:29 +05:30
Nabin Hait
a1e9b4d448
Merge branch 'hotfix'
2016-09-23 12:19:09 +05:30
Nabin Hait
d67a2cbc4a
bumped to version 7.0.34
2016-09-23 12:49:09 +06:00
Nabin Hait
4d624001d7
Update email_alert.js
2016-09-23 10:52:34 +05:30
Rushabh Mehta
e54a2f2430
[fix] spacing on login page
2016-09-23 10:35:30 +05:30
Nabin Hait
43ec493a08
Merge pull request #2086 from saurabh6790/paypal_currency_code_fix
...
[fix] currency code fix for paypal payment
2016-09-22 18:38:00 +05:30
Saurabh
8e520edba6
[fix] currency code fix for paypal payment
2016-09-22 18:21:12 +05:30
Rushabh Mehta
6e9c08d30d
[minor] ux enhancements for auto email report
2016-09-22 17:27:24 +05:30
Rushabh Mehta
658288cd18
[minor] feature to restrict no of rows in report
2016-09-22 17:02:34 +05:30
Rushabh Mehta
1f3abe9a79
[fix] [tests]
2016-09-22 16:20:42 +05:30
Rushabh Mehta
2c40d683a7
[fix] navbar and strip before translating
2016-09-22 15:21:06 +05:30
Rushabh Mehta
bb219be281
[fixes] to web forms, child table saving, multiple save
2016-09-22 12:55:14 +05:30
Nabin Hait
f3f0f6f291
Merge pull request #2083 from rmehta/email-retry
...
2 small fixes
2016-09-22 12:44:58 +05:30
Nabin Hait
41b2ada028
Merge pull request #2084 from netchampfaris/ui-fixes
...
ui fixes frappe/erpnext#6422 frappe/erpnext#6423
2016-09-22 12:34:25 +05:30
Faris Ansari
24b07f6445
[ui][fix] overflow navbar breadcrumbs
2016-09-22 12:27:24 +05:30
Faris Ansari
1391bac6d6
[ui][fix] notification indicator bg grey
2016-09-22 12:11:44 +05:30
Rushabh Mehta
ed8021c539
[minor] retry if disconnected while sending email
2016-09-22 11:41:50 +05:30
Rushabh Mehta
be49d43ec3
[fix] frappe.get_indicator (js)
2016-09-21 15:27:23 +05:30
Nabin Hait
a712b00d37
Merge pull request #2074 from DigiThinkIT/inherit_context
...
Inherit and Override Page Context
2016-09-21 13:14:16 +05:30
Nabin Hait
bfea7f687b
Fixed version conflict
2016-09-21 13:09:01 +05:30
Nabin Hait
8230bb7c12
Merge branch 'hotfix'
2016-09-21 13:08:39 +05:30
Nabin Hait
b64adb7045
bumped to version 7.0.33
2016-09-21 13:38:39 +06:00
Rushabh Mehta
d4ca31a19a
[minor] validate template in Standard Reply while saving, fixes #1884
2016-09-21 11:34:41 +05:30
Rushabh Mehta
85f24c694c
[minor] keep backups 24 hours old instead of 48 hours
2016-09-21 11:26:19 +05:30
Rushabh Mehta
e8e9aef91b
[fix] number of backups
2016-09-21 11:18:16 +05:30
Shreyas Patil
12422e75b0
[Minor] Allow user to set limit for downloadable backups for the site ( #2059 )
...
* [Minor] Allow user to set limit for downloadable backups for the site
* [Fix] Updated path for daily_long and weekly_long dropbox backup hooks
* [Fix] Updated system_settings.json
2016-09-21 11:10:41 +05:30
Rushabh Mehta
eb9122a6f3
[minor] allow user to be option in email, fixes frappe/erpnext#6409
2016-09-21 11:06:17 +05:30
Felipe Orellana
417a4fcc66
Renamed hook
...
Renamed hook to extend_website_page_controller_context to better fit the definition of a website page controller.
2016-09-20 10:26:25 -04:00
Rushabh Mehta
171d93130d
[fix] remove "language" if set via old setup wizard
2016-09-20 18:29:52 +05:30
Nabin Hait
abb723247c
Merge pull request #2071 from saurabh6790/quick_entry_for_treeview
...
[fix] pull all mandatory fields from meta while creating new node in tree
2016-09-20 18:06:29 +05:30
Rushabh Mehta
74cb41ae71
[enhance] web form pagination frappe/shishuvan#3 ( #2076 )
...
* [enhance] web form pagination frappe/shishuvan#3
* [minor] add label in web form grid
* [minor] select module for exporting web form
* [fix] more fixes, #2057
2016-09-20 17:47:39 +05:30
Nabin Hait
4bfd2949a5
Merge pull request #2078 from rmehta/ignore-errors-in-pdf
...
[minor] ignore load issues in wkhtmltopdf
2016-09-20 17:14:49 +05:30
Rushabh Mehta
74c4cbdba8
[minor] ignore load issues in wkhtmltopdf
2016-09-20 17:12:25 +05:30
Nabin Hait
83294a6b71
Merge pull request #2077 from shreyasp/civil-contract-app-list
...
[Minor] Added Civil contracting to app listing to allow installations
2016-09-20 17:03:01 +05:30
shreyas
7aceb2f37d
[Minor] Added Civil contracting to app listing to allow installations
2016-09-20 16:57:09 +05:30
Nabin Hait
86a060482f
Merge pull request #2075 from RobertSchouten/patch-65
...
[typo] decloration to declaration
2016-09-20 11:41:42 +05:30
RobertSchouten
246a6f5879
[typo] decloration to declaration
2016-09-20 14:07:28 +08:00
Nabin Hait
7bb304dd1a
Merge pull request #2054 from nabinhait/field_char_limit
...
Validate length of fieldname
2016-09-20 11:21:09 +05:30