summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #14615 from kampka/cron-commandLukas Reschke2015-03-026-0/+237
|\
| * Allow configuring background job mode from the consoleChristian Kampka2015-03-026-0/+237
* | Adding dependency labelsThomas Müller2015-03-021-0/+6
* | Merge pull request #14633 from owncloud/issue/14627-maintenance-mode-message-...Thomas Müller2015-03-021-1/+1
|\ \
| * | Maintenance mode message might be misleadingJoas Schilling2015-03-021-1/+1
* | | Merge pull request #14573 from owncloud/enc-migrate-disable-updaterVincent Petry2015-03-024-14/+70
|\ \ \
| * | | Move keys instead of copy during encryption key migrationVincent Petry2015-02-271-2/+2
| * | | add some tests for disabled updaterRobin Appelman2015-02-271-0/+30
| * | | Disable the cache updater when doing the encryption migrationRobin Appelman2015-02-271-9/+15
| * | | Allow disabling the cache updaterRobin Appelman2015-02-272-3/+23
* | | | Merge pull request #14635 from owncloud/cleanup-config.sample.phpLukas Reschke2015-03-021-19/+20
|\ \ \ \
| * | | | fix link for Preview documentationMorris Jobke2015-03-021-2/+2
| * | | | fix line breaks in config.sample.phpMorris Jobke2015-03-021-17/+18
|/ / / /
* | | | Merge pull request #14608 from kampka/masterThomas Müller2015-03-021-0/+1
|\ \ \ \
| * | | | Don't swallow errors in console.phpChristian Kampka2015-02-281-0/+1
| | |_|/ | |/| |
* | | | Merge pull request #14535 from owncloud/fix-files-externalThomas Müller2015-03-022-2/+12
|\ \ \ \ | |_|_|/ |/| | |
| * | | fix files external test run and add common-tests optionMorris Jobke2015-02-262-2/+12
* | | | Merge pull request #14593 from owncloud/fix/13994Morris Jobke2015-03-023-1/+39
|\ \ \ \
| * | | | Simplify codeLukas Reschke2015-03-011-4/+4
| * | | | Add detection for invalid CLI configuration for settings pageLukas Reschke2015-02-273-1/+39
* | | | | Merge pull request #14570 from rullzer/ocs_sane_permissionsMorris Jobke2015-03-022-1/+79
|\ \ \ \ \
| * | | | | Shares should have a least read permissionRoeland Jago Douma2015-03-012-1/+79
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-0284-158/+232
* | | | | | Merge pull request #14614 from jakobsack/masterMorris Jobke2015-03-012-5/+12
|\ \ \ \ \ \
| * | | | | | Improve language on backgroundjob admin pageJakob Sack2015-03-011-2/+2
| * | | | | | Rename $human_time to $relative_time in cron settingsJakob Sack2015-02-281-3/+3
| * | | | | | Add absolute time of last cronjob as hover tipJakob Sack2015-02-282-4/+11
| * | | | | | Use relative time for cron statusJakob Sack2015-02-281-3/+3
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #14605 from owncloud/checkserver-disable-hhvmMorris Jobke2015-03-012-28/+38
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Disable bootstrap.php checks when HHVM is usedLukas Reschke2015-02-281-3/+5
| * | | | | Disable some server checks when running on HHVMLukas Reschke2015-02-281-25/+33
| |/ / / /
* / / / / [tx-robot] updated from transifexJenkins for ownCloud2015-03-0138-8/+426
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-2842-16/+184
* | | | Fix version revLukas Reschke2015-02-281-1/+1
* | | | This is 8.0.1 nowFrank Karlitschek2015-02-281-1/+1
* | | | This is not 8.1 pre alphaFrank Karlitschek2015-02-281-2/+2
|/ / /
* | | Merge pull request #14585 from owncloud/fix-avatars-for-users-with-atLukas Reschke2015-02-272-3/+3
|\ \ \ | |_|/ |/| |
| * | Use custom attribute instead of the div identifierLukas Reschke2015-02-272-3/+3
* | | Merge pull request #14575 from owncloud/cache-rename-overwriteMorris Jobke2015-02-272-1/+17
|\ \ \
| * | | Fix cache update when doing a rename that overwrites the targetRobin Appelman2015-02-272-1/+17
| |/ /
* | | Merge pull request #13616 from owncloud/streamresponseBernhard Posselt2015-02-279-30/+369
|\ \ \
| * | | AppFramework StreamResponseBernhard Posselt2015-02-279-30/+369
* | | | Merge pull request #14566 from owncloud/fix-avatars-in-masterMorris Jobke2015-02-271-1/+1
|\ \ \ \
| * | | | Fix avatars in masterLukas Reschke2015-02-271-1/+1
* | | | | Merge pull request #14567 from owncloud/node-check-fileinfo-interfaceJoas Schilling2015-02-272-0/+41
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add "throws" lines to calling methods and interface aswellJoas Schilling2015-02-272-0/+41
* | | | | Merge pull request #14565 from owncloud/more-httpsThomas Müller2015-02-272-5/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add more HTTPS endpointsLukas Reschke2015-02-272-5/+5
| |/ / /
* | | | Merge pull request #14437 from owncloud/node-check-fileinfoThomas Müller2015-02-272-2/+31
|\ \ \ \ | |/ / / |/| | |
| * | | Add unit testRobin Appelman2015-02-261-0/+15