Commit graph

8029 commits

Author SHA1 Message Date
Nabin Hait
9e948850d5 Merge branch 'develop' 2015-07-30 14:57:34 +05:30
Nabin Hait
4f12199b36 bumped to version 5.2.1 2015-07-30 15:27:34 +06:00
Rushabh Mehta
bf24fb2898 [fix] [hot] make_random 2015-07-30 13:39:27 +05:30
Rushabh Mehta
e54b0d487b [minor] fixes 2015-07-30 13:38:49 +05:30
Nabin Hait
84efee471b Merge branch 'develop' 2015-07-30 12:05:07 +05:30
Nabin Hait
314723c3d5 bumped to version 5.2.0 2015-07-30 12:35:07 +06:00
Anand Doshi
c119a6396a Merge pull request #1222 from anandpdoshi/check-not-null
Change Check fields to have default as 0 (if not specified) and not null
2015-07-30 12:04:02 +05:30
Anand Doshi
0f3d03e167 Merge pull request #1224 from nabinhait/unique
[fix] Adding Unique Constraint
2015-07-30 11:56:14 +05:30
Anand Doshi
baec4f855f Change Check fields to have default as 0 (if not specified) and not null 2015-07-30 11:54:27 +05:30
Nabin Hait
cfef3183ca [fix] Adding Unique Constraint 2015-07-29 19:10:38 +05:30
Nabin Hait
a0c75a3439 Merge branch 'develop' 2015-07-29 16:44:42 +05:30
Nabin Hait
dfe9d12962 bumped to version 5.1.5 2015-07-29 17:14:42 +06:00
Rushabh Mehta
d69d83b5f9 [minor] grey out system messages frappe/erpnext#3707 2015-07-29 12:33:01 +05:30
Rushabh Mehta
88b37b1f64 Merge pull request #1221 from anandpdoshi/query-report-share-fix
If sort by field is missing, don't add it to order by
2015-07-29 11:56:17 +05:30
Anand Doshi
d6ad8c49d4 [fix] query report share condition that caused Permitted Documents For User report to fail when User Permissions are applied 2015-07-29 11:49:56 +05:30
Anand Doshi
eec2d50586 Merge pull request #1220 from rmehta/communication-fix
[minor] [communication] don't add empty recipients
2015-07-29 11:08:35 +05:30
Rushabh Mehta
98d8ce6e24 [minor] [communication] don't add empty recipients 2015-07-29 10:59:01 +05:30
Rushabh Mehta
f6bd49360c [minor] don't give save tip everytime 2015-07-29 10:56:36 +05:30
Rushabh Mehta
6985d4127e [fixes] document_type, added set-config in commands, prompt in form.js 2015-07-28 17:37:01 +05:30
Rushabh Mehta
3932cecf85 [fixes] wiring exections for async requests 2015-07-27 18:22:50 +05:30
Rushabh Mehta
5b84651a54 [comment] [fix] clear input 2015-07-27 16:33:14 +05:30
Nabin Hait
89d5bf5942 bumped to version 5.1.4 2015-07-27 16:33:14 +05:30
Nabin Hait
f4f688f71c Change log added 2015-07-27 16:32:55 +05:30
Anand Doshi
30993bd04a [minor] changed modified for json files to affect #1215 2015-07-27 16:32:55 +05:30
Tsutomu Mimori
a6d3405ad4 Removed HTML from messages 2 2015-07-27 16:32:55 +05:30
Tsutomu Mimori
c9a651fe13 Removed HTML from messages 2015-07-27 16:32:54 +05:30
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
Rushabh Mehta
6cd5957d82 Merge branch 'develop' into v6-wip 2015-07-27 14:41:51 +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
Pratik Vyas
a675566337 Ignore ConnectionError in emit_via_redis 2015-07-24 10:08:29 +05:30
Pratik Vyas
05eaba9cba Don't connect to socketio if no_async 2015-07-24 10:08:29 +05:30
Pratik Vyas
ebe66e8746 Fallback to ajax if no_async and append comments for opendocs 2015-07-24 10:08:29 +05:30
Pratik Vyas
40d1c608c5 Bump version to 6.0.0-wip 2015-07-24 10:08:29 +05:30
Pratik Vyas
d0dcb6110e Fix site room 2015-07-24 10:08:09 +05:30
Pratik Vyas
e713d00600 Connect socketio to port 3000 if running a dev server 2015-07-24 10:08:09 +05:30
Pratik Vyas
88f9281e3b Namespace rooms to site 2015-07-24 10:08:09 +05:30
Pratik Vyas
bd8b0e9686 Add no_async 2015-07-24 10:08:09 +05:30