summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* remove encryption keys if user unshares a fileBjoern Schiessle2014-06-064-4/+72
|
* remove share mountBjoern Schiessle2014-06-061-1/+4
|
* Fix folder name for storage rootRobin Appelman2014-06-062-2/+2
|
* don't allow to share single files with delete permissions, user should only ↵Bjoern Schiessle2014-06-068-130/+413
| | | | be possible to unshare a single file but never to delete it
* Fix the removeMount for personal mountsRobin Appelman2014-06-062-1/+4
|
* Add the removing logic for mountsRobin Appelman2014-06-061-5/+9
|
* Move shared mount moving from the storage to the mountRobin Appelman2014-06-062-122/+157
|
* Make personal external mount points (re)movable from the files appRobin Appelman2014-06-062-1/+72
|
* Don't do rename hooks for cache when moving the mountpointRobin Appelman2014-06-061-0/+4
|
* Add a system for (re)movable mount pointsRobin Appelman2014-06-064-28/+64
|
* Merge pull request #8877 from owncloud/getpath-storage-checkThomas Müller2014-06-061-8/+12
|\ | | | | Verify that we have a valid storage in View->getPath
| * Update PHPDocThomas Müller2014-06-061-1/+1
| |
| * Verify that we have a valid storage in View->getPathRobin Appelman2014-06-051-7/+11
| |
* | Merge pull request #8911 from owncloud/common-langJan-Christoph Borchardt2014-06-061-1/+1
|\ \ | | | | | | Add Turkish to common languages
| * | Add Turkish to common languagesVolkan Gezer2014-06-051-1/+1
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-06823-11672/+11384
|/ /
* | Merge pull request #8483 from owncloud/encryption_use_oc_preferencesThomas Müller2014-06-0514-183/+318
|\ \ | | | | | | [encryption] use oc preferences
| * | adding unit tests for encryption data migrationThomas Müller2014-06-054-14/+224
| | |
| * | use oc_preferences instead of oc_encryption to store encyption settingsBjoern Schiessle2014-06-059-184/+69
| | |
| * | allow to set pre-condition for setValueBjoern Schiessle2014-06-053-31/+71
| | |
* | | Merge pull request #8865 from owncloud/improve_share_settingsVincent Petry2014-06-057-28/+38
|\ \ \ | |/ / |/| | Improve share settings
| * | unify share settingsBjoern Schiessle2014-06-056-18/+32
| | |
| * | This settings doesn't belong togetherBjoern Schiessle2014-06-052-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "make reshare settings foldable" This reverts commit c01f196f723dcb3dea6947c821a70d4d80563bbd. Conflicts: settings/templates/admin.php
| * | improve share settings workingBjoern Schiessle2014-06-051-5/+2
| |/
* | Merge pull request #8893 from owncloud/feature/get-users-by-preferenceThomas Müller2014-06-052-0/+48
|\ \ | | | | | | Add method to get users by their preference
| * | Sort the result before comparingJoas Schilling2014-06-051-1/+3
| | |
| * | Hack around oracle for CLOB fieldsJoas Schilling2014-06-051-1/+9
| | |
| * | Add method to get users by their preferenceJoas Schilling2014-06-052-0/+38
| | |
* | | Merge pull request #8902 from owncloud/fix_ldap_typo_2Thomas Müller2014-06-051-1/+1
|\ \ \ | | | | | | | | fix typo in var name
| * | | fix typo in var nameArthur Schiwon2014-06-051-1/+1
|/ / /
* | | Merge pull request #8891 from owncloud/design-emptycontentjbtbnl2014-06-051-2/+1
|\ \ \ | |_|/ |/| | fix size and unbold empty content message
| * | fix size and unbold empty content messageJan-Christoph Borchardt2014-06-051-2/+1
| | |
* | | Merge pull request #8897 from owncloud/fix-multiselectJörn Friedrich Dreyer2014-06-051-1/+1
|\ \ \ | | | | | | | | fix files multiselect bar now that the app list is gone
| * | | fix files multiselect bar now that the app list is goneJan-Christoph Borchardt2014-06-051-1/+1
| | | |
* | | | Merge pull request #8529 from owncloud/remove-legacy-routingThomas Müller2014-06-056-62/+35
|\ \ \ \ | |/ / / |/| | | Remove legacy routing code
| * | | Move authentication to it's own callLukas Reschke2014-06-053-3/+6
| | | |
| * | | Remove legacy routing codeLukas Reschke2014-06-056-62/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The getfile routing code was absolutely legacy and not needed anymore. Additionally \OC::$REQUESTEDAPP was never set to the actually accessed application. This commit removes the legacy routing code and ensures that $REQUESTEDAPP is always set so that other applications (e.g. the firewall or a two-factor authentication) can intercept the currently accessed app. Testplan: [x] Installation works [x] Login with DB works [x] Logout works [x] Login with alternate backend works (tested with user_webdavauth) [x] Other apps are accessible [x] Redirect on login works (e.g. index.php?redirect_url=%2Fcore%2Findex.php%2Fsettings%2Fapps%3Finstalled) [x] Personal settings are accessible [x] Admin settings are accessible [x] Sharing files works [x] DAV works [x] OC::$REQUESTEDAPP contains the requested application and can be intercepted by other applications
* | | | Merge pull request #8889 from owncloud/mtime-reuseThomas Müller2014-06-052-2/+3
|\ \ \ \ | | | | | | | | | | Don't update the mtime if the storage mtime hasn't changed
| * | | | Fix uit testsRobin Appelman2014-06-051-2/+2
| | | | |
| * | | | Don't update the mtime if the storage mtime hasn't changedRobin Appelman2014-06-051-0/+1
| | | | |
* | | | | Merge pull request #8866 from owncloud/flock-quotafixVincent Petry2014-06-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fixed quota wrapper to return the value from flock()
| * | | | | Fixed quota wrapper to return the value from flock()Vincent Petry2014-06-041-1/+1
| | | | | |
* | | | | | Merge pull request #8894 from owncloud/public-share-js-overwriteThomas Müller2014-06-051-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Dont overwrite OCA.Sharing
| * | | | | | Dont overwrite OCA.SharingRobin Appelman2014-06-051-1/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #8890 from owncloud/cleanup-trashsizes-table-masterThomas Müller2014-06-052-33/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | table files_trashsizes was still used in some locations -> removed
| * | | | | table files_trashsizes was still used in some locations -> removedThomas Müller2014-06-052-33/+2
| | | | | |
* | | | | | Merge pull request #8880 from owncloud/webdav-read-permissionsThomas Müller2014-06-051-0/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use the permissions exposed by ownCloud for webdav external storages
| * | | | | | Use the permissions exposed by ownCloud for webdav external storagesRobin Appelman2014-06-041-0/+24
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #8883 from owncloud/files-slide-toggleJan-Christoph Borchardt2014-06-052-8/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | use slide toggle for files app
| * | | | | use slide toggle for files appBernhard Posselt2014-06-052-8/+2
| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-09 02:35:31 +0000