summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-10-1622-1/+61
|
* Merge pull request #5334 from owncloud/files-sharing-actionsafteruploadMorris Jobke2013-10-153-23/+29
|\ | | | | Files sharing actions + navigation fixes
| * Disabled ajax mode for public files viewVincent Petry2013-10-142-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 uploadVincent Petry2013-10-141-2/+2
| | | | | | | | Fixes #5328
* | Merge pull request #5332 from owncloud/enc_run_proxy_only_for_filesMorris Jobke2013-10-151-1/+2
|\ \ | | | | | | check if we are writing to user/files, otherwise skip encryption
| * | check if we are writing to user/files, otherwise skip encryptionBjoern Schiessle2013-10-141-1/+2
| |/
* | Merge pull request #5269 from owncloud/ocs_share_api_add_received_fromBjörn Schießle2013-10-152-8/+20
|\ \ | | | | | | ocs share api: add "received_from" and "received_from_displayname" field
| * | fix api testsBjoern Schiessle2013-10-111-1/+2
| | |
| * | add "received_from" and "received_from_displayname" field in case of a ↵Bjoern Schiessle2013-10-101-7/+18
| | | | | | | | | | | | reshared file to the output
* | | Merge pull request #5330 from owncloud/files-removedfileactionsbkgVincent Petry2013-10-141-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 onVincent Petry2013-10-141-8/+0
| | |/ | |/|
* / | Added missing "grid" class on external storage's tableVincent Petry2013-10-141-1/+1
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2013-10-1319-11/+56
| |
* | Merge pull request #5253 from owncloud/externalstorage-adminstatusindicatorMorris Jobke2013-10-132-26/+29
|\ \ | | | | | | Fixed external storage status indicator in admin page
| * | Now using smaller spinner image for status indicatorVincent Petry2013-10-112-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 pageVincent Petry2013-10-102-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_sharedThomas Müller2013-10-122-4/+11
|\ \ \ | | | | | | | | versioning preview also for shared files
| * | | remove debug outputBjoern Schiessle2013-10-111-1/+1
| | | |
| * | | Merge branch 'master' into versioning_preview_sharedBjoern Schiessle2013-10-11185-550/+245
| |\ \ \
| * | | | make previews work for shared files in the versions drop-downBjoern Schiessle2013-10-102-5/+12
| | | | |
* | | | | Merge pull request #5304 from owncloud/files-deleteiconpositionfixMorris Jobke2013-10-111-3/+1
|\ \ \ \ \ | | | | | | | | | | | | Fixed position of "delete" icon in files app
| * | | | | Fixed position of "delete" icon in files appVincent Petry2013-10-111-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-masterThomas Müller2013-10-112-24/+29
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [OC6] file upload exception handling
| * | | | | catch exceptions while uploading and pass on the error messageThomas Müller2013-10-082-24/+29
| | | | | |
* | | | | | Merge pull request #5302 from owncloud/files-missingfileactionsafteraddVincent Petry2013-10-111-2/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | File actions are now updated after create/upload file
| * | | | | | File actions are now updated after create/upload fileVincent Petry2013-10-111-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-deletecheckboxVincent Petry2013-10-113-2/+3
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Fixed delete icon alignment in IE8
| * | | | | | Moved IE8 inline styles in files.cssVincent Petry2013-10-113-2/+3
| | | | | | |
| * | | | | | Fixed delete icon alignment in IE8Vincent Petry2013-10-112-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_globBjörn Schießle2013-10-111-82/+58
|\ \ \ \ \ \ | | | | | | | | | | | | | | versioning: don't use glob() and getLocalFile()
| * | | | | | some small fixesBjoern Schiessle2013-10-111-2/+1
| | | | | | |
| * | | | | | make files versions root a class constantBjoern Schiessle2013-10-101-3/+3
| | | | | | |
| * | | | | | some small changes/fixesBjoern Schiessle2013-10-101-9/+8
| | |_|_|/ / | |/| | | |
| * | | | | fix getVersions() for sub directoriesBjoern Schiessle2013-10-101-2/+3
| | | | | |
| * | | | | add missing preview linkBjoern Schiessle2013-10-101-0/+1
| | | | | |
| * | | | | don't use glob() and getLocalFile(), this can lead to problems on windows ↵Bjoern Schiessle2013-10-101-81/+57
| | | | | | | | | | | | | | | | | | | | | | | | servers
* | | | | | Merge pull request #5298 from owncloud/enc_fix_setting_dialog_headlinesBjörn Schießle2013-10-112-10/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | fix setting dialog headlines for the encryption app
| * | | | | fix setting dialog headlines for the encryption appBjoern Schiessle2013-10-112-10/+3
| | | | | |
* | | | | | Merge pull request #5292 from owncloud/enc_block_file_access_if_key_is_missingBjörn Schießle2013-10-115-22/+57
|\ \ \ \ \ \ | |/ / / / / |/| | | | | encryption: block file access if share keys are missing
| * | | | | fix another typoBjoern Schiessle2013-10-111-1/+1
| | | | | |
| * | | | | change error code to 403Bjoern Schiessle2013-10-111-1/+1
| | | | | |
| * | | | | fix typo in error message and change error code to 403Bjoern Schiessle2013-10-111-2/+2
| | | | | |
| * | | | | block file access if share keys are missingBjoern Schiessle2013-10-115-20/+55
| | | | | |
* | | | | | Fixed IE8 misaligned dateVincent Petry2013-10-111-4/+0
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed display: block to let the element be displayed inline and let itself aligned by vertical-align: middle of the parent This works in IE8 and other browsers. Fixes #5288
* | | | | Merge pull request #5233 from owncloud/enc_filter_usersBjörn Schießle2013-10-114-33/+7
|\ \ \ \ \ | | | | | | | | | | | | only encrypt file to users with encryption keys
| * | | | | don't cache if the encryption is enabled, this can lead to problems during ↵Bjoern Schiessle2013-10-101-27/+1
| | | | | | | | | | | | | | | | | | | | | | | | unit testing
| * | | | | make sure that we are logged in ad user1 while performing the testsBjoern Schiessle2013-10-101-3/+4
| | | | | |
| * | | | | only encrypt file to users with encryption keysBjoern Schiessle2013-10-092-3/+2
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-10169-464/+132
| |_|/ / / |/| | | |
* | | | | Merge pull request #5257 from owncloud/files-ie8-regularfileactionsbrokenMorris Jobke2013-10-101-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fixed files view regular file actions in IE8