Commit graph

6102 commits

Author SHA1 Message Date
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
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
Anand Doshi
585689bf28 Append X-Frappe-Site header in outgoing email 2014-08-27 12:22:25 +05:30
Anand Doshi
b5737a837a [hotfix] sidebar 2014-08-26 22:26:09 +05:30
Anand Doshi
6611c12662 Select Document Types for applying User Permissions 2014-08-26 19:33:58 +05:30
Anand Doshi
605e6d55bb [hotfix] removed print 2014-08-25 21:13:16 +05:30
Anand Doshi
6e5ff7197c Merge pull request #793 from rmehta/aug-25
[website] fix add sidebar
2014-08-25 16:30:33 +05:30
Rushabh Mehta
b9df7dc3e2 [website] fix add sidebar 2014-08-25 16:25:26 +05:30
Anand Doshi
a81fad376e [hotfix] sidebar.html 2014-08-25 16:23:07 +05:30
Rushabh Mehta
ceb862a0cf [hot] [fix] web_page.py 2014-08-25 16:11:32 +05:30
Rushabh Mehta
330c057ae7 [fix] [hot] removed print 2014-08-25 16:08:06 +05:30
Anand Doshi
64c6b93b6e [fix] patches related to the deprecated Website Route 2014-08-25 15:36:22 +05:30
Anand Doshi
19862926ae Merge pull request #791 from rmehta/aug-22
Revert series on delete / drag drop attachments
2014-08-25 15:23:39 +05:30
Rushabh Mehta
0d2d2af564 [style] default website 2014-08-25 15:16:54 +05:30
Rushabh Mehta
43653e2d40 [css] sidebar 2014-08-25 14:16:44 +05:30
Rushabh Mehta
6fa9a8db45 [fix] removed title left 2014-08-25 13:00:35 +05:30
Rushabh Mehta
55248759ea [fix] allow_attach 2014-08-25 13:00:35 +05:30
Rushabh Mehta
b888b493d7 [cleanup] remove allow_attach 2014-08-25 13:00:35 +05:30
Rushabh Mehta
69850ce28a removed allow_attach (useless) and added validation for drag and drop 2014-08-25 13:00:35 +05:30
Rushabh Mehta
c75be3cca6 [feature] drag / drop attachments fixes frappe/erpnext#2098. also fixed boo boo in revert naming series 2014-08-25 13:00:35 +05:30
Rushabh Mehta
cead5c42ca revert series if last id is deleted 2014-08-25 13:00:34 +05:30
Anand Doshi
d233b64039 Merge pull request #792 from anandpdoshi/anand-auaugst-25
Website fixes
2014-08-25 12:48:58 +05:30