Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [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 |
| | | | | | | |||||
* | | | | | | Merge pull request #5292 from owncloud/enc_block_file_access_if_key_is_missing | Björn Schießle | 2013-10-11 | 5 | -22/+57 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | encryption: block file access if share keys are missing | ||||
| * | | | | | 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 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_users | Björn Schießle | 2013-10-11 | 4 | -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 Schiessle | 2013-10-10 | 1 | -27/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | unit testing | ||||
| * | | | | | 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 | ||||
| * | | | | | Fixed files view regular file actions in IE8 | Vincent Petry | 2013-10-10 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #5256 A missing closing span broken the container in IE8 which prevented the file actions to be appended properly. | ||||
* | | | | | Merge pull request #5182 from owncloud/fix-sharring-with-password-screen | Morris Jobke | 2013-10-10 | 3 | -2/+33 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Fix password screen for public shares | ||||
| * | | | | Fix password screen for public shares | Morris Jobke | 2013-10-07 | 3 | -2/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Works in IE8, 9, 10, Firefox 24 and Chromium 30 * Credits to Julian Müller @Julian1998 | ||||
* | | | | | Merge pull request #5114 from owncloud/ldap_uuid_attr_groups | blizzz | 2013-10-10 | 6 | -152/+107 |
|\ \ \ \ \ | | | | | | | | | | | | | LDAP: allow different UUID attributes for groups and users | ||||
| * | | | | | LDAP: allow different UUID attributes for groups and users | Arthur Schiwon | 2013-10-04 | 6 | -152/+107 |
| | | | | | | |||||
* | | | | | | Merge pull request #5221 from owncloud/fixing-5217-master | VicDeo | 2013-10-10 | 1 | -2/+4 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | fixing php 5.3 compatibility | ||||
| * | | | | | php 5.3 compatibility for Test_Files_Sharing_Api | Thomas Müller | 2013-10-08 | 1 | -2/+4 |
| | | | | | | |||||
* | | | | | | Merge pull request #5134 from owncloud/trashbin-homeiconbroken | Vincent Petry | 2013-10-09 | 1 | -3/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Do not call changeDirectory() when no dir set on breadcrumb | ||||
| * | | | | | | Do not call changeDirectory() when no dir set on breadcrumb | Vincent Petry | 2013-10-04 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some apps like the files_trashbin app do not set a directory on its "home" breadcrumb link. This fix makes sure that the click event doesn't do anything in that case and lets the browser open the link. This fixes the "home" icon in the trashbin app which now correctly reopens the files app. | ||||
* | | | | | | | Merge pull request #5230 from owncloud/trashbin_fixes | Björn Schießle | 2013-10-09 | 3 | -149/+128 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Trashbin fixes | ||||
| * | | | | | | | update file summary after group delete/restore | Bjoern Schiessle | 2013-10-09 | 1 | -0/+2 |
| | | | | | | | | |||||
| * | | | | | | | fix checkbox | Bjoern Schiessle | 2013-10-09 | 1 | -37/+15 |
| | | | | | | | |