Commit graph

7776 commits

Author SHA1 Message Date
Anand Doshi
873c237d4b bumped to version 5.3.0 2015-08-04 16:41:47 +06:00
Anand Doshi
9352c58136 [change-log] 2015-08-04 16:01:59 +05:30
Anand Doshi
0e7f9d01a7 Merge pull request #1232 from anandpdoshi/share-role-permission-manager
Share in Role Permissions Manager and Validation
2015-08-04 15:54:00 +05:30
Anand Doshi
bcafb56432 [fix] Added Share in Role Permissions Manager. Validate Share permission before adding/updating share 2015-08-04 15:47:59 +05:30
Anand Doshi
da6ee4323e Merge pull request #1233 from anandpdoshi/delay-notify
Delay sending of notification and provide upto 3 attempts in case of deadlock
2015-08-04 15:16:39 +05:30
Anand Doshi
31fb389688 Delay sending of notification and provide upto 3 attempts in case of deadlock 2015-08-04 15:09:59 +05:30
Anand Doshi
183ce75006 [minor] is scheduler disabled in commands.py 2015-08-04 15:00:53 +05:30
Anand Doshi
30aad14ee6 Merge pull request #1227 from nabinhait/unique_constraint
[fix] Unique constraint check in db_insert and bypassed for blank values (not null)
2015-08-04 14:39:49 +05:30
Anand Doshi
4538d5f7c0 Merge pull request #1235 from rmehta/update-translations
[translations] update
2015-08-04 14:38:19 +05:30
Rushabh Mehta
1570c9db02 [fix] names for zh-cn and zh-tw 2015-08-04 13:05:50 +05:30
Rushabh Mehta
27d892d87b [translations] update 2015-08-04 12:42:53 +05:30
Rushabh Mehta
bce4693530 Merge pull request #1234 from anandpdoshi/get-recipients-uniqueness
make sure recipient email addresses are unique
2015-08-04 12:18:26 +05:30
Anand Doshi
a5bd8ad8eb [fix] make sure recipient email addresses are unique 2015-08-03 17:48:39 +05:30
Nabin Hait
a272c1b25d [fix] Unique constraint check in db_insert and bypassed for blank values (not null) 2015-08-03 17:21:51 +05:30
Rushabh Mehta
51df143d7a Merge pull request #1230 from anandpdoshi/bulk-limit-fix
Bulk Limit check
2015-08-03 16:24:35 +05:30
Anand Doshi
7e1f08d64c [hotfix] docstatus should be 0 if None 2015-08-03 16:04:19 +05:30
Anand Doshi
3e7e8cdd48 Merge branch 'rmehta-drag-fix' into develop 2015-08-03 14:37:03 +05:30
Anand Doshi
181500912e Merge branch 'drag-fix' of https://github.com/rmehta/frappe into rmehta-drag-fix 2015-08-03 14:34:36 +05:30
Rushabh Mehta
f80318ca0d [fix] drag conflicts 2015-08-03 14:23:58 +05:30
Pratik Vyas & Anand Doshi
2f72d86d11 [fix] bulk limit check 2015-08-03 13:08:59 +05:30
Anand Doshi
545228babf Merge pull request #1229 from rmehta/fix-bluk-flush
[fix] don't error bluk flush if connection breaks, frappe/erpnext#3232
2015-08-03 12:48:14 +05:30
Rushabh Mehta
1962f999c4 [fix] don't error bluk flush if connection breaks, frappe/erpnext#3232 2015-08-03 12:27:31 +05:30
Anand Doshi
b19d703ed0 [fix] query report - if not fieldname, use label 2015-07-30 18:05:27 +05:30
Nabin Hait
2b9861b9da Merge branch 'develop' 2015-07-30 16:51:11 +05:30
Nabin Hait
3862442978 bumped to version 5.2.2 2015-07-30 17:21:11 +06:00
Anand Doshi
d85cc02b03 [minor] moved docstatus=0 to init child 2015-07-30 16:36:30 +05:30
Anand Doshi
815252153f [hotfix] set docstatus=0 in append 2015-07-30 16:36:30 +05:30
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
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
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
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