summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use DIRoeland Jago Douma2015-08-1012-93/+44
* Move core capabilities to new classRoeland Jago Douma2015-08-103-11/+65
* Moved core apps to the capabilities managerRoeland Jago Douma2015-08-1015-86/+179
* Added Capabilities ManagerRoeland Jago Douma2015-08-108-2/+354
* Merge pull request #14779 from owncloud/use-iterator-directoryRobin McCorkell2015-08-078-18/+16
|\
| * Use the new IteratorDirectory instead of the fakedir wrapperRobin Appelman2015-07-158-18/+16
* | Merge pull request #18124 from owncloud/share-permwrongvarMorris Jobke2015-08-072-4/+61
|\ \
| * | Fix removal of share permissions when share disabled for userVincent Petry2015-08-072-4/+61
* | | Merge pull request #18125 from owncloud/filelist-emptycontentduringmaskJan-Christoph Borchardt2015-08-071-0/+1
|\ \ \
| * | | Make sure to hide empty content message when mask is shownVincent Petry2015-08-071-0/+1
| |/ /
* | | Merge pull request #18120 from owncloud/appframework-isessioLukas Reschke2015-08-071-0/+4
|\ \ \
| * | | Add \OCP\ISession to AppFrameworkRobin McCorkell2015-08-071-0/+4
* | | | Merge pull request #13949 from rullzer/no_negative_expireVincent Petry2015-08-071-0/+7
|\ \ \ \
| * | | | Do not allow invalid default expire daysRoeland Jago Douma2015-07-041-0/+7
* | | | | Merge pull request #13641 from owncloud/cache-storage-statusVincent Petry2015-08-0711-13/+763
|\ \ \ \ \
| * | | | | Fix mounting wrapped storages resulting in many-layered wrappingRobin McCorkell2015-07-202-1/+27
| * | | | | Store storage availability in databaseRobin McCorkell2015-07-2010-13/+737
* | | | | | Merge pull request #18118 from owncloud/allow-ocs-to-send-headersThomas Müller2015-08-072-1/+48
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Adding header support to class OC_OCS_ResultThomas Müller2015-08-072-1/+48
|/ / / / /
* | | | | Merge pull request #18083 from owncloud/user-search-boxJan-Christoph Borchardt2015-08-074-45/+29
|\ \ \ \ \
| * | | | | use the main search box to filter users in user managementRobin Appelman2015-08-054-45/+29
* | | | | | Merge pull request #18091 from owncloud/add-backbonejsblizzz2015-08-077-1/+1947
|\ \ \ \ \ \
| * | | | | | load backbone universallyArthur Schiwon2015-08-064-7/+2
| * | | | | | make available as OC.Backbone to avoid conflictsArthur Schiwon2015-08-062-0/+17
| * | | | | | adjust gitignore for backbone.jsArthur Schiwon2015-08-063-3/+3
| * | | | | | files and sharing will require backbonejsArthur Schiwon2015-08-062-0/+2
| * | | | | | add backbone.jsArthur Schiwon2015-08-066-1/+1933
* | | | | | | Merge pull request #17680 from owncloud/ftp-rmdir-fileVincent Petry2015-08-061-1/+4
|\ \ \ \ \ \ \
| * | | | | | | handle rmdir on files for ftp storagesRobin Appelman2015-07-161-1/+4
* | | | | | | | Merge pull request #18106 from owncloud/enc-jsnamespaceconflictBjörn Schießle2015-08-062-12/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix namespace conflict in OC.Encryption JS codeVincent Petry2015-08-062-12/+4
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #18030 from owncloud/dav-upload-updaterVincent Petry2015-08-061-2/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | go trough the updater when uploading over webdavRobin Appelman2015-08-031-2/+1
* | | | | | | | Merge pull request #18082 from owncloud/share-group-conflictVincent Petry2015-08-064-23/+50
|\ \ \ \ \ \ \ \
| * | | | | | | | just pass the share instead of searching for itRobin Appelman2015-08-053-23/+11
| * | | | | | | | add unit tests for share target conflict with group sharesRobin Appelman2015-08-051-0/+39
* | | | | | | | | Merge pull request #16961 from owncloud/hardening-ldapJörn Friedrich Dreyer2015-08-063-1/+191
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | integration tests for hardening user home retrievalArthur Schiwon2015-08-061-0/+159
| * | | | | | | | | Only throw exception if on new LDAP setupsMorris Jobke2015-07-292-2/+30
| * | | | | | | | | Hardening home folder retrieval in user_ldapMorris Jobke2015-07-291-1/+4
* | | | | | | | | | Merge pull request #17810 from owncloud/better-enc-warningsBernhard Posselt2015-08-062-3/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | condense doc warnings into small section that gets showed to the user before ...Bernhard Posselt2015-07-222-3/+16
* | | | | | | | | | | Merge pull request #18084 from owncloud/ocs-anything-other-then-100-means-fai...Thomas Müller2015-08-052-6/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Following the spec:Thomas Müller2015-08-052-6/+2
* | | | | | | | | | | Merge pull request #18077 from owncloud/fix_18055Morris Jobke2015-08-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Set proper mimetype for directoriesRoeland Jago Douma2015-08-051-1/+1
* | | | | | | | | | | Merge pull request #18035 from owncloud/ocs-2.0Bernhard Posselt2015-08-0510-203/+211
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Return 200 not null - we should return consistent typesThomas Müller2015-08-052-1/+4
| * | | | | | | | | | | Fix unit test within OCSControllerThomas Müller2015-08-032-6/+9
| * | | | | | | | | | | Remove duplicate and unused codeThomas Müller2015-08-035-175/+42