Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #19404 from owncloud/files-sidebar-sorttabs | Thomas Müller | 2015-09-28 | 6 | -3/+31 |
|\ | | | | | Fix tabs order in files sidebar | ||||
| * | Fix tabs order in files sidebar | Vincent Petry | 2015-09-28 | 6 | -3/+31 |
| | | |||||
* | | Merge pull request #19402 from owncloud/public-recognizeauthsession | Thomas Müller | 2015-09-28 | 1 | -1/+4 |
|\ \ | | | | | | | Allow public webdav auth to recognize sesssion | ||||
| * | | Allow public auth to recognize sesssion | Vincent Petry | 2015-09-28 | 1 | -1/+4 |
| |/ | | | | | | | | | | | | | When a public link password has been input, its auth is stored in the session. This fix makes it possible to recognize the session when using public webdav from the files UI. | ||||
* | | Merge pull request #19401 from owncloud/files-actionsorder | Thomas Müller | 2015-09-28 | 4 | -0/+50 |
|\ \ | | | | | | | Fix order of actions in the files actions menu | ||||
| * | | Fix order of actions in the files actions menu | Vincent Petry | 2015-09-28 | 4 | -0/+50 |
| |/ | |||||
* | | Merge pull request #18469 from owncloud/ldap-batch-read-attrs-ng | Thomas Müller | 2015-09-28 | 10 | -101/+516 |
|\ \ | | | | | | | read all relevant user attributes on login and user search, in one qu… | ||||
| * | | do not throw exception when no attribute is specified | Arthur Schiwon | 2015-09-23 | 2 | -1/+107 |
| | | | |||||
| * | | adjust to nested group fix | Arthur Schiwon | 2015-09-23 | 1 | -1/+6 |
| | | | |||||
| * | | read all relevant user attributes on login and user search, in one query. ↵ | Arthur Schiwon | 2015-09-23 | 9 | -100/+404 |
| | | | | | | | | | | | | saves us some. | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-28 | 254 | -214/+1202 |
| |/ |/| | |||||
* | | Merge pull request #19379 from owncloud/remove-auth-button-border | Thomas Müller | 2015-09-28 | 1 | -1/+2 |
|\ \ | | | | | | | remove border around button of password protected link confirmation | ||||
| * | | remove border around button of password protected link confirmation | Jan-Christoph Borchardt | 2015-09-28 | 1 | -1/+2 |
| | | | |||||
* | | | Merge pull request #19395 from owncloud/15037-universal-shebang | Thomas Müller | 2015-09-28 | 12 | -12/+12 |
|\ \ \ | | | | | | | | | Use a universal shebang | ||||
| * | | | Use a universal shebang | Olivier Paroz | 2015-09-27 | 12 | -12/+12 |
| |/ / | | | | | | | | | | Fixes #15037 | ||||
* / / | Switch from Math.floor() to Math.ceil() when sending the dimension to Preview | Olivier Paroz | 2015-09-27 | 2 | -6/+6 |
|/ / | | | | | | | Fixes #18203 | ||||
* | | fix sidebar spinner | Hendrik Leppelsack | 2015-09-25 | 1 | -1/+5 |
| | | |||||
* | | Reflect enabled shareAPI in capabilities | Roeland Jago Douma | 2015-09-25 | 2 | -17/+62 |
| | | | | | | | | | | | | | | If the shareAPI is disabled we not return the other sharing capabilities. This allows clients to properly check if sharing is even available. | ||||
* | | Merge pull request #19360 from owncloud/move-filter-method-into-config-object | Thomas Müller | 2015-09-25 | 2 | -0/+2 |
|\ \ | | | | | | | Move the filtering of sensitive data to the config class | ||||
| * | | Add the method to the mock | Joas Schilling | 2015-09-25 | 2 | -0/+2 |
| | | | |||||
* | | | Merge pull request #13145 from owncloud/issue/11951-activity-sharing-email | Thomas Müller | 2015-09-25 | 1 | -0/+8 |
|\ \ \ | |/ / |/| | | Publish an activity when sending a share link via email | ||||
| * | | Publish an activity when sending a share link via email | Joas Schilling | 2015-09-22 | 1 | -0/+8 |
| | | | |||||
* | | | fix filecomparator | Hendrik Leppelsack | 2015-09-25 | 1 | -2/+2 |
| | | | |||||
* | | | fix filelist checkboxes | Hendrik Leppelsack | 2015-09-25 | 3 | -4/+4 |
| | | | |||||
* | | | Merge pull request #15098 from owncloud/fix_preview_versions_revert_issue | Thomas Müller | 2015-09-24 | 2 | -0/+40 |
|\ \ \ | | | | | | | | | fix issue with version rollback and thumbnails | ||||
| * | | | delete cached preview when rolling back file's version | Georg Ehrke | 2015-09-20 | 2 | -0/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add random number using OC.parseQueryString and _.extend() version rollback: add missing prefix to OC\Preview::post_delete add test to assure that the rollback hook is called | ||||
* | | | | Merge pull request #18517 from owncloud/17753_to_master | Thomas Müller | 2015-09-24 | 1 | -11/+13 |
|\ \ \ \ | | | | | | | | | | | Fix preview of old file on public upload conflicts | ||||
| * | | | | Fix preview of old file on public upload conflicts | Olivier Paroz | 2015-09-20 | 1 | -11/+13 |
| |/ / / | |||||
* | | | | Merge pull request #18834 from owncloud/delay-listen-owner-changes | Thomas Müller | 2015-09-24 | 2 | -2/+22 |
|\ \ \ \ | | | | | | | | | | | Delay listening to owner changes untill we use a share for that owner | ||||
| * | | | | only initialize once | Robin Appelman | 2015-09-23 | 1 | -0/+6 |
| | | | | | |||||
| * | | | | Delay listening to owner changes untill we use a share for that owner | Robin Appelman | 2015-09-23 | 2 | -2/+16 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #19341 from owncloud/enc_all_improved_messages | Thomas Müller | 2015-09-24 | 1 | -0/+6 |
|\ \ \ \ | | | | | | | | | | | no need to list users if all users already had a key-pair | ||||
| * | | | | no need to list users if all users already had a key-pair | Bjoern Schiessle | 2015-09-24 | 1 | -0/+6 |
| | | | | | |||||
* | | | | | LDAP Wizard: enable/disable test login name button depending on whether a ↵ | Arthur Schiwon | 2015-09-24 | 2 | -2/+13 |
|/ / / / | | | | | | | | | | | | | login name is provided or not | ||||
* | | | | Merge pull request #19313 from owncloud/ext-validate-mount | Thomas Müller | 2015-09-24 | 15 | -40/+143 |
|\ \ \ \ | | | | | | | | | | | Validate storage backend and auth mechanism before mounting | ||||
| * | | | | Unit tests for storage validation in service | Robin McCorkell | 2015-09-23 | 2 | -0/+56 |
| | | | | | |||||
| * | | | | Perform visibility checks on storages | Robin McCorkell | 2015-09-23 | 14 | -40/+87 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | StoragesService::getStorages() will check the visibility of the backend and auth mechanism for the storage, and if either are not visible to the user (aka disabled by admin) then the storage will be filtered out. The original method StoragesService::getAllStorages() still exists in case such storages need to be detected, but its use is discouraged. | ||||
* | | | | Merge pull request #19307 from owncloud/large-sidebar-preview-resize | Thomas Müller | 2015-09-24 | 2 | -5/+9 |
|\ \ \ \ | | | | | | | | | | | adjust the height of the sidebar preview image when resizing the browser | ||||
| * | | | | Merge branch 'master' into large-sidebar-preview-resize | Morris Jobke | 2015-09-24 | 19 | -243/+253 |
| |\| | | | |||||
| * | | | | adjust the height of the sidebar preview image when resizing the browser | Robin Appelman | 2015-09-23 | 2 | -5/+9 |
| | | | | | |||||
* | | | | | Merge pull request #18352 from owncloud/ocs_api_sharees_autocomplete_blocker | Thomas Müller | 2015-09-24 | 2 | -49/+409 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Implement the autocomplete blocker from #18341 into the OCS endpoint | ||||
| * | | | | Do not allow user enumeration if the config is disabled | Joas Schilling | 2015-09-23 | 2 | -49/+409 |
| |/ / / | |||||
* | | | | Mark SMB_OC and SFTP_Key as deprecated backends | Robin McCorkell | 2015-09-23 | 2 | -4/+8 |
| | | | | |||||
* | | | | Hide deprecated backends in external storage GUI | Robin McCorkell | 2015-09-23 | 2 | -3/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | Selecting/deselecting the deprecate-to backends in the user mountable storages selection will also change the corresponding deprecated backend. | ||||
* | | | | Add deprecation mechanic to IdentifierTrait | Robin McCorkell | 2015-09-23 | 3 | -0/+37 |
| | | | | | | | | | | | | | | | | | | | | Deprecation allows a backend/auth mechanism to designate an object that it deprecates to, allowing clean transitions to updated codebases. | ||||
* | | | | Revert "Implement more fine-grained external storage permissions model" | Robin McCorkell | 2015-09-23 | 17 | -237/+190 |
|/ / / | | | | | | | | | | | | | | | | This reverts commit 0b97a05e7bd631d66de1c2aee115113ada8a5f63. This reverts commit d2e3c17c0000bc0020f1ff641190452f370434de. This reverts commit cc88c5f4b84da57c425cbdb7dc8b391b1942b503. | ||||
* | | | Merge pull request #19236 from owncloud/call_dot_directories_function | Thomas Müller | 2015-09-23 | 3 | -4/+4 |
|\ \ \ | | | | | | | | | Replaces if ($file === '.' || $file === '..') by public function call isIgnoredDir | ||||
| * | | | Replaces if ($file === '.' || $file === '..') by ↵ | Martin | 2015-09-22 | 3 | -4/+4 |
| | | | | | | | | | | | | | | | | if(\OC\Files\Filesystem::isIgnoredDir($file)). Eases to find where this operation is used. | ||||
* | | | | Merge pull request #19277 from owncloud/files-plusbuttonfix | Thomas Müller | 2015-09-23 | 1 | -3/+4 |
|\ \ \ \ | | | | | | | | | | | Only render the plus button when it makes sense | ||||
| * | | | | Only render the plus button when it makes sense | Vincent Petry | 2015-09-22 | 1 | -3/+4 |
| |/ / / |