Commit graph

86 commits

Author SHA1 Message Date
Saurabh
3f43899839 resolved merge conflicts 2018-01-15 18:34:11 +05:30
Manas Solanki
edbbf4b464 add the field attach_to_field in the file (#4823) 2018-01-15 18:10:53 +05:30
tundebabzy
27df2485d9 UnboundLocalError When Trying To Upload File #4692 (#4693)
* allow to attach empty files

* PEP8 compliance
2017-12-28 12:56:34 +05:30
Aditya Hase
38d63f7dc7 Python 3 compatibility Frappe test fixes (#4318)
* Read image file in binary mode

* Read files in binary mode

* Don't use bytestrings unnecessarily

* Correctly convert byte strings to unicode in frappe.as_unicode

* Convert content to bytes before writing to file
2017-10-17 17:45:25 +05:30
Aditya Hase
234fca90a3 Encode content if not encoded before hashing 2017-09-27 01:08:07 +05:30
Rushabh Mehta
3b41d031a7 [fix] file_manager.py 2017-09-14 13:07:29 +05:30
Rushabh Mehta
1de26c939c [enhance] use socket-io to upload files 2017-09-14 13:07:29 +05:30
Rushabh Mehta
fd7e8eda62 [wip] file upload with socketio 2017-09-14 13:07:29 +05:30
Aditya Hase
16a9bdfd31 Replaced urllib.unquote imports with six.moves.urllib.parse.unquote (#3836) 2017-08-02 17:09:31 +05:30
Aditya Hase
e6bd1e4995 Replaced all instances of 'unicode' with 'six.text_type' (#3825) 2017-08-02 16:57:39 +05:30
Revant Nandgaonkar
b06f987e55 Download files using REST API and OAuth 2 Token (#3499)
* Download files using REST API and OAuth 2 Token

* Check permissions before file download via API

* Solves Codacy issues

https://www.codacy.com/app/netchampfaris/frappe/file/7377221800/issues/source?bid=4679759&fileBranchId=4768213#l364
2017-06-19 09:11:31 +05:30
tundebabzy
6fbe20caaa Except and raise statement python 3 compatible style (#3216)
* changes exception and raise statements to python 3 style

* changes except statement to python 3 style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* adds six.reraise to fix python 3 style raise statements with traceback

* fixes indentation
2017-05-11 10:51:59 +05:30
Faris Ansari
08da14996f Enhance multi file upload (#2912)
* Allow multiple file upload, show progress while uploading

* Enhance multi file upload

You can now upload files programmatically like
```
frappe.upload.make({
  ...
  files: fileobj_array,
  ...
})
```
No need to use `multifile_upload` method.
Multiple file upload is enabled by default on all Attach dialogs.

* Don't `allow_multiple` in data import tool

* ControlAttach don't allow_multiple

* Show files in a table view

* Narrow width for Is Private column
2017-04-07 13:37:08 +05:30
Rushabh Mehta
d989a95472 [feature] document versioning #2469 (#2523)
* [feature] document versioning #2469

* [minor] remove on_update from WebsiteGenerator

* [fix] delete shares when deleting user

* [test] don't run delete in background if test

* [fix] test_db

* [added] Deleted Document

* [fix] added track_changes in all documents

* [fix] add to deleted only if exists

* [fix] in_install flag in deleted documents

* [minor] name will always be reset
2016-12-29 18:01:42 +05:30
Rushabh Mehta
05268603cf [fix] delete attachments last, fixes #978 2016-12-27 15:34:42 +05:30
Rushabh Mehta
c67d3bfe01 Add attachment from email and copy attachments to Communication Record (#2412)
* Carry over file attachments in email communications

* [fix] style
2016-12-05 14:59:00 +05:30
Rushabh Mehta
7bc7e3bc63 Upgrade Font Awesome (#2410)
* Font-Awesome V3.x to V4.x

Font-Awesome V3.x to V4.x

* Font Tidy

Font Tidy

* FA4 Upgrade - Html Js & Json

FA4 Upgrade - Html Js & Json

* Minor

Minor
2016-12-05 13:07:03 +05:30
RobertSchouten
3730e4fa8f [fix] allow path attachements to be sent my email (#2138) 2016-10-08 11:10:08 +05:30
Rushabh Mehta
f1dd0c0bb8 [fix] web forms remove attachment 2016-09-29 12:38:46 +05:30
Rushabh Mehta
cd7b7ae35b [portal] enhancement to web form, introduced int, custom menu in portal settings etc 2016-09-26 17:03:55 +05:30
Rushabh Mehta
8dd380baac [fix] file_manager.py decode filename while extracting from dataurl 2016-08-12 15:09:42 +05:30
Nabin Hait
bc731a0a69 Increased file size limit upto 10MB 2015-12-30 11:08:41 +05:30
Anand Doshi
f1a8b42443 [fix] get_file in file_manager 2015-12-11 00:47:58 +05:30
Anand Doshi
99dd012914 [fix] get_file_path 2015-12-10 00:37:31 +05:30
Anand Doshi
8a5addaae7 [feature] Private files. Fixes #927
- Option during upload + all new incoming email files will be private
- Paired with @rmehta
2015-12-09 14:02:14 +05:30
Anand Doshi
ca142f9160 [fix] encode path before opening a file 2015-11-19 19:05:44 +05:30
Anand Doshi
5621ba30c0 [enhancement] Int, Currency, Float, Percent as not null and default to 0 2015-11-19 13:09:44 +05:30
Anand Doshi
5191dc0699 [fix] get_js 2015-11-17 18:27:29 +05:30
Rushabh Mehta
fca5b4d002 [fix] inline images in email receive 2015-11-06 16:49:17 +05:30
Anand Doshi
cc2a625bed [hook] before_write_file, added method call_hook_method 2015-10-28 13:09:57 +05:30
Anand Doshi
1511d6be81 fixed tests 2015-10-22 15:51:38 +05:30
Anand Doshi
7fe35e0275 [fix] Remove thumbnail on deletion and change Attach to small text 2015-10-19 12:55:02 +05:30
Rushabh Mehta
34dd7b2a74 [fix] use hash for file names since same file can be attached to multiple files 2015-10-13 12:27:01 +05:30
Rushabh Mehta
7a41a2545b [fixes] [test] test_file.py 2015-10-08 12:15:29 +05:30
Rushabh Mehta
9231b9a9b8 [enhancement] added 'make_thumbnail' to File and will be saved as thumbnail_url 2015-10-07 14:28:42 +05:30
Saurabh
e4e1f99ed1 [Fixes] Setting folder size 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
c1bc00d8bf New File Uploading 2015-09-21 15:43:30 +05:30
Rushabh Mehta
2191312c87 [enhancement] document management system 2015-09-21 15:41:34 +05:30
Pratik Vyas
97149bdc88 [fix] Extract images from HTML fields for print format 2015-05-21 17:39:26 +05:30
Rushabh Mehta
7eda066901 [minor] set max attachment size to 5MB 2015-05-20 18:15:39 +05:30
Anand Doshi
1845c08676 [fix] save images attached in text editor fields of children 2015-05-07 12:35:37 -07:00
Anand Doshi
05fe53c404 Merge remote-tracking branch 'frappe/v4.x.x' into develop
Conflicts:
	frappe/__version__.py
	frappe/core/doctype/comment/comment.py
	frappe/hooks.py
	frappe/model/db_query.py
	frappe/print/doctype/print_format/print_format.py
	frappe/utils/__init__.py
	requirements.txt
	setup.py
2015-04-06 12:05:50 +05:30
Anand Doshi
6ed5604a2f [fix] email receive file 2015-04-02 18:10:59 +05:30
Anand Doshi
aef6baf798 [hotfix] encode path before removing file 2015-03-31 13:07:56 +05:30
Anand Doshi
2d6fec5954 File Manager: fixed unicode decode error 2015-03-23 16:07:42 +05:30
Anand Doshi
2995f02f3b Web Notes to Frappe, better alerts, css fixes, fixed splash 2015-03-03 15:09:34 +05:30
Nabin Hait
508c4fc64b Fixed Conflict while merging v4 to v5 2015-02-10 17:20:39 +05:30
Anand Doshi
e6a7459657 Fixes in share, moved flags like ignore_mandatory, ignore_validate etc to doc.flags 2015-02-10 14:41:14 +05:30
Anand Doshi
39f8164cd9 [fix] extract images regex should look ahead for data: 2015-02-06 12:20:19 +05:30