summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Maintenance mode message might be misleadingJoas Schilling2015-03-021-1/+1
* 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
| * | Check if we have a proper fileinfoRobin Appelman2015-02-251-2/+16
* | | Merge pull request #14529 from owncloud/intuitive-version-checkThomas Müller2015-02-272-9/+84
|\ \ \ | |_|/ |/| |
| * | add phpdocBernhard Posselt2015-02-261-0/+20
| * | make version check work on the lowest common version denominatorBernhard Posselt2015-02-262-9/+64
* | | Merge pull request #14563 from owncloud/LukasReschke-patch-1Morris Jobke2015-02-271-0/+2
|\ \ \
| * | | Add notice about Travis ChecksLukas Reschke2015-02-271-0/+2
|/ / /
* | | Merge pull request #14530 from owncloud/revert-14403Thomas Müller2015-02-27793-14657/+7383
|\ \ \
| * | | Revert "Updating license headers"Morris Jobke2015-02-26793-14657/+7383
| |/ /
* | | Merge pull request #14561 from owncloud/fix-sftpThomas Müller2015-02-271-1/+4
|\ \ \
| * | | apply suggestions from @atmoz to fix SFTP setupMorris Jobke2015-02-261-1/+4
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-27108-196/+116
* | | | Merge pull request #14550 from owncloud/gc-warningThomas Müller2015-02-261-1/+2
|\ \ \ \
| * | | | fix warning in gcRobin Appelman2015-02-261-1/+2
* | | | | Merge pull request #14532 from owncloud/defaultvalueforremoteidVincent Petry2015-02-262-1/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Bump up files_sharing version for schema updateVincent Petry2015-02-261-1/+1
| * | | | Add default value for remote_idVincent Petry2015-02-261-0/+1
| | |/ / | |/| |