summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #18369 from owncloud/occ-logMorris Jobke2015-08-206-4/+605
|\
| * Unit tests for occ log:* commandsRobin McCorkell2015-08-192-0/+302
| * config.sample.php logging documentation clarificationRobin McCorkell2015-08-191-4/+5
| * Introduce occ command to manage owncloud log backendRobin McCorkell2015-08-192-0/+125
| * Introduce occ command for logging managementRobin McCorkell2015-08-192-0/+173
* | Merge pull request #18437 from owncloud/ext-auth-triggerVincent Petry2015-08-201-0/+9
|\ \
| * | Trigger storage recheck on auth mechanism changeRobin McCorkell2015-08-191-0/+9
* | | Merge pull request #17434 from owncloud/update-showappnameonappupdateMorris Jobke2015-08-205-24/+199
|\ \ \
| * | | Additions to update pageVincent Petry2015-08-205-15/+27
| * | | Display app names in update page for app updatesVincent Petry2015-08-194-21/+184
* | | | Merge pull request #18447 from owncloud/ext-fix-empty-varMorris Jobke2015-08-201-2/+2
|\ \ \ \
| * | | | Don't use `empty()` with a return value, PHP 5.4Robin McCorkell2015-08-201-2/+2
* | | | | Merge pull request #18438 from owncloud/ext-session-fixVincent Petry2015-08-201-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix 'Declaration of SessionStorageWrapper::__construct()...'Robin McCorkell2015-08-191-1/+1
| | |/ / | |/| |
* | | | Merge pull request #18403 from owncloud/do-not-delete-group-if-emptyMorris Jobke2015-08-193-14/+2
|\ \ \ \ | |/ / / |/| | |
| * | | do not remove empty group in gui by jsmichag862015-08-191-11/+0
| * | | hide delete icon on group for subadminsmichag862015-08-181-0/+2
| * | | do not remove group if it is emptymichag862015-08-181-3/+0
* | | | Merge pull request #18432 from owncloud/ext-backends.simpleMorris Jobke2015-08-1915-105/+505
|\ \ \ \
| * | | | Migrate SFTP external storage to new APIRobin McCorkell2015-08-193-11/+51
| * | | | Migrate OwnCloud external storage to new APIRobin McCorkell2015-08-193-13/+53
| * | | | Migrate DAV external storage to new APIRobin McCorkell2015-08-193-13/+54
| * | | | Migrate SMB external storage to new APIRobin McCorkell2015-08-193-13/+58
| * | | | Migrate FTP external storage to new APIRobin McCorkell2015-08-193-13/+54
| * | | | Migrate Local external storage to new APIRobin McCorkell2015-08-193-14/+53
| * | | | Revert "Fix mounting wrapped storages resulting in many-layered wrapping"Robin McCorkell2015-08-192-27/+1
| * | | | Allow builtin auth mechanism to be overriddenRobin McCorkell2015-08-191-1/+1
| * | | | Implement password authentication mechanismsRobin McCorkell2015-08-195-0/+180
* | | | | Merge pull request #18433 from owncloud/get-mountpoints-returnRobin Appelman2015-08-191-0/+4
|\ \ \ \ \
| * | | | | add missing return statements in getSystem/getPersonalMountPointsRobin Appelman2015-08-191-0/+4
| |/ / / /
* | | | | Merge pull request #18427 from owncloud/fix-format-ocsThomas Müller2015-08-191-1/+2
|\ \ \ \ \
| * | | | | Fix format of log/private/ocs.phpMorris Jobke2015-08-191-1/+2
* | | | | | Merge pull request #18430 from owncloud/add-warning-ca-bundleMorris Jobke2015-08-191-0/+7
|\ \ \ \ \ \
| * | | | | | Add warning for not existing CA bundle when updatingLukas Reschke2015-08-191-0/+7
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #18424 from owncloud/filter-objectstore-password-from-conf...Morris Jobke2015-08-192-10/+52
|\ \ \ \ \ \
| * | | | | | Filter the objectstore password from the config list as wellJoas Schilling2015-08-192-10/+52
* | | | | | | Merge pull request #18114 from owncloud/fix-delete-user-feedbackMorris Jobke2015-08-192-12/+35
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | fixing the unit testsMorris Jobke2015-08-171-2/+25
| * | | | | | [user mgnt] fix delete user feedback on failureMorris Jobke2015-08-071-10/+10
* | | | | | | Merge pull request #18378 from owncloud/files-delete-spinnerVincent Petry2015-08-191-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix spinner when deleting all files in a folderVincent Petry2015-08-181-2/+2
* | | | | | | | Merge pull request #18354 from owncloud/files-fixdndVincent Petry2015-08-192-2/+7
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Fix file drag and drop JS errorVincent Petry2015-08-172-2/+7
* | | | | | | | Merge pull request #15914 from owncloud/ext-backend-registerMorris Jobke2015-08-1955-2193/+4245
|\ \ \ \ \ \ \ \
| * | | | | | | | Restrict Local backend to admin-onlyRobin McCorkell2015-08-191-0/+4
| * | | | | | | | Load custom JS for all backends/auth mechanismsRobin McCorkell2015-08-194-16/+30
| * | | | | | | | Propagate auth mechanism/backend failures to filesystem layerRobin McCorkell2015-08-198-28/+298
| * | | | | | | | Make Application a singletonRobin McCorkell2015-08-196-32/+25
| * | | | | | | | Compatibility shims for OC_Mount_ConfigRobin McCorkell2015-08-198-1603/+232
| * | | | | | | | Unit tests for new backend APIRobin McCorkell2015-08-1911-0/+977