summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #19404 from owncloud/files-sidebar-sorttabsThomas Müller2015-09-286-3/+31
|\ | | | | Fix tabs order in files sidebar
| * Fix tabs order in files sidebarVincent Petry2015-09-286-3/+31
| |
* | Merge pull request #19402 from owncloud/public-recognizeauthsessionThomas Müller2015-09-281-1/+4
|\ \ | | | | | | Allow public webdav auth to recognize sesssion
| * | Allow public auth to recognize sesssionVincent Petry2015-09-281-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-actionsorderThomas Müller2015-09-284-0/+50
|\ \ | | | | | | Fix order of actions in the files actions menu
| * | Fix order of actions in the files actions menuVincent Petry2015-09-284-0/+50
| |/
* | Merge pull request #18469 from owncloud/ldap-batch-read-attrs-ngThomas Müller2015-09-2810-101/+516
|\ \ | | | | | | read all relevant user attributes on login and user search, in one qu…
| * | do not throw exception when no attribute is specifiedArthur Schiwon2015-09-232-1/+107
| | |
| * | adjust to nested group fixArthur Schiwon2015-09-231-1/+6
| | |
| * | read all relevant user attributes on login and user search, in one query. ↵Arthur Schiwon2015-09-239-100/+404
| | | | | | | | | | | | saves us some.
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-28254-214/+1202
| |/ |/|
* | Merge pull request #19379 from owncloud/remove-auth-button-borderThomas Müller2015-09-281-1/+2
|\ \ | | | | | | remove border around button of password protected link confirmation
| * | remove border around button of password protected link confirmationJan-Christoph Borchardt2015-09-281-1/+2
| | |
* | | Merge pull request #19395 from owncloud/15037-universal-shebangThomas Müller2015-09-2812-12/+12
|\ \ \ | | | | | | | | Use a universal shebang
| * | | Use a universal shebangOlivier Paroz2015-09-2712-12/+12
| |/ / | | | | | | | | | Fixes #15037
* / / Switch from Math.floor() to Math.ceil() when sending the dimension to PreviewOlivier Paroz2015-09-272-6/+6
|/ / | | | | | | Fixes #18203
* | fix sidebar spinnerHendrik Leppelsack2015-09-251-1/+5
| |
* | Reflect enabled shareAPI in capabilitiesRoeland Jago Douma2015-09-252-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-objectThomas Müller2015-09-252-0/+2
|\ \ | | | | | | Move the filtering of sensitive data to the config class
| * | Add the method to the mockJoas Schilling2015-09-252-0/+2
| | |
* | | Merge pull request #13145 from owncloud/issue/11951-activity-sharing-emailThomas Müller2015-09-251-0/+8
|\ \ \ | |/ / |/| | Publish an activity when sending a share link via email
| * | Publish an activity when sending a share link via emailJoas Schilling2015-09-221-0/+8
| | |
* | | fix filecomparatorHendrik Leppelsack2015-09-251-2/+2
| | |
* | | fix filelist checkboxesHendrik Leppelsack2015-09-253-4/+4
| | |
* | | Merge pull request #15098 from owncloud/fix_preview_versions_revert_issueThomas Müller2015-09-242-0/+40
|\ \ \ | | | | | | | | fix issue with version rollback and thumbnails
| * | | delete cached preview when rolling back file's versionGeorg Ehrke2015-09-202-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_masterThomas Müller2015-09-241-11/+13
|\ \ \ \ | | | | | | | | | | Fix preview of old file on public upload conflicts
| * | | | Fix preview of old file on public upload conflictsOlivier Paroz2015-09-201-11/+13
| |/ / /
* | | | Merge pull request #18834 from owncloud/delay-listen-owner-changesThomas Müller2015-09-242-2/+22
|\ \ \ \ | | | | | | | | | | Delay listening to owner changes untill we use a share for that owner
| * | | | only initialize onceRobin Appelman2015-09-231-0/+6
| | | | |
| * | | | Delay listening to owner changes untill we use a share for that ownerRobin Appelman2015-09-232-2/+16
| | |_|/ | |/| |
* | | | Merge pull request #19341 from owncloud/enc_all_improved_messagesThomas Müller2015-09-241-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-pairBjoern Schiessle2015-09-241-0/+6
| | | | |
* | | | | LDAP Wizard: enable/disable test login name button depending on whether a ↵Arthur Schiwon2015-09-242-2/+13
|/ / / / | | | | | | | | | | | | login name is provided or not
* | | | Merge pull request #19313 from owncloud/ext-validate-mountThomas Müller2015-09-2415-40/+143
|\ \ \ \ | | | | | | | | | | Validate storage backend and auth mechanism before mounting
| * | | | Unit tests for storage validation in serviceRobin McCorkell2015-09-232-0/+56
| | | | |
| * | | | Perform visibility checks on storagesRobin McCorkell2015-09-2314-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-resizeThomas Müller2015-09-242-5/+9
|\ \ \ \ | | | | | | | | | | adjust the height of the sidebar preview image when resizing the browser
| * | | | Merge branch 'master' into large-sidebar-preview-resizeMorris Jobke2015-09-2419-243/+253
| |\| | |
| * | | | adjust the height of the sidebar preview image when resizing the browserRobin Appelman2015-09-232-5/+9
| | | | |
* | | | | Merge pull request #18352 from owncloud/ocs_api_sharees_autocomplete_blockerThomas Müller2015-09-242-49/+409
|\ \ \ \ \ | |_|/ / / |/| | | | Implement the autocomplete blocker from #18341 into the OCS endpoint
| * | | | Do not allow user enumeration if the config is disabledJoas Schilling2015-09-232-49/+409
| |/ / /
* | | | Mark SMB_OC and SFTP_Key as deprecated backendsRobin McCorkell2015-09-232-4/+8
| | | |
* | | | Hide deprecated backends in external storage GUIRobin McCorkell2015-09-232-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 IdentifierTraitRobin McCorkell2015-09-233-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 McCorkell2015-09-2317-237/+190
|/ / / | | | | | | | | | | | | | | | This reverts commit 0b97a05e7bd631d66de1c2aee115113ada8a5f63. This reverts commit d2e3c17c0000bc0020f1ff641190452f370434de. This reverts commit cc88c5f4b84da57c425cbdb7dc8b391b1942b503.
* | | Merge pull request #19236 from owncloud/call_dot_directories_functionThomas Müller2015-09-233-4/+4
|\ \ \ | | | | | | | | Replaces if ($file === '.' || $file === '..') by public function call isIgnoredDir
| * | | Replaces if ($file === '.' || $file === '..') by ↵Martin2015-09-223-4/+4
| | | | | | | | | | | | | | | | if(\OC\Files\Filesystem::isIgnoredDir($file)). Eases to find where this operation is used.
* | | | Merge pull request #19277 from owncloud/files-plusbuttonfixThomas Müller2015-09-231-3/+4
|\ \ \ \ | | | | | | | | | | Only render the plus button when it makes sense
| * | | | Only render the plus button when it makes senseVincent Petry2015-09-221-3/+4
| |/ / /