Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-04 | 1 | -203/+37 |
|\ | |||||
| * | Merge master into oc_preview | Georg Ehrke | 2013-08-26 | 1 | -200/+0 |
| |\ | |||||
| | * | remove duplicate code | Thomas Müller | 2013-08-22 | 1 | -198/+0 |
| * | | fix preview issue when uploading a file with parentheses | Georg Ehrke | 2013-08-26 | 1 | -1/+3 |
| * | | move path generation for previews to dedicated function | Georg Ehrke | 2013-08-23 | 1 | -2/+7 |
| * | | Merge master into oc_preview | Georg Ehrke | 2013-08-19 | 1 | -0/+16 |
| |\| | |||||
| | * | Merge pull request #4239 from owncloud/decrypt_files_again | Björn Schießle | 2013-08-18 | 1 | -0/+14 |
| | |\ | |||||
| | | * | Merge branch 'master' into decrypt_files_again | Bjoern Schiessle | 2013-08-17 | 1 | -11/+11 |
| | | |\ | |||||
| | | * | | remove whitespaces and some leftover code from testing | Bjoern Schiessle | 2013-08-15 | 1 | -1/+1 |
| | | * | | check if some encrypted files are left after the app was disabled and warn th... | Bjoern Schiessle | 2013-08-12 | 1 | -0/+14 |
| | * | | | communicate size of newly created file back and update UI | Thomas Müller | 2013-08-16 | 1 | -0/+2 |
| | | |/ | | |/| | |||||
| * | | | use jQuery.get instead of jQuery.ajax | Georg Ehrke | 2013-08-16 | 1 | -6/+2 |
| * | | | Merge master into oc_preview | Georg Ehrke | 2013-08-14 | 1 | -10/+2 |
| |\| | | |||||
| | * | | Use plural translations | kondou | 2013-08-09 | 1 | -11/+3 |
| * | | | lazy load preview icons | Georg Ehrke | 2013-08-14 | 1 | -6/+14 |
| * | | | don't use hardcoded size for preview | Georg Ehrke | 2013-08-14 | 1 | -1/+3 |
| * | | | style fixes | Georg Ehrke | 2013-07-30 | 1 | -1/+1 |
| * | | | Merge branch 'master' into oc_preview | Thomas Müller | 2013-07-30 | 1 | -4/+10 |
| |\| | | |||||
| * | | | merge conflicts ... | Georg Ehrke | 2013-07-10 | 1 | -150/+17 |
| |\ \ \ | |||||
| * | | | | properly encode path | Georg Ehrke | 2013-07-10 | 1 | -1/+1 |
| * | | | | implement preview loading after upload | Georg Ehrke | 2013-07-02 | 1 | -6/+13 |
* | | | | | architecture too complex | Jörn Friedrich Dreyer | 2013-08-21 | 1 | -7/+0 |
* | | | | | progress fixes | Jörn Friedrich Dreyer | 2013-08-16 | 1 | -27/+2 |
| |_|/ / |/| | | | |||||
* | | | | remove whitespaces | Bjoern Schiessle | 2013-07-29 | 1 | -1/+1 |
* | | | | disable "deleted files" button if trash bin is empty | Björn Schießle | 2013-07-26 | 1 | -2/+10 |
| |_|/ |/| | | |||||
* | | | finally remove the file size obfuscation as it had more disadvantages. I was ... | Jan-Christoph Borchardt | 2013-07-18 | 1 | -3/+1 |
| |/ |/| | |||||
* | | Public upload feature | Roman Geber | 2013-06-25 | 1 | -148/+1 |
* | | use json to encode user list | Robin Appelman | 2013-06-19 | 1 | -1/+1 |
* | | allow scanning files for multiple users | Robin Appelman | 2013-06-19 | 1 | -2/+16 |
|/ | |||||
* | small typo fix: added 2 whitespaces | davidak | 2013-05-24 | 1 | -2/+2 |
* | Files: set the proper mimetype when creating a new text file | Robin Appelman | 2013-05-06 | 1 | -2/+2 |
* | It's a class | Lukas Reschke | 2013-04-28 | 1 | -1/+1 |
* | Move onclick handler | Lukas Reschke | 2013-04-28 | 1 | -0/+5 |
* | Files: Fix XSS when creating dropshadow | Robin Appelman | 2013-04-22 | 1 | -3/+3 |
* | Merge pull request #2279 from owncloud/refactor_upload_js | Bart Visscher | 2013-04-06 | 1 | -240/+138 |
|\ | |||||
| * | use css browser switch instead of deprecated jquery browser detection | Jörn Friedrich Dreyer | 2013-03-28 | 1 | -7/+7 |
| * | '#upload' is actually '#uploadprogresswrapper', fix css and js to show cancel... | Jörn Friedrich Dreyer | 2013-03-28 | 1 | -5/+2 |
| * | use === to compare empty string '' | Jörn Friedrich Dreyer | 2013-03-28 | 1 | -1/+1 |
| * | don't update progress bar in ie < 10 | Jörn Friedrich Dreyer | 2013-03-28 | 1 | -1/+3 |
| * | refactor files.js, make proper use of fileupload events | Jörn Friedrich Dreyer | 2013-03-28 | 1 | -237/+136 |
* | | Translate 'Error' in core | kondou | 2013-04-06 | 1 | -4/+4 |
* | | Fixed things in alert-messages | root | 2013-04-05 | 1 | -4/+4 |
|/ | |||||
* | Merge pull request #2575 from owncloud/fixing-1461-master | Jörn Friedrich Dreyer | 2013-03-28 | 1 | -5/+25 |
|\ | |||||
| * | fixes #1463 - file size is now displayed correctly in IE8 | Thomas Mueller | 2013-03-26 | 1 | -2/+6 |
| * | fixes #1461 | Thomas Mueller | 2013-03-26 | 1 | -3/+19 |
* | | prevent to fire delete ajax a second time. | Thomas Mueller | 2013-03-26 | 1 | -1/+1 |
|/ | |||||
* | let public link download handle json encoded file lists | Björn Schießle | 2013-03-13 | 1 | -1/+1 |
* | json encode list of files | Björn Schießle | 2013-03-07 | 1 | -2/+3 |
* | fixed bug that prevented a newly created file to be opened with registered fi... | Bernhard Posselt | 2013-02-25 | 1 | -1/+1 |
* | use distance option to delay dragging in sane browsers | Jörn Friedrich Dreyer | 2013-02-25 | 1 | -0/+4 |