Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Disabled ajax mode for public files view | Vincent Petry | 2013-10-14 | 2 | -21/+27 | |
| * | | | | Fixed file permissions after public upload | Vincent Petry | 2013-10-14 | 1 | -2/+2 | |
| |/ / / | ||||||
* | | | | 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 | 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 | |
|\ \ \ \ | ||||||
| * | | | | fix api tests | Bjoern Schiessle | 2013-10-11 | 1 | -1/+2 | |
| * | | | | add "received_from" and "received_from_displayname" field in case of a reshar... | Bjoern Schiessle | 2013-10-10 | 1 | -7/+18 | |
| | |/ / | |/| | | ||||||
* | | | | 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 | 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 | |
|\ \ \ | ||||||
| * | | | Now using smaller spinner image for status indicator | Vincent Petry | 2013-10-11 | 2 | -6/+3 | |
| * | | | Fixed external storage status indicator in admin page | Vincent Petry | 2013-10-10 | 2 | -26/+32 | |
* | | | | Merge pull request #5301 from owncloud/versioning_preview_shared | Thomas Müller | 2013-10-12 | 2 | -4/+11 | |
|\ \ \ \ | ||||||
| * | | | | 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 | Vincent Petry | 2013-10-11 | 1 | -3/+1 | |
* | | | | | | | Merge pull request #5207 from owncloud/fixing-4011-part2-master | Thomas Müller | 2013-10-11 | 2 | -24/+29 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | 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 | Vincent Petry | 2013-10-11 | 1 | -2/+5 | |
* | | | | | | | | Merge pull request #5274 from owncloud/files-ie8-deletecheckbox | Vincent Petry | 2013-10-11 | 3 | -2/+3 | |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | ||||||
| * | | | | | | | 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 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #5261 from owncloud/versioning_no_glob | Björn Schießle | 2013-10-11 | 1 | -82/+58 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | 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 ser... | Bjoern Schiessle | 2013-10-10 | 1 | -81/+57 | |
* | | | | | | | 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 | Bjoern Schiessle | 2013-10-11 | 2 | -10/+3 | |
* | | | | | | | Merge pull request #5292 from owncloud/enc_block_file_access_if_key_is_missing | Björn Schießle | 2013-10-11 | 5 | -22/+57 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | fix another typo | Bjoern Schiessle | 2013-10-11 | 1 | -1/+1 | |
| * | | | | | | change error code to 403 | Bjoern Schiessle | 2013-10-11 | 1 | -1/+1 | |
| * | | | | | | fix typo in error message and change error code to 403 | Bjoern Schiessle | 2013-10-11 | 1 | -2/+2 | |
| * | | | | | | block file access if share keys are missing | Bjoern Schiessle | 2013-10-11 | 5 | -20/+55 | |
* | | | | | | | Fixed IE8 misaligned date | Vincent Petry | 2013-10-11 | 1 | -4/+0 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #5233 from owncloud/enc_filter_users | Björn Schießle | 2013-10-11 | 4 | -33/+7 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | don't cache if the encryption is enabled, this can lead to problems during un... | Bjoern Schiessle | 2013-10-10 | 1 | -27/+1 | |
| * | | | | | | make sure that we are logged in ad user1 while performing the tests | Bjoern Schiessle | 2013-10-10 | 1 | -3/+4 | |
| * | | | | | | only encrypt file to users with encryption keys | Bjoern Schiessle | 2013-10-09 | 2 | -3/+2 | |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-10 | 169 | -464/+132 | |
| |_|/ / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #5257 from owncloud/files-ie8-regularfileactionsbroken | Morris Jobke | 2013-10-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fixed files view regular file actions in IE8 | Vincent Petry | 2013-10-10 | 1 | -1/+1 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | Merge pull request #5182 from owncloud/fix-sharring-with-password-screen | Morris Jobke | 2013-10-10 | 3 | -2/+33 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | |