Commit graph

8101 commits

Author SHA1 Message Date
Anand Doshi
45583f30fe [hotfix] disable csrf check for mobile 2015-09-24 17:23:57 +05:30
Anand Doshi
cf0d865e1d Merge branch 'develop' 2015-09-24 13:58:31 +05:30
Anand Doshi
9823d67776 bumped to version 6.4.0 2015-09-24 14:28:31 +06:00
Anand Doshi
c17abaef40 [change-log] 2015-09-24 12:49:24 +05:30
Anand Doshi
5ecf6ba7e1 Merge pull request #1313 from anandpdoshi/table-allow-on-submit
allow a table to be 'allow on submit'
2015-09-24 11:29:36 +05:30
Anand Doshi
b16bf6ef96 Merge branch 'xss' into develop 2015-09-24 11:28:42 +05:30
Anand Doshi
8191df579a [fix] allow a table to be 'allow on submit' 2015-09-23 19:28:53 +05:30
Anand Doshi
587e43c7b0 [fix] sanitize html for guest methods if guest user 2015-09-23 18:25:36 +05:30
Anand Doshi
8a57ff6824 [fix] csrf token for website if switch to desk 2015-09-23 17:08:19 +05:30
Anand Doshi
1dc5ebda32 [fix] test runner fixes 2015-09-23 12:48:29 +05:30
Rushabh Mehta
65ebc73a0a [fix] add font-awesome for report print 2015-09-23 12:14:51 +05:30
Rushabh Mehta
1788ddbe60 [fix] don't delete standard folders 2015-09-23 11:43:47 +05:30
Rushabh Mehta
12ee80369f [fix] moved file data > file patch on the top 2015-09-22 14:58:56 +05:30
Anand Doshi
d4d505fbf3 Merge pull request #1312 from rmehta/jinja-in-desk-page
Jinja in Desk Page
2015-09-22 12:54:50 +05:30
Anand Doshi
6d570e2f92 [fix] listing and query report 2015-09-22 12:52:08 +05:30
Rushabh Mehta
75c78073ce [enhancement] jinja in desk page 2015-09-22 10:07:31 +05:30
Anand Doshi
d01dc8c419 Merge pull request #1290 from rmehta/dms
[enhancement] document management system
2015-09-21 19:47:02 +05:30
Rushabh Mehta
73180cfe2a [added patch] 2015-09-21 17:28:02 +05:30
Rushabh Mehta
c8c2d4b170 [test-fix] 2015-09-21 15:43:32 +05:30
Rushabh Mehta
bedf04a5f4 [fixes] file manager, attachments go to 'Attachments' folder and permission + cleanups 2015-09-21 15:43:32 +05:30
Saurabh
e4e1f99ed1 [Fixes] Setting folder size 2015-09-21 15:43:31 +05:30
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
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