Commit graph

8075 commits

Author SHA1 Message Date
saurabh
052d211cbc File URL naming fixes 2015-09-21 15:43:31 +05:30
saurabh
c1bc00d8bf New File Uploading 2015-09-21 15:43:30 +05:30
saurabh
8cbd03392b create new folder from File listview 2015-09-21 15:41:34 +05:30
Rushabh Mehta
9fbd12f5af [file-manager] fixed breadcrumbs and routing 2015-09-21 15:41:34 +05:30
Rushabh Mehta
2191312c87 [enhancement] document management system 2015-09-21 15:41:34 +05:30
Anand Doshi
fa708c5ac1 [hotfix] import in page 2015-09-21 15:05:37 +05:30
Rushabh Mehta
eb2839a0b8 [style] [wip] various portal fixes 2015-09-21 11:50:22 +05:30
Anand Doshi
7013a1b3e8 Merge pull request #1310 from rmehta/email-account-fix
[minor] send_notification_to should be mandatory if notify_if_unreplied is set
2015-09-21 11:42:51 +05:30
Anand Doshi
382a3c2f2d Merge branch 'csrf' into develop 2015-09-21 11:41:20 +05:30
Anand Doshi
6084775ed0 Added CSRF token verification for desk 2015-09-21 11:41:06 +05:30
Anand Doshi
11708bbcda Merge pull request #1311 from rmehta/session-fix
[fixes] [session] expiry, session async
2015-09-18 15:16:45 +05:30
Rushabh Mehta
9fe2c15356 [fixes] [session] expiry, session async 2015-09-18 14:52:56 +05:30
Rushabh Mehta
375e28fbeb [minor] send_notification_to should be mandatory if notify_if_unreplied is set 2015-09-18 11:05:42 +05:30
Anand Doshi
4e827056c9 Merge branch 'develop' 2015-09-17 15:27:34 +05:30
Anand Doshi
694729bb29 bumped to version 6.3.0 2015-09-17 15:57:33 +06:00
Anand Doshi
162f19e103 [change-log] 2015-09-17 15:20:57 +05:30
Anand Doshi
d02c53c5fc Merge pull request #1308 from anandpdoshi/translations
Translations
2015-09-17 15:13:11 +05:30
Anand Doshi
418c12e520 [translations] 2015-09-17 15:07:34 +05:30
Anand Doshi
b50a9a5834 Merge pull request #1307 from anandpdoshi/cc-in-communication
Added CC in Communication to manually specify whom to notify. frappe/erpnext#3697
2015-09-17 13:27:11 +05:30
Anand Doshi
2b9cb67e1f Added CC in Communication to manually specify whom to notify. frappe/erpnext#3697 2015-09-17 13:14:51 +05:30
Rushabh Mehta
93ce86a693 [fix] add fetch for read.only in child table too 2015-09-16 15:13:49 +05:30
Anand Doshi
1280b2ffc6 Merge pull request #1306 from anandpdoshi/db-query-filter-conditions
[cleanup] build_filter_conditions and [fix] replace % with %% in condition to prevent python format string error
2015-09-15 14:01:59 +05:30
Anand Doshi
b402df175e [cleanup] build_filter_conditions and [fix] replace % with %% in condition to prevent python format string error 2015-09-14 18:21:13 +05:30
Anand Doshi
b28bda4beb [fix] edge case for get_linked_document_type 2015-09-14 16:53:34 +05:30
Anand Doshi
01334c7a8a Merge pull request #1305 from anandpdoshi/messages-realtime
Realtime fixes for communication in timeline and messages page
2015-09-14 16:34:01 +05:30
Anand Doshi
d424e81036 Merge pull request #1304 from anandpdoshi/defaults-during-creation
[fix] Use User Permission value as default only if the document type is Setup
2015-09-14 16:32:53 +05:30
Anand Doshi
39826f2d72 [fix] Add communication into timeline in realtime 2015-09-14 16:28:07 +05:30
Anand Doshi
6983fa72f9 [fix] Show messages in realtime in the messages page 2015-09-14 15:41:27 +05:30
Anand Doshi
ffb8ef29ca [fix] Use User Permission value as default only if the document type is Setup 2015-09-14 13:00:24 +05:30
Anand Doshi
3cfc9a598a [minor] fix sitemap 2015-09-14 11:47:02 +05:30
Anand Doshi
c118f43e96 Merge pull request #1296 from rmehta/async-monitor
[enhancement] add celery task to Async Task for logs, tracking
2015-09-11 12:34:55 +05:30
Anand Doshi
56988514b3 Merge pull request #1303 from rmehta/print-format-fix
[fixes] font-awesome in print format, custom css, empty sections removed from print formats
2015-09-11 12:33:39 +05:30
Anand Doshi
f7bc441a81 Don't copy title field in Duplicate 2015-09-11 12:22:12 +05:30
Anand Doshi
c6282728ec [fix] if no background image, do not preload 2015-09-11 12:06:02 +05:30
Anand Doshi
0d64c0a335 [fix] allowed jinja functions 2015-09-11 11:40:15 +05:30
Anand Doshi
e33a4f914a Merge branch 'develop' 2015-09-09 15:28:33 +05:30
Anand Doshi
b6ba191ae7 bumped to version 6.2.0 2015-09-09 15:58:33 +06:00
Rushabh Mehta
188ff8f2e9 [fixes] font-awesome in print format, custom css, empty sections removed from print formats 2015-09-09 15:18:01 +05:30
Anand Doshi
e9a2325f05 Merge pull request #1302 from anandpdoshi/emails-muted
frappe.are_emails_muted
2015-09-09 15:12:00 +05:30
Anand Doshi
f21f8cd34c [fix] in schema sync, sync custom fields if installing any app other than frappe 2015-09-09 14:42:00 +05:30
Anand Doshi
94de362e3c [minor] frappe.are_emails_muted 2015-09-09 14:04:41 +05:30
Anand Doshi
202cb20b75 Merge pull request #1301 from anandpdoshi/add-share-ignore-permission
If flags.ignore_share_permission is passed
2015-09-09 13:09:37 +05:30
Anand Doshi
ffc022b54c [fix] If flags.ignore_share_permission is passed, don't check for share permission 2015-09-09 12:48:56 +05:30
Rushabh Mehta
7e6a2ca256 [fixes] [style] related to website and web-form 2015-09-09 11:17:38 +05:30
Rushabh Mehta
9337f8bf88 [data-import] use sync and fix error message for date parsing 2015-09-08 22:13:52 +05:30
Anand Doshi
ad493f7942 [fix] permission tests 2015-09-08 17:29:31 +05:30
Rushabh Mehta
4cec51e65d [celery] cleanup and made monitor optional and real time in data import 2015-09-08 17:20:37 +05:30
Rushabh Mehta
eb4e622067 [enhancement] add celery task to Async Task for logs, tracking 2015-09-08 17:20:36 +05:30
Anand Doshi
cd53c77587 [change-log] 2015-09-08 16:55:31 +05:30
Anand Doshi
5b3ec1b75d [change-log] 2015-09-08 16:48:15 +05:30