Commit graph

5874 commits

Author SHA1 Message Date
Anand Doshi
89fa91bd4e [fix] Ignore duplicate entry error for file data 2014-07-29 16:21:00 +05:30
Anand Doshi
a17ead57be Merge pull request #731 from pdvyas/filemanager-fix
Attachment fixes
2014-07-29 16:03:55 +05:30
Pratik Vyas
798c1a1fa7 [minor] add patch to patches.txt 2014-07-29 15:56:40 +05:30
Anand Doshi
e2e865505e Merge pull request #734 from anandpdoshi/anand-july-29
[print] Show label for Text and Code fields, but not for Text Editor fields
2014-07-29 15:46:34 +05:30
Anand Doshi
c0a4ad7635 Merge pull request #732 from nabinhait/hotfix
Delete permission message fix
2014-07-29 15:13:10 +05:30
Anand Doshi
6650322884 [print] Show label for Text and Code fields, but not for Text Editor fields 2014-07-29 15:07:42 +05:30
nabinhait
8fac1825f8 Minor fix 2014-07-29 14:58:27 +05:30
Pratik Vyas
c98b84079d [fix] [patch] remove dead query 2014-07-29 14:57:24 +05:30
Anand Doshi
e09d1eeb05 Merge pull request #733 from anandpdoshi/anand-july-29
[fix] [print] print css
2014-07-29 14:51:15 +05:30
Anand Doshi
ced0593cfe [fix] [print] print css 2014-07-29 14:37:00 +05:30
Pratik Vyas
3b0cad9502 renaming of replaced files 2014-07-29 14:34:20 +05:30
Pratik Vyas
683796e026 [minor] use ifnull in filemanager fix patch 2014-07-29 14:04:46 +05:30
Pratik Vyas
4ae03c1cb0 add patch to fix file data 2014-07-29 14:04:46 +05:30
Pratik Vyas
421a035375 fix get_file_url 2014-07-29 14:04:46 +05:30
Pratik Vyas
cc0ac7e4c0 [hotfix] Avoid overwriting of file if it exists 2014-07-29 12:47:48 +05:30
nabinhait
e19a932c2a Delete permission message fix 2014-07-29 11:37:53 +05:30
Anand Doshi
67e64f5707 [hotfix] removed rollback from file manager 2014-07-29 08:56:48 +05:30
Anand Doshi
49d6de9fdd [hotfix] Permissions for User doctype 2014-07-28 23:53:53 +05:30
Anand Doshi
6808ec25ac [minor] [fix] print without letterhead 2014-07-28 18:52:50 +05:30
Anand Doshi
89505df1be [minor] [print] blank string also represents no value 2014-07-28 17:49:19 +05:30
Rushabh Mehta
a9ba3b6334 Update sync.py 2014-07-28 17:24:59 +05:30
Anand Doshi
f7319ee5b6 Merge branch 'oxmoss-develop' into develop 2014-07-28 16:40:05 +05:30
Anand Doshi
47bb9c514b [minor] fix in fr.csv 2014-07-28 16:39:39 +05:30
Anand Doshi
c9610025e1 [minor] removed doc.update for delete in api.py 2014-07-28 16:39:39 +05:30
Hassan
f5e3f87e4f Update french translation
I only got up to 300 lines for now.
And it's not totally accurate as I don't see the context of some lines.
2014-07-28 16:39:38 +05:30
Hassan
ce6b83a215 Fix for api.py
Now understands doc name with '/' in it.
Also stop updating docs to be deleted.
2014-07-28 16:39:38 +05:30
Rushabh Mehta
3a2b4ee2df Update cli.py 2014-07-28 16:20:28 +05:30
Rushabh Mehta
2ba8b251ab [hot] [fix] [minor] 2014-07-28 16:19:28 +05:30
Anand Doshi
76f6f22406 Merge pull request #730 from rmehta/static-on-demand
do not force rebuild everytime
2014-07-28 16:01:40 +05:30
Rushabh Mehta
371233bf65 fixes 2014-07-28 15:57:34 +05:30
Rushabh Mehta
9a870c0248 fixes 2014-07-28 15:51:17 +05:30
Anand Doshi
ac438c05cb Merge pull request #725 from dalwadani/develop
Improve Arabic Translation
2014-07-28 15:46:20 +05:30
Anand Doshi
3d0a4c1056 Merge pull request #729 from anandpdoshi/anand-july-28
[minor] Use print.css for printing
2014-07-28 15:44:16 +05:30
Rushabh Mehta
7f43970df2 do not force rebuild everytime 2014-07-28 15:43:03 +05:30
Rushabh Mehta
c4208b3cdd do not force rebuild everytime 2014-07-28 15:32:33 +05:30
Anand Doshi
f385009750 [minor] Use print.css for printing 2014-07-28 15:30:36 +05:30
Anand Doshi
6c32f9ebbf Merge pull request #728 from anandpdoshi/anand-july-28
Fixes in Print Format, Permissions, Restore
2014-07-28 14:21:50 +05:30
Anand Doshi
3ae25fc167 [patch] set print_format_type='Client' for existing Print Formats 2014-07-28 14:20:37 +05:30
Anand Doshi
8fb23e4ebd [minor] Scheduler status for --restore 2014-07-28 14:20:20 +05:30
Anand Doshi
9eb8260c78 [minor] [permissions] Only Administrator user can read / edit Administrator and Guest users 2014-07-28 12:13:54 +05:30
Dhaifallah Alwadani
faf8e2270c Adding @anandpdoshi's and @somo82's suggestions. 2014-07-26 21:45:34 +03:00
Dhaifallah Alwadani
bc7b54e37d Improve Arabic Translation 2014-07-26 05:43:36 +03:00
Anand Doshi
12c9da2bff [hotfix] get_routes_str compatible with chrome 2014-07-25 19:18:30 +05:30
Anand Doshi
0e1320443f Merge pull request #724 from anandpdoshi/anand-july-25
[minor] [fix] get_routes_str
2014-07-25 15:16:49 +05:30
Anand Doshi
1d291a6af6 [minor] frappe.permissions.apply_user_permissions - Check if apply_user_permissions is checked for a doctype, perm type, user combination 2014-07-25 14:56:52 +05:30
Anand Doshi
b01a61e2e2 [minor] [fix] get_routes_str 2014-07-25 14:27:24 +05:30
Rushabh Mehta
2652467d46 [hotfix] [oauth] gender in titlecase 2014-07-25 14:19:48 +05:30
Anand Doshi
9f0c6103f2 [travis] Install wkhtmltopdf 2014-07-25 13:33:52 +05:30
Anand Doshi
536926cb12 [minor] Percent 2014-07-25 13:22:48 +05:30
Anand Doshi
b1e1d8362d Merge pull request #722 from anandpdoshi/rmehta-print-formats
Print Formats (by Rushabh)
2014-07-25 13:09:05 +05:30