Commit graph

6198 commits

Author SHA1 Message Date
Pratik Vyas
00ae80134f Merge branch 'develop' 2014-09-16 15:56:25 +05:30
Pratik Vyas
d65aea390f bumped to version 4.4.0 2014-09-16 16:26:25 +06:00
Rushabh Mehta
777ae6d15d Update CONTRIBUTING.md 2014-09-16 15:21:20 +05:30
Anand Doshi
35de675256 Merge pull request #846 from anandpdoshi/anand-september-15
[minor] copy_doc ignore_no_copy
2014-09-16 15:16:12 +05:30
Anand Doshi
dddaf2285a Merge pull request #852 from anandpdoshi/anand-september-16
[minor] clear _website_pages in clear_web
2014-09-16 15:16:06 +05:30
Anand Doshi
be93bbc76a [minor] clear _website_pages in clear_web 2014-09-16 15:08:27 +05:30
Anand Doshi
140a299daf [hotfix] mysqldb encoders for UnicodeWithAttrs of markdown2 2014-09-15 16:26:01 +05:30
Anand Doshi
b201bae900 [minor] copy_doc ignore_no_copy 2014-09-15 12:51:01 +05:30
Nabin Hait
88bcc4cabe Merge pull request #843 from nabinhait/hotfix
minor fix
2014-09-12 17:01:09 +05:30
Nabin Hait
ebcbd989a0 minor fix 2014-09-12 17:00:23 +05:30
Anand Doshi
5fb30958a4 Merge pull request #842 from anandpdoshi/anand-september-11
Fixes to ToDo list avatar and tags for single types
2014-09-12 15:37:27 +05:30
Anand Doshi
daaf55f047 [fix] create new 2014-09-12 15:31:51 +05:30
Anand Doshi
ed658ee181 Merge pull request #841 from nabinhait/hotfix
Query report fixes for translated columns
2014-09-12 14:18:44 +05:30
Anand Doshi
35fd8d99f7 Added factory.js and minor fixes for loading Single DocTypes 2014-09-12 14:18:35 +05:30
Anand Doshi
d6e1bb090d [minor] refresh tags in form footer 2014-09-12 14:18:34 +05:30
Anand Doshi
80fd2a5b32 [fix] ToDo list assigned to avatar 2014-09-12 14:18:32 +05:30
Anand Doshi
99f3563cf1 Merge pull request #835 from 81552433qqcom/d1
translation fix in translate.py
2014-09-12 12:29:43 +05:30
Nabin Hait
92c040dfe2 Query report fixes for translated columns 2014-09-12 12:02:34 +05:30
Anand Doshi
aa01b3e38b Merge pull request #839 from anandpdoshi/anand-september-11
[minor] fix in query report linked doctype
2014-09-11 16:47:41 +05:30
Anand Doshi
0d2d47131e [fix] Don't show Tags for single type form 2014-09-11 16:21:00 +05:30
Anand Doshi
2849da71ad [fix] notification count deletion deadlock 2014-09-11 16:11:53 +05:30
Anand Doshi
134669cb40 [minor] fix in query report linked doctype 2014-09-11 15:32:22 +05:30
Anand Doshi
1e8f7d512f Merge pull request #838 from nabinhait/hotfix
Minor fixes
2014-09-11 15:31:56 +05:30
Nabin Hait
993d0ae57a Apply user restrictions in query report only if rows exists 2014-09-11 15:22:05 +05:30
81552433qqcom
a16f017ae0 Merge branch 'develop' of https://github.com/frappe/frappe into d1 2014-09-11 17:29:00 +08:00
81552433qqcom
53af736435 translation for message when click save. 2014-09-11 17:22:54 +08:00
Nabin Hait
5c2f81ecb6 Corrected spelling 2014-09-11 14:43:46 +05:30
81552433qqcom
29521e5dda Description translation added. 2014-09-11 16:18:01 +08:00
81552433qqcom
4ff08a52b2 minor translation fix. 2014-09-11 11:33:42 +08:00
Anand Doshi
9e54ccc4a8 Merge pull request #836 from anandpdoshi/anand-september-10
[permissions] Query Report: don't use a doctype for filtering User Permissions, if the column representing this doctype is empty
2014-09-10 17:27:18 +05:30
Anand Doshi
65ff08e7e9 [permissions] Query Report: don't use a doctype for filtering User Permissions, if the column representing this doctype is empty 2014-09-10 16:56:23 +05:30
Rushabh Mehta
fcbdc01e5f Merge pull request #834 from anandpdoshi/anand-september-10
[fix] File Manager
2014-09-10 16:14:16 +05:30
81552433qqcom
f0de7e74e9 translation fix in translate.py 2014-09-10 18:24:22 +08:00
Anand Doshi
e09fc93001 [fix] File Manager 2014-09-10 15:36:02 +05:30
Anand Doshi
eb846fb38d Merge pull request #831 from anandpdoshi/anand-september-9
Don't allow to set 'Allow on Submit' for standard fields. Fixes frappe/erpnext#956
2014-09-10 15:24:40 +05:30
Nabin Hait
6bff7141da Merge pull request #833 from 81552433qqcom/d1
query report js "Load Report" translation.
2014-09-10 10:11:04 +05:30
81552433qqcom
924d5efd52 query report js "Load Report" translation. 2014-09-10 11:40:05 +08:00
Rushabh Mehta
9da983b029 Merge pull request #832 from 81552433qqcom/d1
Script report name doesn't get translated.
2014-09-09 16:52:47 +05:30
81552433qqcom
f032e0fd98 Script report name doesn't get translated. 2014-09-09 19:12:28 +08:00
Anand Doshi
11801cfbd2 Don't allow to set 'Allow on Submit' for standard fields. Fixes frappe/erpnext#956 2014-09-09 15:25:32 +05:30
Pratik Vyas
20e36ff3f5 Merge branch 'develop' 2014-09-09 15:09:17 +05:30
Pratik Vyas
36b5720ac5 bumped to version 4.3.0 2014-09-09 15:39:17 +06:00
Pratik Vyas
85187ab644 change version in hooks.py 2014-09-09 15:08:41 +05:30
Anand Doshi
66ea988230 Merge pull request #830 from anandpdoshi/anand-september-9
[fix] setting a default value using create_new
2014-09-09 13:01:52 +05:30
Anand Doshi
f8d9271094 [fix] setting a default value using create_new 2014-09-09 12:49:16 +05:30
Rushabh Mehta
87af84073f Merge pull request #828 from anandpdoshi/anand-september-8
Minor: Delete permission for User DocType, validate search fields, use in_list_view to render Grid Row static display
2014-09-09 09:16:37 +05:30
Anand Doshi
fac8578b8b [minor] User in_list_view for rendering Grid Row static display 2014-09-08 17:42:06 +05:30
Anand Doshi
85e6a68c0e Validate search fields 2014-09-08 15:48:24 +05:30
Anand Doshi
bcbc63d277 [minor] System Manager has Delete permission for User 2014-09-08 15:37:39 +05:30
Anand Doshi
00fdee7ec9 Merge pull request #827 from rmehta/translated-08-sep-2014
[translations]
2014-09-08 15:29:06 +05:30