Commit graph

623 commits

Author SHA1 Message Date
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
Anand Doshi
ec7763eb94 [minor] changed modified for json files to affect #1215 2015-07-27 12:15:05 +05:30
Anand Doshi
eb7d775e20 Merge branch 'develop' of https://github.com/tmimori/frappe into tmimori-develop 2015-07-27 12:06:53 +05:30
Anand Doshi
f2d3a6ef9b Implemented 'If Owner' in Role Permissions 2015-07-24 12:17:30 +05:30
Pratik Vyas
bd2cad08bc Make data import tool async WIP 2015-07-24 10:08:08 +05:30
Pratik Vyas
422668a67f Async 2015-07-24 10:07:24 +05:30
Tsutomu Mimori
a72b6d89de Removed HTML from messages 2015-07-23 21:12:56 +09:00
Priya
9f28c7d923 [Fixes] conf import fix 2015-07-23 12:39:33 +05:30
Anand Doshi
4e593711dc Merge pull request #1210 from rmehta/docs-update
[docs] update to auto documentation generator
2015-07-22 16:39:21 +05:30
Rushabh Mehta
18d0a886c0 [docs] update to auto documentation generator 2015-07-22 16:38:44 +05:30
Anand Doshi
731f75dd08 [minor] pass pre_process function to import methods 2015-07-22 14:32:18 +05:30
Anand Doshi
d70968dbc5 [feature] Share with Everyone 2015-07-17 19:41:32 +05:30
Rushabh Mehta
ceb0f1821d [minor] labels 2015-07-14 11:28:17 +05:30
Rushabh Mehta
1cdfd7aa20 [permission] removed un-necessary 'All' permissions 2015-07-13 15:39:33 +05:30
Nabin Hait
a67f36d3d6 Merge pull request #1171 from rmehta/share-permission-fix
[fix] share permissions with user permissions
2015-07-02 14:21:00 +05:30
Nabin Hait
157f3c7b68 Convert fieldname to lowercase while creation 2015-07-02 12:23:27 +05:30
Rushabh Mehta
6395469a38 [fix] share permissions with user permissions 2015-07-01 13:00:36 +05:30
Nabin Hait
42177a5665 [fix] Show all recipients in sent-to message 2015-06-22 19:25:19 +05:30
Nabin Hait
c641d51158 [fix] Update comments in parent doctype if comment_doctype mentioned 2015-06-22 09:02:04 +05:30
Nabin Hait
f7016664cc Show all recipients in sent-to message 2015-06-19 00:15:53 +05:30
Nabin Hait
da2c7c8683 Show all recipients in sent-to message 2015-06-18 16:52:00 +05:30