Commit graph

7718 commits

Author SHA1 Message Date
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
09f687223b If sort by field is missing, don't add it to order by 2015-07-23 18:15:24 +05:30
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
Rushabh Mehta
30330f8bc5 Merge pull request #1203 from anandpdoshi/anand-july-16
Validate Append To, match domain when matching message id using In-Reply-To and use frappe.DuplicateEntryError
2015-07-17 14:35:50 +05:30
Anand Doshi
d33f2c0454 [fix] validate Append To 2015-07-17 12:17:14 +05:30
Anand Doshi
ef75a1b488 [fix] Also match domain when matching message id using In-Reply-To 2015-07-17 12:17:14 +05:30
Anand Doshi
6aae191158 [fix] Use frappe.DuplicateEntryError in base_document and email_account 2015-07-17 12:17:14 +05:30
Rushabh Mehta
ccbf8e7112 Merge pull request #1202 from anandpdoshi/anand-july-16
Fixes in workflow actions visibility, duplicate entry error in email account pulling and sending reference in email auto-reply
2015-07-17 10:53:01 +05:30
Anand Doshi
aa7df810f4 [enhancement] send reference in email account's auto-reply 2015-07-16 19:41:37 +05:30
Anand Doshi
87aaf010ca [fix] duplicate entry error in email account pulling 2015-07-16 19:41:36 +05:30
Anand Doshi
a012a6826d [fix] Don't render Workflow Actions when the doc is dirty 2015-07-16 19:41:36 +05:30
Anand Doshi
3fa666467b Merge pull request #1201 from rmehta/autocomplete-focus
[fix] autocomplete: do not select on hover
2015-07-16 18:50:53 +05:30
Rushabh Mehta
d630b340f0 [fix] autocomplete: do not select on hover 2015-07-16 18:01:00 +05:30
Anand Doshi
027664a02c Merge branch 'develop' 2015-07-16 16:15:50 +05:30
Anand Doshi
56d362795a bumped to version 5.1.0 2015-07-16 16:45:50 +06:00
Anand Doshi
f2de741764 [change-log] 2015-07-16 16:12:50 +05:30
Anand Doshi
04ea512c39 [minor] trailing space in print heading in PDF 2015-07-16 14:58:24 +05:30
Anand Doshi
f17660ea1c Merge pull request #1200 from anandpdoshi/anand-july-16
[enhancement] Set print font from Setup > Print Settings or set it for each Print Format
2015-07-16 13:09:48 +05:30
Anand Doshi
7fcdb93da8 [hotfix] don't set response on session resume, only set cookies 2015-07-16 13:08:57 +05:30