Commit graph

693 commits

Author SHA1 Message Date
Saurabh
a413b6e548 [Fixes] removed alerts 2015-09-21 15:43:31 +05:30
Saurabh
68e8810556 [Fixes] Upload file from listview, doc preview and download 2015-09-21 15:43:31 +05:30
Saurabh
b8fa93c31e [file manager] fix test cases 2015-09-21 15:43:31 +05:30
Saurabh
53818f6375 [Fixes] Nested folder copy and size calculation 2015-09-21 15:43:31 +05:30
Rushabh Mehta
2343b15b5d [fixes] file upload and added uploading via drag and drop 2015-09-21 15:43:31 +05:30
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
Anand Doshi
2b9cb67e1f Added CC in Communication to manually specify whom to notify. frappe/erpnext#3697 2015-09-17 13:14:51 +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
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
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
f7bc441a81 Don't copy title field in Duplicate 2015-09-11 12:22:12 +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
fbae8c2df3 [minor] Unset Apply User Permissions in default permissions 2015-09-07 17:33:58 +05:30
Anand Doshi
0f00c63801 [major fix] Restrict apply user permissions if user permissions list if empty. Fixes frappe/erpnext#3194 2015-09-07 14:58:53 +05:30
Rushabh Mehta
00db33abe7 [data-import] use sync and fix error message for date parsing 2015-09-05 12:14:34 +05:30
Anand Doshi
6644f4120e [fix] data import tool error callback 2015-09-02 21:51:35 +05:30
Rushabh Mehta
c600a302bb [enhancement] Added progress bar in data import tool
async.py: in `publish_realtime`, `event` is now optional, if called from within task
importer.py: send record count being updated using `frappe.publish_realtime`
ui/messages.js: added new tool `frappe.get_progress(title, count, total)` that will show progress bar realtime
2015-09-02 11:51:41 +05:30
Anand Doshi
a33eb2df49 Merge pull request #1280 from rmehta/communication-notify
[minor] notify realtime for parent in communication (that may come via email)
2015-08-27 16:59:01 +05:30
Anand Doshi
ad9c500863 Exported all doctypes 2015-08-27 16:45:45 +05:30
Rushabh Mehta
ad27d219bc [minor] notify realtime for parent in communication (that may come via email) 2015-08-27 16:31:48 +05:30
Rushabh Mehta
9deec6af5a [form] refactor layout and added collapsible sections 2015-08-25 16:13:30 +05:30
Rushabh Mehta
616098ba0a [minor] fix document_type in DocType and add 'name' and 'modified' to customize form sort options 2015-08-24 14:28:17 +05:30
Rushabh Mehta
acc4252ce7 [fix] task via async 2015-08-21 23:37:58 +05:30
Nabin Hait
7d8f2eeaa1 [fix] Removed async temporarily from importer 2015-08-21 17:48:02 +05:30
Anand Doshi
38ecee919e [fix] set Communication status as Linked or Open during insert, deduplication in timeline, get_user_room in socketio 2015-08-20 12:57:28 +05:30
Rushabh Mehta
a15af7882b [realtime] clear doc locally if updated 2015-08-18 16:52:23 +05:30
Rushabh Mehta
6d08f862b0 [cleanup] realtime 2015-08-17 18:22:27 +05:30
Anand Doshi
f2ccbc864f [fix] Allow appending to communication, don't pull sent email 2015-08-17 14:07:29 +05:30
Anand Doshi
c9782e23e4 Merge remote-tracking branch 'frappe/develop' into v6-wip
Conflicts:
	frappe/__version__.py
	frappe/core/doctype/communication/communication.json
	frappe/hooks.py
	frappe/model/document.py
	frappe/public/css/form.css
	frappe/public/less/form.less
	requirements.txt
	setup.py
2015-08-17 12:22:02 +05:30
Rushabh Mehta
21d5aaa47c [added] alternate desktop (listified) for ios app 2015-08-14 14:22:18 +05:30
Anand Doshi
c079e27d3f Moved Backup Manager and Social Login keys to the new Integrations Module, prepared frappe for Mandrill Integration 2015-08-11 12:03:13 +05:30
Rushabh Mehta
a7bd640b24 [merge] 5.3.1 2015-08-11 10:38:03 +05:30
Rushabh Mehta
4441a69b97 [minor] allow selects in dynamic links 2015-08-10 16:58:10 +05:30
Anand Doshi
bcafb56432 [fix] Added Share in Role Permissions Manager. Validate Share permission before adding/updating share 2015-08-04 15:47:59 +05:30
Anand Doshi
31fb389688 Delay sending of notification and provide upto 3 attempts in case of deadlock 2015-08-04 15:09:59 +05:30
Anand Doshi
a5bd8ad8eb [fix] make sure recipient email addresses are unique 2015-08-03 17:48:39 +05:30
Rushabh Mehta
3a117b5656 [merge] develop 2015-07-30 16:06:06 +05:30
Rushabh Mehta
98d8ce6e24 [minor] [communication] don't add empty recipients 2015-07-29 10:59:01 +05:30
Rushabh Mehta
6985d4127e [fixes] document_type, added set-config in commands, prompt in form.js 2015-07-28 17:37:01 +05:30
Anand Doshi
30993bd04a [minor] changed modified for json files to affect #1215 2015-07-27 16:32:55 +05:30
Tsutomu Mimori
c9a651fe13 Removed HTML from messages 2015-07-27 16:32:54 +05:30
Rushabh Mehta
6cd5957d82 Merge branch 'develop' into v6-wip 2015-07-27 14:41:51 +05:30