Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use DI | Roeland Jago Douma | 2015-08-10 | 12 | -93/+44 |
* | Move core capabilities to new class | Roeland Jago Douma | 2015-08-10 | 3 | -11/+65 |
* | Moved core apps to the capabilities manager | Roeland Jago Douma | 2015-08-10 | 15 | -86/+179 |
* | Added Capabilities Manager | Roeland Jago Douma | 2015-08-10 | 8 | -2/+354 |
* | Merge pull request #14779 from owncloud/use-iterator-directory | Robin McCorkell | 2015-08-07 | 8 | -18/+16 |
|\ | |||||
| * | Use the new IteratorDirectory instead of the fakedir wrapper | Robin Appelman | 2015-07-15 | 8 | -18/+16 |
* | | Merge pull request #18124 from owncloud/share-permwrongvar | Morris Jobke | 2015-08-07 | 2 | -4/+61 |
|\ \ | |||||
| * | | Fix removal of share permissions when share disabled for user | Vincent Petry | 2015-08-07 | 2 | -4/+61 |
* | | | Merge pull request #18125 from owncloud/filelist-emptycontentduringmask | Jan-Christoph Borchardt | 2015-08-07 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Make sure to hide empty content message when mask is shown | Vincent Petry | 2015-08-07 | 1 | -0/+1 |
| |/ / | |||||
* | | | Merge pull request #18120 from owncloud/appframework-isessio | Lukas Reschke | 2015-08-07 | 1 | -0/+4 |
|\ \ \ | |||||
| * | | | Add \OCP\ISession to AppFramework | Robin McCorkell | 2015-08-07 | 1 | -0/+4 |
* | | | | Merge pull request #13949 from rullzer/no_negative_expire | Vincent Petry | 2015-08-07 | 1 | -0/+7 |
|\ \ \ \ | |||||
| * | | | | Do not allow invalid default expire days | Roeland Jago Douma | 2015-07-04 | 1 | -0/+7 |
* | | | | | Merge pull request #13641 from owncloud/cache-storage-status | Vincent Petry | 2015-08-07 | 11 | -13/+763 |
|\ \ \ \ \ | |||||
| * | | | | | Fix mounting wrapped storages resulting in many-layered wrapping | Robin McCorkell | 2015-07-20 | 2 | -1/+27 |
| * | | | | | Store storage availability in database | Robin McCorkell | 2015-07-20 | 10 | -13/+737 |
* | | | | | | Merge pull request #18118 from owncloud/allow-ocs-to-send-headers | Thomas Müller | 2015-08-07 | 2 | -1/+48 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Adding header support to class OC_OCS_Result | Thomas Müller | 2015-08-07 | 2 | -1/+48 |
|/ / / / / | |||||
* | | | | | Merge pull request #18083 from owncloud/user-search-box | Jan-Christoph Borchardt | 2015-08-07 | 4 | -45/+29 |
|\ \ \ \ \ | |||||
| * | | | | | use the main search box to filter users in user management | Robin Appelman | 2015-08-05 | 4 | -45/+29 |
* | | | | | | Merge pull request #18091 from owncloud/add-backbonejs | blizzz | 2015-08-07 | 7 | -1/+1947 |
|\ \ \ \ \ \ | |||||
| * | | | | | | load backbone universally | Arthur Schiwon | 2015-08-06 | 4 | -7/+2 |
| * | | | | | | make available as OC.Backbone to avoid conflicts | Arthur Schiwon | 2015-08-06 | 2 | -0/+17 |
| * | | | | | | adjust gitignore for backbone.js | Arthur Schiwon | 2015-08-06 | 3 | -3/+3 |
| * | | | | | | files and sharing will require backbonejs | Arthur Schiwon | 2015-08-06 | 2 | -0/+2 |
| * | | | | | | add backbone.js | Arthur Schiwon | 2015-08-06 | 6 | -1/+1933 |
* | | | | | | | Merge pull request #17680 from owncloud/ftp-rmdir-file | Vincent Petry | 2015-08-06 | 1 | -1/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | handle rmdir on files for ftp storages | Robin Appelman | 2015-07-16 | 1 | -1/+4 |
* | | | | | | | | Merge pull request #18106 from owncloud/enc-jsnamespaceconflict | Björn Schießle | 2015-08-06 | 2 | -12/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix namespace conflict in OC.Encryption JS code | Vincent Petry | 2015-08-06 | 2 | -12/+4 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #18030 from owncloud/dav-upload-updater | Vincent Petry | 2015-08-06 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | go trough the updater when uploading over webdav | Robin Appelman | 2015-08-03 | 1 | -2/+1 |
* | | | | | | | | Merge pull request #18082 from owncloud/share-group-conflict | Vincent Petry | 2015-08-06 | 4 | -23/+50 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | just pass the share instead of searching for it | Robin Appelman | 2015-08-05 | 3 | -23/+11 |
| * | | | | | | | | add unit tests for share target conflict with group shares | Robin Appelman | 2015-08-05 | 1 | -0/+39 |
* | | | | | | | | | Merge pull request #16961 from owncloud/hardening-ldap | Jörn Friedrich Dreyer | 2015-08-06 | 3 | -1/+191 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | integration tests for hardening user home retrieval | Arthur Schiwon | 2015-08-06 | 1 | -0/+159 |
| * | | | | | | | | | Only throw exception if on new LDAP setups | Morris Jobke | 2015-07-29 | 2 | -2/+30 |
| * | | | | | | | | | Hardening home folder retrieval in user_ldap | Morris Jobke | 2015-07-29 | 1 | -1/+4 |
* | | | | | | | | | | Merge pull request #17810 from owncloud/better-enc-warnings | Bernhard Posselt | 2015-08-06 | 2 | -3/+16 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | condense doc warnings into small section that gets showed to the user before ... | Bernhard Posselt | 2015-07-22 | 2 | -3/+16 |
* | | | | | | | | | | | Merge pull request #18084 from owncloud/ocs-anything-other-then-100-means-fai... | Thomas Müller | 2015-08-05 | 2 | -6/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Following the spec: | Thomas Müller | 2015-08-05 | 2 | -6/+2 |
* | | | | | | | | | | | Merge pull request #18077 from owncloud/fix_18055 | Morris Jobke | 2015-08-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Set proper mimetype for directories | Roeland Jago Douma | 2015-08-05 | 1 | -1/+1 |
* | | | | | | | | | | | Merge pull request #18035 from owncloud/ocs-2.0 | Bernhard Posselt | 2015-08-05 | 10 | -203/+211 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Return 200 not null - we should return consistent types | Thomas Müller | 2015-08-05 | 2 | -1/+4 |
| * | | | | | | | | | | | Fix unit test within OCSController | Thomas Müller | 2015-08-03 | 2 | -6/+9 |
| * | | | | | | | | | | | Remove duplicate and unused code | Thomas Müller | 2015-08-03 | 5 | -175/+42 |