Commit graph

8029 commits

Author SHA1 Message Date
Rushabh Mehta
a7bd640b24 [merge] 5.3.1 2015-08-11 10:38:03 +05:30
Rushabh Mehta
4441a69b97 [minor] allow selects in dynamic links 2015-08-10 16:58:10 +05:30
Rushabh Mehta
c36accbc60 [minor] avoid adding standard reply twice 2015-08-10 13:15:13 +05:30
Rushabh Mehta
341e268a22 [minor] related to pull #1207 2015-08-10 11:31:18 +05:30
Rushabh Mehta
cee86fc03f Merge pull request #1240 from dottenbr/about-footer-change
Changed footer date in About to 2015 from 2014
2015-08-10 11:27:20 +05:30
Rushabh Mehta
20ffbd4dbb Merge pull request #1239 from dottenbr/formatter_fix
formatter fix for '<table' recognition
2015-08-10 11:26:35 +05:30
Rushabh Mehta
8d55cad71b Merge pull request #1236 from nabinhait/develop
Set workflow state on cancellation
2015-08-10 11:26:23 +05:30
Dominik
eb9b52a5a5 Changed footer date in About to 2015 from 2014 2015-08-08 00:45:51 +05:30
Dominik
90c7e96552 formatter fix for '<table' recognition 2015-08-07 20:13:02 +05:30
Rushabh Mehta
263d94f217 [mobile] [style] fix checkboxes 2015-08-07 18:26:15 +05:30
Anand Doshi
6e6a469a09 Merge branch 'develop' 2015-08-07 11:53:12 +05:30
Anand Doshi
4ca5d8c4f4 bumped to version 5.3.1 2015-08-07 12:23:12 +06:00
Anand Doshi
e71d34cd5f [patch] Rename chinese language 2015-08-07 11:50:34 +05:30
Nabin Hait
337c730e34 Set workflow state on cancellation 2015-08-05 14:42:07 +05:30
Anand Doshi
5a7155ffc2 [minor] don't pop when message_log is empty 2015-08-05 11:46:42 +05:30
Anand Doshi
39863477e6 Merge branch 'develop' 2015-08-04 16:11:47 +05:30
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
Rushabh Mehta
e41bfe3003 [minor] [ux] refresh button primary in reportview 2015-08-03 17:25:06 +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
Rushabh Mehta
1d07a36d75 [merge] develop 2015-08-03 11:20:31 +05:30
Rushabh Mehta
dd1743f36d [fix] drag conflicts 2015-08-01 16:50:43 +05:30
Rushabh Mehta
9a95a660ad [fix] [minor] standard reply after salutation, fixes frappe/erpnext#3552 2015-07-31 15:44:57 +05:30
Rushabh Mehta
e5056d6bb1 [enhancement] Note comes in read-only on opening, with edit button 2015-07-31 12:27:00 +05:30
Rushabh Mehta
20a332bf86 [enhancement] uninstall-app, list-apps, fixes #602 2015-07-31 11:49:33 +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
Rushabh Mehta
3a117b5656 [merge] develop 2015-07-30 16:06:06 +05:30