Commit graph

6122 commits

Author SHA1 Message Date
Anand Doshi
023b5cbcdf Show Assigned To in list view
Paired between Anand and Rushabh
2014-09-04 12:57:07 +05:30
Rushabh Mehta
41aada3b5a Merge pull request #819 from anandpdoshi/anand-september-3
[translations] German translations from a user
2014-09-03 22:36:24 +05:30
Anand Doshi
b6d4b0f462 [translations] German translations from a user 2014-09-03 21:40:08 +05:30
Rushabh Mehta
4c2c34ee04 Merge pull request #817 from anandpdoshi/anand-september-3
[fix] Include grid templates, list templates, list.js, calendar.js in translate.get_messages_from_doctype
2014-09-03 18:26:58 +05:30
Anand Doshi
c9dca39eb1 [fix] Include grid templates, list templates, list.js, calendar.js in translate.get_messages_from_doctype 2014-09-03 17:33:01 +05:30
Anand Doshi
6b73d35b07 Merge pull request #812 from 81552433qqcom/d1
various translations uses __()
2014-09-03 15:28:26 +05:30
Rushabh Mehta
6b6766f6f9 [fix] [install] don't validate routes in install 2014-09-03 11:10:23 +05:30
81552433qqcom
f745de8065 adjusted translation format according to official feedback 2014-09-03 10:07:56 +08:00
Rushabh Mehta
c436a54b0f Merge pull request #816 from rmehta/route-fix
[hot] [route-fix] get_next
2014-09-02 18:18:27 +05:30
Rushabh Mehta
231bbc242e [hot] [route-fix] get_next 2014-09-02 18:17:36 +05:30
81552433qqcom
545e885da2 various translations uses __() 2014-09-01 21:42:58 +08:00
Anand Doshi
fff599b4dc Merge pull request #811 from anandpdoshi/anand-september-1
[fix] Query Report permissions
2014-09-01 16:35:20 +05:30
Anand Doshi
eadf83b18a [fix] Query Report permissions 2014-09-01 16:26:30 +05:30
Rushabh Mehta
12750981cf Merge pull request #810 from anandpdoshi/anand-september-1
Moduleview translations: translate doctype's description
2014-09-01 16:16:52 +05:30
Anand Doshi
8c7361298e Moduleview translations: translate doctype's description 2014-09-01 15:47:58 +05:30
Anand Doshi
28423fe698 Merge pull request #806 from 81552433qqcom/d1
Added miss translation part in 6 files., use __()
2014-09-01 15:38:37 +05:30
81552433qqcom
eedcbbfa10 translation adjustment based on feedback from official. 2014-09-01 16:23:09 +08:00
Rushabh Mehta
1de11b3f93 Merge pull request #809 from anandpdoshi/anand-september-1
[fix] Email Alert: "nowdate" in eval's context
2014-09-01 13:30:11 +05:30
Anand Doshi
72eb38a03c [fix] Email Alert: "nowdate" in eval's context 2014-09-01 12:53:30 +05:30
Rushabh Mehta
26fad43f0b Merge pull request #808 from anandpdoshi/anand-september-1
style_settings.css: page_header_color, frappe.perm.is_visible
2014-09-01 12:50:54 +05:30
Anand Doshi
dcae75e710 [minor] frappe.perm.is_visible, returns true if visible based on permlevel 2014-09-01 12:33:34 +05:30
Anand Doshi
62116b611d [minor] style_settings.css: page_header_color 2014-09-01 12:33:34 +05:30
Rushabh Mehta
69a51284f5 [fix] [ux] [minor] data import 2014-09-01 11:56:07 +05:30
Rushabh Mehta
f3ec724421 [fix] [ux] [minor] data import 2014-09-01 11:53:54 +05:30
Rushabh Mehta
f48b9809a7 [fix] [backup] email link to md 2014-09-01 11:52:36 +05:30
81552433qqcom
1c0dc8a0d7 Added miss translation part, use __()
1. data import page
2. desktop, dialog show all applications
3. message module
4. search box
5. list view
6. core module, description
2014-09-01 09:03:52 +08:00
Anand Doshi
7764c03973 Merge pull request #805 from anandpdoshi/query-report-permissions
Filter query reports based on permissions using doctype name instead of fieldnames
2014-08-30 13:16:09 +05:30
Anand Doshi
ae38bcf40f Filter query reports based on permissions using doctype name instead of fieldnames 2014-08-30 13:11:32 +05:30
Anand Doshi
c407591376 Merge pull request #804 from anandpdoshi/anand-august-29
[fix] subheading in standard print, trim strings in control.js
2014-08-29 16:38:31 +05:30
Anand Doshi
2d6e449329 [fix] trim strings in control.js 2014-08-29 16:33:01 +05:30
Anand Doshi
bec9b43227 [fix] subheading in standard print 2014-08-29 16:27:56 +05:30
Anand Doshi
01fb747a78 Merge pull request #798 from anandpdoshi/anand-august-28
OR logic for conflicting User Permission DocTypes, fixes in file manager and user_to_str with moment.js
2014-08-29 11:47:27 +05:30
Anand Doshi
f233760081 User Permission DocTypes: Apply OR logic when multiple applicable roles have different sets of User Permission DocTypes 2014-08-29 11:45:20 +05:30
Anand Doshi
7cff4fe4ac [fix] To edit using report, ID field should be selected in report 2014-08-29 11:44:10 +05:30
Anand Doshi
c77a449633 [fix] user_to_str with moment.js, accept 2 digit year values 2014-08-29 11:44:10 +05:30
Anand Doshi
543f2921ab [fix] file manager queries 2014-08-29 11:44:10 +05:30
Rushabh Mehta
5b99d4f819 [fix] #800, #802 2014-08-29 11:40:15 +05:30
Rushabh Mehta
443ab1d672 Merge pull request #803 from nathando/patch-1
Typo Error ? frappe.client.submit fail
2014-08-29 11:25:12 +05:30
nathando
1a1a23f032 Typo Error ? frappe.client.submit fail
- Frappe client use this submit function and failed due to doclist is actually a {dict} or a [list]. Both cannot have as_dict() function 
- Seem like just a typo -> change to doclistobj instead.
2014-08-29 10:35:50 +08:00
Rushabh Mehta
f4b823ae2d [fix] [database.py] cleanup index size from name 2014-08-28 14:43:49 +05:30
Rushabh Mehta
a19617cbff Merge pull request #799 from rmehta/website-minor
[fixes] [website] for translator
2014-08-28 12:51:55 +05:30
Rushabh Mehta
4ce85938a0 [fixes] [website] for translator 2014-08-28 12:48:04 +05:30
Rushabh Mehta
fbd4277158 [fixes] [website] for translator 2014-08-28 12:45:16 +05:30
Anand Doshi
d4891aa7c1 Merge pull request #795 from anandpdoshi/user-permission-doctypes
Select Document Types for applying User Permissions
2014-08-28 11:07:27 +05:30
Anand Doshi
05131c0cac Merge pull request #797 from anandpdoshi/anand-auaugst-25
[fix] Handle clear notifications deadlock
2014-08-28 10:57:27 +05:30
Anand Doshi
8f0d5fc4a4 [fix] Handle clear notifications deadlock 2014-08-27 21:48:17 +05:30
Anand Doshi
bd995efb56 [minor] translations in appframe and listing 2014-08-27 21:47:17 +05:30
Pratik Vyas
e00286a93d Merge pull request #796 from anandpdoshi/anand-august-27
Append X-Frappe-Site header in outgoing email
2014-08-27 15:14:47 +05:30
81552433qqcom
cf82903609 permission_manager.js translation
doclistview, no {0} found.
setup.py, translated.

Issue exists: read, write etc translation doesn't show.(note, not sure if it is case sensitive)

Conflicts:
	frappe/core/page/permission_manager/permission_manager.js
2014-08-27 15:08:52 +05:30
Anand Doshi
e01a0600f1 Handle conflicting User Permission DocTypes and DocPerm translations 2014-08-27 14:52:06 +05:30