Commit graph

10862 commits

Author SHA1 Message Date
Nabin Hait
c619c0f9fb bumped to version 7.0.32 2016-09-14 17:54:00 +06:00
Nabin Hait
64e178f6e0 Update cleanup_list_settings.py 2016-09-14 17:22:33 +05:30
Nabin Hait
c1e5e5dabe Fixed version conflict 2016-09-14 15:52:32 +05:30
Nabin Hait
6c41ae3fd9 Merge branch 'hotfix' 2016-09-14 15:51:52 +05:30
Nabin Hait
5eac10a5c7 bumped to version 7.0.31 2016-09-14 16:21:52 +06:00
Nabin Hait
d070f880e2 Validate length of fieldname 2016-09-14 15:36:33 +05:30
Nabin Hait
9c785cdbce Merge pull request #2050 from manqala/patch-1
Update sites.md
2016-09-14 15:34:04 +05:30
Nabin Hait
197805cd48 Merge pull request #2051 from strixaluco/patch-3
Update country_info.json
2016-09-14 15:33:54 +05:30
Rushabh Mehta
541d8be95f [complete] auto email report 2016-09-14 12:00:52 +05:30
Rushabh Mehta
5cdab8da3f [fix] language for zh and zh-TW (#2052) 2016-09-14 10:27:32 +05:30
strixaluco
bb07efa4f0 Update country_info.json
Ukrainian hryvnia added
2016-09-14 09:00:14 +08:00
manqala
29c7203fe8 Update sites.md 2016-09-13 21:37:30 +01:00
Rushabh Mehta
37eb4eaffc [wip] grid in web form (#2044)
* [wip] grid in web form

* [complete] webform in grid

* [minor] configurable sidebar items in web form

* [fix] tests

* [style]
2016-09-13 14:38:38 +05:30
KanchanChauhan
8b78f70b43 Option to send email from Data Import Tool where applicable (#2026) 2016-09-13 13:13:02 +05:30
Shreyas Patil
a5b0b4211a [Fix] Increment the failed attempts for email account failure (#2045) 2016-09-13 10:34:54 +05:30
RobertSchouten
0422311fb6 print format show default heading for editing (#2039)
* print format show default heading for editing

* print format show default heading for editing
2016-09-12 16:15:39 +05:30
RobertSchouten
ac63c720b8 [feature] print only what is expanded in reports (#2038)
ie balance report will print like is visable not all items
2016-09-12 16:12:22 +05:30
RobertSchouten
17e2dff613 [fix] creating doc from link updates fetch fields (#2037)
* fix creating doc from link updates fetch fields

allows the updating of fetch fields from a full page creation

* Update save.js
2016-09-12 16:09:38 +05:30
Neil Trini Lasrado
e60c19862c Some fixes for web forms (#2043)
* moved position of desc for a field of type text in webforms

* Fixed Link field in Web Forms

* [Fix] - comments in js must be /* */
2016-09-12 16:07:36 +05:30
Shreyas Patil
e5bb0bb283 [Fix] Social login not allowed for a disabled user (#2032) 2016-09-12 16:06:35 +05:30
Rushabh Mehta
345d310fe3 [fix] name case for doctype, fixes #2029 2016-09-12 16:02:18 +05:30
Faris Ansari
6baef1073d [ui] fixes (frappe/erpnext#6252) (frappe/erpnext#6275) (#2023)
* [ui] fix navbar overlap

* [ui][mobile] fix user-background-image
2016-09-12 15:51:03 +05:30
Rushabh Mehta
22dbaafb4d [fix] email account disabling after 3 tries #2018 2016-09-12 15:45:22 +05:30
KaterinaR
e06b750c00 [Documentation update] - Update documentation for XML Report (#2010)
* !U Update documentation dor XML Report

* !F Fix empty log information in output (Message: None)
2016-09-12 15:29:52 +05:30
RobertSchouten
02a7c0dc73 allow creation of user permissions on site creation (#2006) 2016-09-12 15:29:14 +05:30
Nabin Hait
51169eb7bc Merge pull request #2027 from shreyasp/reinstall-site
[Minor] Added '--admin-password' to bypass admin password prompt on reinstalling the site
2016-09-12 13:06:19 +05:30
Rushabh Mehta
9e3b5cd3cc [fix] comments for debugging js fixes #1961 2016-09-12 13:06:04 +05:30
Nabin Hait
87d458907a Merge pull request #2028 from nabinhait/list_settings_fix
Fixed list settings
2016-09-12 13:05:26 +05:30
Nabin Hait
d1bf2429fe Fixed list settings 2016-09-12 13:04:52 +05:30
Nabin Hait
fc064b8f05 Merge pull request #2041 from rmehta/allow-draft-print
[fix] make "draft" heading for print format configurable
2016-09-12 13:01:38 +05:30
Rushabh Mehta
c966fb3d00 [fix] make "draft" heading for print format configurable 2016-09-12 13:00:24 +05:30
Nabin Hait
19c25b64ab Merge pull request #2034 from rmehta/desktop-icon-fix
[fix] let module_name be the label for Desktop Icon so we can have reports too
2016-09-12 12:59:34 +05:30
Rushabh Mehta
ae97f5e3c6 [minor] catch and show exception in bulk update 2016-09-12 12:41:39 +05:30
Rushabh Mehta
e5efaea64b [fix] let module_name be the label for Desktop Icon so we can have reports too 2016-09-09 20:45:38 +05:30
Saurabh
772d72577f [urgent][fix] handler if ldap is not setup (#2033) 2016-09-09 19:39:00 +05:30
Saurabh
18c62f0470 Integration broker (#1968)
* [enhancement] integration borker and controller

* [minor][fix] parameter naming changes

* [fix] common scheduler for integration service

* [fix] integrations

* [patch] patch to move payment gateway in Integration Service

* [fix] add payment success, cancel and failuer handling pages

* [enhancment] dropbox integration merged in integration services

* provision to add custom parameters

* [fixes] patch fix to setup dropbox settings

* [fixes] removed dropbox backup, api usage note for paypal and razorpay

* [minor][fix] deprecate service events

* [fix] return type fix for checkout urls

* [fix] add custom settings via patch for dropbox backup frequency

* [fix] remove gride editting

* [enhance] ldap based login

* [enhance] login via ldap credentails

* [commit] remove parameter table, save params as json dict
2016-09-09 11:15:18 +05:30
shreyas
649696fb93 [Minor] Added '--admin-password' to by pass admin password prompt on reinstalling the site 2016-09-08 13:33:27 +05:30
Rushabh Mehta
34965b75b5 [fix] test_report.py 2016-09-03 20:59:09 +05:30
Faris Ansari
add9c74779 [enhance] search results in help (#2022) 2016-09-01 18:07:22 +05:30
Rushabh Mehta
3a839fb433 [fix] test 2016-09-01 18:06:53 +05:30
Rushabh Mehta
303e7460c2 [feature] [wip] added Auto Email Report 2016-09-01 17:52:33 +05:30
Rushabh Mehta
19e955f81d [minor] catch badly formed template while building help 2016-09-01 13:17:08 +05:30
Rushabh Mehta
ed63eb9719 [fix] language test for derivative languages 2016-08-31 21:51:56 +05:30
Rushabh Mehta
b1ab3c97b7 [fix] patch 2016-08-31 15:00:01 +05:30
Rushabh Mehta
20d07706e7 [fix] move error_snapshot templates to doctype folder, fixes #1993, frappe/erpnext#6207 2016-08-30 10:06:25 +05:30
Rushabh Mehta
80ca5fecad [minor] expire notification in popup note 2016-08-30 09:59:23 +05:30
Rushabh Mehta
05a1e55bf9 [fix] force to use valid language when syncing languages 2016-08-30 09:53:30 +05:30
Rushabh Mehta
e199d21664 [minor] [patch] import os for patches 2016-08-29 22:08:48 +05:30
Rushabh Mehta
407969b81f [fix] change_log 2016-08-29 17:03:53 +05:30
Rushabh Mehta
f20bf4ae25 [feature] show note to all users on popup (#2017) 2016-08-29 15:40:26 +05:30