Commit graph

7734 commits

Author SHA1 Message Date
Nabin Hait
dec7c6a348 Merge branch 'develop' 2015-07-27 15:56:33 +05:30
Nabin Hait
2b99f7c978 bumped to version 5.1.4 2015-07-27 16:26:33 +06:00
Nabin Hait
7932a5ea13 Change log added 2015-07-27 15:54:44 +05:30
Anand Doshi
a7a7869aab Merge branch 'tmimori-develop' into develop 2015-07-27 12:15:16 +05:30
Anand Doshi
ec7763eb94 [minor] changed modified for json files to affect #1215 2015-07-27 12:15:05 +05:30
Anand Doshi
eb7d775e20 Merge branch 'develop' of https://github.com/tmimori/frappe into tmimori-develop 2015-07-27 12:06:53 +05:30
Rushabh Mehta
52e461ef10 [minor] [enhancement] ability to hide section breaks with depends on 2015-07-24 15:58:12 +05:30
Rushabh Mehta
e48571135c [patch-fix] reload for if_owner 2015-07-24 15:12:40 +05:30
Rushabh Mehta
8b00fecd7a [style] clearer section headings in forms 2015-07-24 15:06:56 +05:30
Anand Doshi
a413239d7d [minor] OutgoingEmailError 2015-07-24 13:38:48 +05:30
Anand Doshi
1e774001b7 Merge pull request #1214 from anandpdoshi/if-owner-permission
"If Owner" based permissions
2015-07-24 12:31:43 +05:30
Anand Doshi
93343187cf Merge pull request #1213 from nabinhait/fix1
Get formatted absolute value
2015-07-24 12:23:49 +05:30
Anand Doshi
5294f1b002 Merge pull request #1216 from anandpdoshi/reportview-sort-fix
If sort by field is missing, don't add it to order by
2015-07-24 12:21:15 +05:30
Anand Doshi
f2d3a6ef9b Implemented 'If Owner' in Role Permissions 2015-07-24 12:17:30 +05:30
Nabin Hait
eeb4d2b7f0 Get formatted absolute value 2015-07-24 11:14:26 +05:30
Anand Doshi
09f687223b If sort by field is missing, don't add it to order by 2015-07-23 18:15:24 +05:30
Tsutomu Mimori
3a32e2c34d Removed HTML from messages 2 2015-07-23 21:22:28 +09:00
Tsutomu Mimori
a72b6d89de Removed HTML from messages 2015-07-23 21:12:56 +09:00
Rushabh Mehta
2cf5ec66f6 Merge pull request #1212 from indictranstech/develop
[Fixes] Conf Import
2015-07-23 13:02:46 +05:30
Gupteshwar Joshi
639caa3a47 Merge pull request #1 from shitolepriya/develop
conf import fix
2015-07-23 12:50:54 +05:30
Priya
9f28c7d923 [Fixes] conf import fix 2015-07-23 12:39:33 +05:30
Rushabh Mehta
35044784a3 [device] fix 2015-07-23 12:17:25 +05:30
Anand Doshi
4e593711dc Merge pull request #1210 from rmehta/docs-update
[docs] update to auto documentation generator
2015-07-22 16:39:21 +05:30
Rushabh Mehta
18d0a886c0 [docs] update to auto documentation generator 2015-07-22 16:38:44 +05:30
Anand Doshi
4cabd4070f favicon and website theme 2015-07-22 16:26:34 +05:30
Anand Doshi
84579ed3bf [minor] website and avatar 2015-07-22 14:32:18 +05:30
Anand Doshi
731f75dd08 [minor] pass pre_process function to import methods 2015-07-22 14:32:18 +05:30
Anand Doshi
3693b5ade9 Merge branch 'develop' 2015-07-21 12:18:42 +05:30
Anand Doshi
7cf9ab69b5 bumped to version 5.1.3 2015-07-21 12:48:42 +06:00
Anand Doshi
43aafc58bd [minor] reload docshare 2015-07-21 11:28:06 +05:30
Anand Doshi
b886b2282f Merge branch 'develop' 2015-07-20 19:16:03 +05:30
Anand Doshi
0f214d32e9 bumped to version 5.1.2 2015-07-20 19:46:03 +06:00
Anand Doshi
8d8531d233 [hotfix] share permissions should only be applied if no role permissions or user permissions exist 2015-07-20 19:14:10 +05:30
Anand Doshi
c6297f86f3 Merge branch 'develop' 2015-07-20 15:00:59 +05:30
Anand Doshi
325a9e0ee8 bumped to version 5.1.1 2015-07-20 15:30:59 +06:00
Anand Doshi
57a30831c8 [change-log] 2015-07-20 14:58:48 +05:30
Anand Doshi
198a07a290 [fix] Use OR to apply Share permissions on existing Role permissions in form 2015-07-20 13:22:51 +05:30
Rushabh Mehta
efeedfa30a Merge pull request #1206 from anandpdoshi/share-all
Share with Everyone
2015-07-20 12:55:30 +05:30
Anand Doshi
d4e9e87af6 [fix] Share query is always ORed after the AND combination of User Permissions and DocType permission conditions 2015-07-17 19:42:48 +05:30
Anand Doshi
715dcbc858 [test] disabled client side test case 2015-07-17 19:41:54 +05:30
Anand Doshi
d70968dbc5 [feature] Share with Everyone 2015-07-17 19:41:32 +05:30
Nabin Hait
25a6fe4255 Merge pull request #1205 from nabinhait/fix5
[fix] Imported no_value_feilds
2015-07-17 16:25:34 +05:30
Nabin Hait
bd3e2f469d [fix] Imported no_value_feilds 2015-07-17 16:24:55 +05:30
Anand Doshi
d69af7bcfe [ui] navbar-brand padding 2015-07-17 15:58:44 +05:30
Nabin Hait
c6f605ba78 Merge pull request #1204 from nabinhait/fix5
[fix] rename_field path
2015-07-17 15:33:15 +05:30
Nabin Hait
779c27877c [fix] rename_field path 2015-07-17 15:32:42 +05:30
Nabin Hait
a6450168de Delete utils.py 2015-07-17 15:28:22 +05:30
Rushabh Mehta
347284c62c [minor] fixes to auth in between reinstall and make_random 2015-07-17 15:23:59 +05:30
Rushabh Mehta
33632bedbb [minor] cleanup for random and messages in field group 2015-07-17 15:23:58 +05:30
Anand Doshi
04cf067b75 [minor] [desk] Navbar brand image and breadcrumb padding 2015-07-17 15:06:18 +05:30