Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge conflicts ... | Georg Ehrke | 2013-07-10 | 4 | -160/+421 |
|\ | |||||
| * | Merge pull request #3903 from owncloud/nonpublic-uploading | Thomas Müller | 2013-07-01 | 1 | -1/+1 |
| |\ | | | | | | | Fix upload regressions | ||||
| | * | fix detection of public upload in filelist.js | Robin Appelman | 2013-07-01 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #3223 from owncloud/fix-2820 | Morris Jobke | 2013-07-01 | 1 | -5/+36 |
| |\ \ | | |/ | |/| | if rename of file fails, the rename is undone in the view - fix 2820 | ||||
| | * | if rename of file fails, the rename is undone in the view - #fix 2820 | Morris Jobke | 2013-06-15 | 1 | -5/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | Changes: * OC.dialog -> OC.Notification * Added test * Fixed OC.Notification.show() issue for queued items * Highlight failed item and show notification | ||||
| * | | Merge pull request #1044 from owncloud/fix_extra_slash | Bart Visscher | 2013-06-28 | 1 | -1/+5 |
| |\ \ | | | | | | | | | Remove duplicate / for first folder in root | ||||
| | * | | update to !== | Bart Visscher | 2013-06-28 | 1 | -1/+1 |
| | | | | |||||
| | * | | only encodeURIComponent once | Jörn Friedrich Dreyer | 2013-02-09 | 1 | -2/+2 |
| | | | | |||||
| | * | | Check if extra / is necessary for the folder URL | Michael Gapczynski | 2013-02-09 | 1 | -1/+5 |
| | | | | |||||
| * | | | Added file-upload to GIT repo | Roman Geber | 2013-06-26 | 1 | -0/+343 |
| | | | | | | | | | | | | | | | | Optimized CSS identifiers | ||||
| * | | | Public upload feature | Roman Geber | 2013-06-25 | 2 | -152/+21 |
| | | | | |||||
| * | | | 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 |
| | |/ | |/| | |||||
* | | | properly encode path | Georg Ehrke | 2013-07-10 | 1 | -1/+1 |
| | | | |||||
* | | | implement preview loading after upload | Georg Ehrke | 2013-07-02 | 2 | -8/+16 |
|/ / | |||||
* | | darker low threshold color for file size and age fading, better contrast | Jan-Christoph Borchardt | 2013-06-11 | 1 | -1/+1 |
| | | |||||
* | | small typo fix: added 2 whitespaces | davidak | 2013-05-24 | 1 | -2/+2 |
| | | |||||
* | | peselect filename without extension on rename | Jörn Friedrich Dreyer | 2013-05-13 | 1 | -0/+7 |
| | | |||||
* | | 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 |
| | | |||||
* | | Merge pull request #3108 from owncloud/fileactions-order | Lukas Reschke | 2013-04-24 | 1 | -7/+7 |
|\ \ | | | | | | | Files: fix the order fileactions are computed for a file | ||||
| * | | Files: fix the order fileactions are computed for a file | Robin Appelman | 2013-04-24 | 1 | -7/+7 |
| | | | |||||
* | | | fix wrong shared icon description | Morris Jobke | 2013-04-24 | 1 | -0/+1 |
|/ / | | | | | | | | | | | fix #2928 translation of string "Shared" has to be marked as located in "files" for the translation extractor | ||||
* | | Files: Fix XSS when creating dropshadow | Robin Appelman | 2013-04-22 | 1 | -3/+3 |
| | | |||||
* | | Fix displaying spinner on delete | Bart Visscher | 2013-04-19 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #2279 from owncloud/refactor_upload_js | Bart Visscher | 2013-04-06 | 2 | -251/+292 |
|\ \ | | | | | | | Refactor upload js | ||||
| * | | 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 ↵ | Jörn Friedrich Dreyer | 2013-03-28 | 1 | -5/+2 |
| | | | | | | | | | | | | cancel button correctly | ||||
| * | | use local variable to walk DOM only once | Jörn Friedrich Dreyer | 2013-03-28 | 1 | -4/+5 |
| | | | |||||
| * | | 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 |
| | | | |||||
| * | | return created table row, use as context in fileupload events | Jörn Friedrich Dreyer | 2013-03-28 | 1 | -11/+153 |
| | | | |||||
| * | | 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 |
|/ / | | | | | | | | | | | Two parameters for OC.dialogs.alert, otherwise one will be "undefined". Also fixed missing translation. | ||||
* | | Merge pull request #2575 from owncloud/fixing-1461-master | Jörn Friedrich Dreyer | 2013-03-28 | 1 | -5/+25 |
|\ \ | | | | | | | Fix upload progressbar in IE8 and IE9 | ||||
| * | | 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 |
|/ / | | | | | | | Before the click on a single file delete icon fired two different handlers - one of them is for multiple deletion only | ||||
* | | Merge pull request #2270 from owncloud/fix_json_encoded_pubic_download | Björn Schießle | 2013-03-26 | 1 | -1/+1 |
|\ \ | | | | | | | let public link download handle json encoded file lists [master] | ||||
| * | | let public link download handle json encoded file lists | Björn Schießle | 2013-03-13 | 1 | -1/+1 |
| | | | |||||
* | | | only prevent shared action for the Shared folder in the root dir | Björn Schießle | 2013-03-13 | 1 | -1/+1 |
| | | | |||||
* | | | don't add share action to the Shared folder | Björn Schießle | 2013-03-12 | 1 | -1/+1 |
|/ / | |||||
* | | json encode list of files | Björn Schießle | 2013-03-07 | 1 | -2/+3 |
| | | |||||
* | | Merge pull request #2034 from owncloud/fix_bug47 | Michael Gapczynski | 2013-03-03 | 1 | -18/+19 |
|\ \ | | | | | | | Fix #47 - Duplicate files create a (2) when multiples are uploaded | ||||
| * | | fix oc#47 | Georg Ehrke | 2013-03-01 | 1 | -18/+19 |
| | | | |||||
* | | | fixed bug that prevented a newly created file to be opened with registered ↵ | Bernhard Posselt | 2013-02-25 | 1 | -1/+1 |
| | | | | | | | | | | | | files actions | ||||
* | | | Merge pull request #1892 from owncloud/files_remove_row_on_delete | Björn Schießle | 2013-02-25 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | delete table row if file was deleted instead of just hide it | ||||
| * | | | delete table row if file was deleted instead of just hide it | Björn Schießle | 2013-02-25 | 1 | -1/+1 |
| | | | |