Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | split up reset()['path'] to make it compatible with older PHP versions | Bjoern Schiessle | 2013-10-17 | 1 | -1/+2 |
| | |||||
* | add test for the reshare option | Bjoern Schiessle | 2013-10-17 | 1 | -2/+59 |
| | |||||
* | adjust tests | Bjoern Schiessle | 2013-10-17 | 2 | -4/+3 |
| | |||||
* | new option to add reshares to the result | Bjoern Schiessle | 2013-10-17 | 1 | -24/+85 |
| | |||||
* | Merge pull request #5329 from owncloud/enc_fix_unencrypted_size | Björn Schießle | 2013-10-16 | 1 | -2/+19 |
|\ | | | | | try to fix unencrypted file size if it doesn't look plausible | ||||
| * | revert last changes | Bjoern Schiessle | 2013-10-16 | 1 | -3/+1 |
| | | |||||
| * | added another test, if unencrypted size and encrypted size are equal we can ↵ | Bjoern Schiessle | 2013-10-15 | 1 | -1/+3 |
| | | | | | | | | also assume that something is wrong | ||||
| * | fix array key | Bjoern Schiessle | 2013-10-14 | 1 | -1/+1 |
| | | |||||
| * | try to fix unencrypted file size if it doesn't look plausible | Bjoern Schiessle | 2013-10-14 | 1 | -2/+19 |
| | | |||||
* | | Merge pull request #5354 from owncloud/enc_tests | Morris Jobke | 2013-10-16 | 1 | -216/+106 |
|\ \ | | | | | | | added simple test for getFileSize proxy | ||||
| * | | fix comment | Bjoern Schiessle | 2013-10-15 | 1 | -1/+1 |
| | | | |||||
| * | | added simple test for getFileSize proxy | Bjoern Schiessle | 2013-10-15 | 1 | -216/+106 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-16 | 22 | -1/+61 |
| | | | |||||
* | | | Merge pull request #5334 from owncloud/files-sharing-actionsafterupload | Morris Jobke | 2013-10-15 | 3 | -23/+29 |
|\ \ \ | |/ / |/| | | Files sharing actions + navigation fixes | ||||
| * | | Disabled ajax mode for public files view | Vincent Petry | 2013-10-14 | 2 | -21/+27 |
| | | | | | | | | | | | | | | | | | | Ajax loading is not supported yet for public files view. This fix disabled the history API, ajax loading and ajax directory switch in public mode until it is implemented properly. | ||||
| * | | Fixed file permissions after public upload | Vincent Petry | 2013-10-14 | 1 | -2/+2 |
| |/ | | | | | | | Fixes #5328 | ||||
* | | Merge pull request #5332 from owncloud/enc_run_proxy_only_for_files | Morris Jobke | 2013-10-15 | 1 | -1/+2 |
|\ \ | | | | | | | check if we are writing to user/files, otherwise skip encryption | ||||
| * | | check if we are writing to user/files, otherwise skip encryption | Bjoern Schiessle | 2013-10-14 | 1 | -1/+2 |
| |/ | |||||
* | | Merge pull request #5269 from owncloud/ocs_share_api_add_received_from | Björn Schießle | 2013-10-15 | 2 | -8/+20 |
|\ \ | | | | | | | ocs share api: add "received_from" and "received_from_displayname" field | ||||
| * | | fix api tests | Bjoern Schiessle | 2013-10-11 | 1 | -1/+2 |
| | | | |||||
| * | | add "received_from" and "received_from_displayname" field in case of a ↵ | Bjoern Schiessle | 2013-10-10 | 1 | -7/+18 |
| | | | | | | | | | | | | reshared file to the output | ||||
* | | | Merge pull request #5330 from owncloud/files-removedfileactionsbkg | Vincent Petry | 2013-10-14 | 1 | -8/+0 |
|\ \ \ | | | | | | | | | Removed extra bkg color on file actions when row is selected/hovered on | ||||
| * | | | Removed extra bkg color on file actions when row is selected/hovered on | Vincent Petry | 2013-10-14 | 1 | -8/+0 |
| | |/ | |/| | |||||
* / | | Added missing "grid" class on external storage's table | Vincent Petry | 2013-10-14 | 1 | -1/+1 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-13 | 19 | -11/+56 |
| | | |||||
* | | Merge pull request #5253 from owncloud/externalstorage-adminstatusindicator | Morris Jobke | 2013-10-13 | 2 | -26/+29 |
|\ \ | | | | | | | Fixed external storage status indicator in admin page | ||||
| * | | Now using smaller spinner image for status indicator | Vincent Petry | 2013-10-11 | 2 | -6/+3 |
| | | | | | | | | | | | | | | | | | | To make the status indicator appear smaller, even in IE8 that doesn't support background-size, there is no a smaller animated gif "loading-small" for that purpose. | ||||
| * | | Fixed external storage status indicator in admin page | Vincent Petry | 2013-10-10 | 2 | -26/+32 |
| | | | | | | | | | | | | | | | | | | | | | - Fixes #5241 - Fixed indicator to appear, its selector was wrong - Added spinner while saving an entry's settings - Removed ajax "async: false" that blocked the browser while saving | ||||
* | | | Merge pull request #5301 from owncloud/versioning_preview_shared | Thomas Müller | 2013-10-12 | 2 | -4/+11 |
|\ \ \ | | | | | | | | | versioning preview also for shared files | ||||
| * | | | remove debug output | Bjoern Schiessle | 2013-10-11 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into versioning_preview_shared | Bjoern Schiessle | 2013-10-11 | 185 | -550/+245 |
| |\ \ \ | |||||
| * | | | | make previews work for shared files in the versions drop-down | Bjoern Schiessle | 2013-10-10 | 2 | -5/+12 |
| | | | | | |||||
* | | | | | Merge pull request #5304 from owncloud/files-deleteiconpositionfix | Morris Jobke | 2013-10-11 | 1 | -3/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixed position of "delete" icon in files app | ||||
| * | | | | | Fixed position of "delete" icon in files app | Vincent Petry | 2013-10-11 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was an issue where only Chrome allows setting position: relative on a td element. This fix now works in IE8, Firefox and Chrome. Fixes #5056 | ||||
* | | | | | | Merge pull request #5207 from owncloud/fixing-4011-part2-master | Thomas Müller | 2013-10-11 | 2 | -24/+29 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | [OC6] file upload exception handling | ||||
| * | | | | | catch exceptions while uploading and pass on the error message | Thomas Müller | 2013-10-08 | 2 | -24/+29 |
| | | | | | | |||||
* | | | | | | Merge pull request #5302 from owncloud/files-missingfileactionsafteradd | Vincent Petry | 2013-10-11 | 1 | -2/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | File actions are now updated after create/upload file | ||||
| * | | | | | | File actions are now updated after create/upload file | Vincent Petry | 2013-10-11 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file actions must explicitly be updated by calling FileActions.display() on the file element after creating or uploading a file. Fixes #4971 and #4993 | ||||
* | | | | | | | Merge pull request #5274 from owncloud/files-ie8-deletecheckbox | Vincent Petry | 2013-10-11 | 3 | -2/+3 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Fixed delete icon alignment in IE8 | ||||
| * | | | | | | Moved IE8 inline styles in files.css | Vincent Petry | 2013-10-11 | 3 | -2/+3 |
| | | | | | | | |||||
| * | | | | | | Fixed delete icon alignment in IE8 | Vincent Petry | 2013-10-11 | 2 | -2/+2 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Removed old inline CSS that forced every td to have position:static in the files app. (#5056) | ||||
* | | | | | | Merge pull request #5261 from owncloud/versioning_no_glob | Björn Schießle | 2013-10-11 | 1 | -82/+58 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | versioning: don't use glob() and getLocalFile() | ||||
| * | | | | | | some small fixes | Bjoern Schiessle | 2013-10-11 | 1 | -2/+1 |
| | | | | | | | |||||
| * | | | | | | make files versions root a class constant | Bjoern Schiessle | 2013-10-10 | 1 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | some small changes/fixes | Bjoern Schiessle | 2013-10-10 | 1 | -9/+8 |
| | |_|_|/ / | |/| | | | | |||||
| * | | | | | fix getVersions() for sub directories | Bjoern Schiessle | 2013-10-10 | 1 | -2/+3 |
| | | | | | | |||||
| * | | | | | add missing preview link | Bjoern Schiessle | 2013-10-10 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | don't use glob() and getLocalFile(), this can lead to problems on windows ↵ | Bjoern Schiessle | 2013-10-10 | 1 | -81/+57 |
| | | | | | | | | | | | | | | | | | | | | | | | | servers | ||||
* | | | | | | Merge pull request #5298 from owncloud/enc_fix_setting_dialog_headlines | Björn Schießle | 2013-10-11 | 2 | -10/+3 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | fix setting dialog headlines for the encryption app | ||||
| * | | | | | fix setting dialog headlines for the encryption app | Bjoern Schiessle | 2013-10-11 | 2 | -10/+3 |
| | | | | | |