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
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
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
Nabin Hait
5383882754
Update db_schema.py
2016-09-20 11:20:57 +05:30
Rushabh Mehta
ef3412b9cb
[enhance] set doctype label via Customize Form frappe/frappe#2019 ( #2061 )
...
* [enhance] set doctype label via Customize Form frappe/erpnext#2019
* Update customize_form.py
2016-09-20 11:20:46 +05:30
Nabin Hait
72f458f41b
Merge pull request #2069 from rmehta/dynamic-page-loading
...
[fix] dont cache pages with dynamic server side content
2016-09-20 11:09:59 +05:30
Nabin Hait
9ccd5ab20a
Merge pull request #2070 from netchampfaris/ui-fixes
...
[ui][fix] frappe/erpnext#6378
2016-09-20 11:01:47 +05:30
Felipe Orellana
23c045d001
Merge branch 'develop' into inherit_context
2016-09-19 10:55:21 -07:00
Felipe Orellana
cde153d75b
Added inheritable context hook
2016-09-19 10:17:22 -07:00
Nabin Hait
c8ca79bda5
Merge pull request #2072 from saurabh6790/razorpay_payment_page
...
[minor][fix] razorpay payment
2016-09-19 18:20:47 +05:30
Saurabh
550ea2258d
[minor][fix] razorpay payment
2016-09-19 18:11:27 +05:30
Saurabh
7d5123dd54
[fix] pull all madatory fields from meta while creatting new node in tree
2016-09-19 16:45:07 +05:30
Rushabh Mehta
72ed223d41
[minor] more options for frappe.set_query and set_indicator in dashboard
2016-09-19 16:08:34 +05:30
Sujit Maharjan
9dc3bec1a5
Fixed password decryption for outgoing email ( #2067 )
...
Since the password was not decrypted, there was error in outgoing email (not from default).
Added
email_account.password = email_account.get_password()
to decrypt the password.
2016-09-19 14:25:59 +05:30
Faris Ansari
f66672ea02
[ui][fix] notification indicator bg
2016-09-19 13:37:10 +05:30
Faris Ansari
5e577c6ea4
[mobile][fixes] (frappe/frappe#2048) (frappe/erpnext#6386) ( #2053 )
...
* [mobile][fix] uploaded images not visible
* [mobile][fix] overflow title
2016-09-19 13:16:00 +05:30
RobertSchouten
5a4d093cfe
[feature] opt out of workflow status override in list view ( #2040 )
...
* [feature] opt out of workflow status override in list view
* [feature] opt out of workflow status override in list view
2016-09-19 13:13:55 +05:30
paurosello
72fa048088
Change colspan in listview ( #2058 )
...
* Change colspan in listview
Closed last PR as I messed up with my repo.
Sometimes the fields have too much space or it is really small, this solutions allows the users to modify the field colspan per field using the following syntax in frappe.listview_settings
`column_colspan: {"fieldname":2},`
* Update docfield.json
2016-09-19 13:13:11 +05:30
Makarand Bauskar
ac616e1e3e
[minor] spelling fixes ( #2066 )
2016-09-19 13:09:03 +05:30
akshay83
14b8e5cee4
[fix] workflow message ( #2056 )
2016-09-19 13:08:36 +05:30
Nabin Hait
f350578f5c
Merge pull request #2068 from rohitwaghchaure/spelling
...
[Fix] print_cess to print_css
2016-09-19 12:40:16 +05:30
Rushabh Mehta
0544194ef6
[fix] dont cache pages with dynamic server side content
2016-09-19 12:36:43 +05:30
Rohit Waghchaure
efc02f6ffc
[Fix] print_cess to print_css
2016-09-19 11:42:33 +05:30
Nabin Hait
763fda8a5c
Merge pull request #2064 from saurabh6790/patch_fix_ib
...
[fix] dropbox service fix
2016-09-16 21:45:32 +05:30
Saurabh
ce91426302
[fix] dropbox service fix
2016-09-16 17:47:55 +05:30
Rushabh Mehta
059b7d7b70
[fix] change subject in email alert, fixes frappe/erpnext#6361
2016-09-16 15:59:57 +05:30
Rushabh Mehta
3726aacb8a
[fix] reportview click on edit features
2016-09-16 15:57:50 +05:30
Nabin Hait
55a92e6554
Merge branch 'integration_broker_patch' into develop
2016-09-16 15:40:47 +05:30
Nabin Hait
cb54017f4f
[fix] integration broker patch
2016-09-16 15:40:28 +05:30
Neil Trini Lasrado
e804cd56e4
Fixes for web forms ( #2060 )
2016-09-15 17:12:44 +05:30
