summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #18395 from owncloud/hide-empty-security-warningRobin McCorkell2015-08-213-0/+12
|\
| * add success messageMorris Jobke2015-08-213-1/+9
| * [admin settings] hide security warnings if emptyMorris Jobke2015-08-181-0/+4
* | Merge pull request #18456 from owncloud/fix-unrelated-cron-errorsThomas Müller2015-08-211-0/+2
|\ \
| * | Clear cron errors on change of background job modeMorris Jobke2015-08-201-0/+2
* | | Merge pull request #18471 from hasso/shorts-fixVincent Petry2015-08-213-3/+73
|\ \ \
| * | | Make short versions of weekday/month names translatableHasso Tepper2015-08-213-3/+73
* | | | Merge pull request #18426 from owncloud/joblist-next-non-existingMorris Jobke2015-08-212-2/+41
|\ \ \ \
| * | | | handle non existing job classes in $jobList->getNextRobin Appelman2015-08-192-2/+41
* | | | | Merge pull request #18468 from owncloud/sharing_availability_fixMorris Jobke2015-08-212-0/+26
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add availability methods to files_external FailedStorageRobin McCorkell2015-08-201-0/+8
| * | | | Prevent shares being added to oc_storages via availabilityRobin McCorkell2015-08-201-0/+18
* | | | | Merge pull request #18457 from owncloud/test-traitsRobin McCorkell2015-08-204-44/+127
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | add test mountprovider logic to a traitRobin Appelman2015-08-202-31/+60
| * | | | allow moving common test logic into traitsRobin Appelman2015-08-203-14/+68
* | | | | Merge pull request #18459 from owncloud/files-detailtabview-namespaceThomas Müller2015-08-201-0/+2
|\ \ \ \ \
| * | | | | Add namespace in case the file is loaded individuallyVincent Petry2015-08-201-0/+2
|/ / / / /
* | | | | Merge pull request #18372 from owncloud/issue-18358-object-type-and-id-for-ac...Joas Schilling2015-08-207-82/+813
|\ \ \ \ \
| * | | | | Expand the doc blocks on the new methodsJoas Schilling2015-08-202-0/+32
| * | | | | Remove unnecessary codeJoas Schilling2015-08-201-7/+0
| * | | | | Add test coverage for Activity Event and ManagerJoas Schilling2015-08-202-7/+202
| * | | | | Use an IEvent object instead of a huge parameter listJoas Schilling2015-08-196-48/+549
| * | | | | Send the file id when dealing with remote share responsesJoas Schilling2015-08-191-2/+2
| * | | | | Extend the interfaces IManager and IConsumer to allow passing in the objectJoas Schilling2015-08-193-61/+71
* | | | | | Merge pull request #18453 from owncloud/update-wordingRobin McCorkell2015-08-201-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | fix wording of update headerJan-Christoph Borchardt2015-08-201-2/+2
* | | | | | Merge pull request #18408 from owncloud/ext-ocpRobin McCorkell2015-08-2012-32/+46
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Use OCP classes as much as possible in files_externalRobin McCorkell2015-08-1912-32/+46
* | | | | | Merge pull request #18380 from owncloud/files-sidebar-selectbarRobin McCorkell2015-08-201-0/+5
|\ \ \ \ \ \
| * | | | | | Fix files select bar width when app sidebar is visibleVincent Petry2015-08-181-0/+5
* | | | | | | Merge pull request #18439 from owncloud/fix-appmanagement-installMorris Jobke2015-08-201-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | [app management] fix dependency check on installMorris Jobke2015-08-191-1/+1
* | | | | | | 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