Commit graph

10779 commits

Author SHA1 Message Date
Nabin Hait
b208dcb16b Fixed version conflict 2016-10-18 15:24:38 +05:30
Nabin Hait
9def17fa6b Merge branch 'hotfix' 2016-10-18 15:24:05 +05:30
Nabin Hait
cefd823e73 bumped to version 7.0.45 2016-10-18 15:54:05 +06:00
Rushabh Mehta
9789da957e [fix] change data property in _dashboard.py files to get_data to make it translate friendly 2016-10-18 14:54:17 +05:30
Rushabh Mehta
7d1b29a413 [fix] [import] ignore if time missing while file import 2016-10-18 14:25:11 +05:30
Rushabh Mehta
b8b2811aa6 [minor] 2016-10-18 14:23:06 +05:30
KanchanChauhan
6e9fb3b04c DocShare perm fixed, can read if share permissions (#2171) 2016-10-18 14:16:27 +05:30
Faris Ansari
623b271c11 [ui-fix][mobile] calendar view (#2170) 2016-10-18 14:16:01 +05:30
Faris Ansari
c650d6a87d Gantt: fixes and features (#2169)
* [gantt] refactor code, hide progress handle for 0% progress

* [gantt] limit progress resize

* [gantt] invalid bar in task
2016-10-18 14:15:34 +05:30
Nabin Hait
77af845527 Merge pull request #2168 from RobertSchouten/patch-5
[docs] add new hook and full list
2016-10-17 15:54:38 +05:30
RobertSchouten
e9f5768a8b add new hook and full list 2016-10-17 16:51:46 +08:00
OluyomiKay
a2a9016ae7 fix for email content horizontal overflow (#2164) 2016-10-17 12:23:21 +05:30
Faris Ansari
1259518074 [ui-fixes] Report: Pick columns frappe/erpnext#3678 frappe/erpnext#3676 (#2163)
* [update] Sortable to 1.4.2

* [mobile] fix scroll in pick columns view
2016-10-17 12:22:05 +05:30
Rushabh Mehta
1026a48a97 [refactor] code for integration service scheduled events 2016-10-13 14:59:23 +05:30
Rushabh Mehta
79f51648a1 [fix] for test 2016-10-13 12:24:27 +05:30
Rushabh Mehta
73b66137af [minor] tests and fix for check type filters 2016-10-13 11:08:39 +05:30
Rushabh Mehta
ecfb630246 [minor] print format in web form 2016-10-12 14:12:41 +05:30
Rushabh Mehta
5c783a57d2 [refactor] has_website_permission parameters 2016-10-12 10:30:48 +05:30
Rushabh Mehta
66b4c470e1 [fix] has_website_permissions 2016-10-12 10:26:20 +05:30
Rushabh Mehta
a9b1139040 [fix] [web-form] 2016-10-11 15:07:21 +05:30
Rushabh Mehta
538d8e3d2d [web-form] validate in server before saving 2016-10-11 14:26:22 +05:30
Rushabh Mehta
d2db71f8c4 [fixes] serverside validation in web form 2016-10-11 11:44:22 +05:30
Saurabh
93d3bf8fc3 [fix] get settings attr (#2162) 2016-10-11 11:43:46 +05:30
Rushabh Mehta
58241f12a5 [minor] fix help.js 2016-10-10 22:05:48 +05:30
Saurabh
205ae26751 [fix] refactor integration services (#2087)
* [fix] refactor integration services

* [fix] patch fix

* [fix] added redirect url.

* [fix] custom redirect to and reditect message for paypal and service setup information

* [minor][fix] remove ldap dependancy from requirements
2016-10-10 17:16:21 +05:30
Nabin Hait
af684c89ea Merge pull request #2161 from shreyasp/minor-patch-fix
[Minor] Fixed Patches
2016-10-10 17:09:46 +05:30
Rushabh Mehta
608575f921 [minor] cleanups 2016-10-10 16:44:54 +05:30
shreyas
54ea9d62dc [Minor] Fixed Patches 2016-10-10 16:42:44 +05:30
Rushabh Mehta
87b3816cf4 [fixes] print format cleanup, options for alignment and print from web form (#2159)
* [fixes] print format cleanup, options for alignment and print from web form

* [print-format] select module for export
2016-10-10 16:16:52 +05:30
RobertSchouten
d2c82e61d4 [hook] added hook to grid move (#2158)
grid hooks are now 
_add
_move
_before_remove
_remove
2016-10-10 16:16:22 +05:30
Rushabh Mehta
da5b402abc [fix] patch 2016-10-09 15:37:12 +05:30
Rushabh Mehta
e585e9c38b [minor] 2016-10-09 15:18:17 +05:30
Rushabh Mehta
bae97cfed4 Email Alert on any controller method (#2157)
* [docs] typo

* [email alert] now on any standard controller method

* [minor] install customizations with intall;

* [test] [fix] and truncate subject in email;

* [fix] error log seen issue
2016-10-08 11:11:36 +05:30
RobertSchouten
3730e4fa8f [fix] allow path attachements to be sent my email (#2138) 2016-10-08 11:10:08 +05:30
RobertSchouten
5f93a78477 allow varchar longer than 250 now is supported (#2137) 2016-10-08 11:09:15 +05:30
RobertSchouten
0d2e01720c fix for write share permission #1996 (#2016)
* add write perm as cascade has been removed

* remove cascade permission from docshare 

to allow read only access to share

* remove cascade permission for write permission

* check existing shares for write permission

* unset permissions on read
2016-10-08 11:06:27 +05:30
Faris Ansari
0d469e65f8 [gantt] dependency arrow (#2154) 2016-10-08 11:04:39 +05:30
Nabin Hait
f48527e80f Fixed version conflict 2016-10-07 17:48:53 +05:30
Nabin Hait
dc4b554f94 Merge branch 'hotfix' 2016-10-07 17:48:29 +05:30
Nabin Hait
c3f2071301 bumped to version 7.0.44 2016-10-07 18:18:28 +06:00
Nabin Hait
0d8528486b Indicator based on workflow state 2016-10-07 17:47:12 +05:30
Nabin Hait
0671ce701f Reload doctype for engine 2016-10-07 11:22:43 +05:30
Nabin Hait
c7698d611e Delete patches.txt 2016-10-07 11:20:23 +05:30
Rushabh Mehta
9d7ee83c5e [refactor] scheduler log is now error log and as MyISAM (commit not required) (#2152)
* [refactor] scheduler log is now error log

* [minor] new naming series

* [fix] engine

* [fix] saved by tests
2016-10-06 17:17:55 +05:30
Faris Ansari
c3bb5930f7 [mobile-ui] small modal, focus awesome bar (#2153) 2016-10-06 17:17:43 +05:30
Nabin Hait
c0d7b5b441 Fixed version conflict 2016-10-06 12:25:14 +05:30
Nabin Hait
9b7a7e4d6d Merge branch 'hotfix' 2016-10-06 12:24:52 +05:30
Nabin Hait
43cacac5eb bumped to version 7.0.43 2016-10-06 12:54:52 +06:00
Rushabh Mehta
43a515c677 [fix] dont check permissions for setting log 2016-10-06 12:15:22 +05:30
Nabin Hait
9bf71bba3d Rollback if scheduled submit/cancel failed 2016-10-06 11:20:45 +05:30