summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove "Download from URL" featureLukas Reschke2015-03-023-163/+15
| | | | Fixes https://github.com/owncloud/core/issues/13326
* Merge pull request #14633 from ↵Thomas Müller2015-03-021-1/+1
|\ | | | | | | | | owncloud/issue/14627-maintenance-mode-message-misleading Maintenance mode message might be misleading
| * 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
|\ \ | | | | | | Disable the cache updater when doing the encryption migration
| * | 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
|\ \ \ | | | | | | | | Cleanup config.sample.php
| * | | 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.php
| * | | 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 option
| * | | 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
|\ \ \ \ | | | | | | | | | | Add detection for invalid CLI configuration for settings page
| * | | | Simplify codeLukas Reschke2015-03-011-4/+4
| | | | |
| * | | | Add detection for invalid CLI configuration for settings pageLukas Reschke2015-02-273-1/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change will log all failures that prevent the CLI cronjob from happening to the database and display a warning to administrators when an error happened. To test: 1. Configure some invalid CLI php.ini settings 2. Enable the CLI cronjob and run php cron.php 3. See the errors printed and also in the admin page 4. Configure the CLI settings correctly 5. Errors should be gone. Fixes https://github.com/owncloud/core/issues/13994
* | | | | Merge pull request #14570 from rullzer/ocs_sane_permissionsMorris Jobke2015-03-022-1/+79
|\ \ \ \ \ | | | | | | | | | | | | Shares should have a least read permission
| * | | | | Shares should have a least read permissionRoeland Jago Douma2015-03-012-1/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Throw 400 when a share is created or updated without read permissions * Added unit tests
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-0284-158/+232
| | | | | |
* | | | | | Merge pull request #14614 from jakobsack/masterMorris Jobke2015-03-012-5/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Show time difference of last cron run instead of absolute time
| * | | | | | 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 some server checks when running on HHVM
| * | | | | 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
| |/ / / / | | | | | | | | | | | | | | | Ref https://github.com/owncloud/core/issues/10837#issuecomment-76516839
* / / / / [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 identifier
| * | Use custom attribute instead of the div identifierLukas Reschke2015-02-272-3/+3
| | | | | | | | | | | | | | | | | | Otherwise problems arrive when a username contains characters such as an `@` Fixes https://github.com/owncloud/user_shibboleth/issues/38
* | | Merge pull request #14575 from owncloud/cache-rename-overwriteMorris Jobke2015-02-272-1/+17
|\ \ \ | | | | | | | | Fix cache update when doing a rename that overwrites the target
| * | | 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 StreamResponse
| * | | AppFramework StreamResponseBernhard Posselt2015-02-279-30/+369
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First stab at the StreamResponse, see #12988 The idea is to use an interface ICallbackResponse (I'm not 100% happy with the name yet, suggestions?) that allow the response to output things in its own way, for instance stream the file using readfile Unittests are atm lacking, plan is to check if a mock of ICallbackResponse will be used by calling its callback (also unhappy with this name) method Usage is: $response = new StreamResponse('path/to/file'); rename io to output, add additional methods and handle error and not modified cases when using StreamResponse fix indention and uppercasing, also handle forbidden cases fix indention fix indention no forbidden, figuring out if a file is really readable is too complicated to get to work across OSes and streams remove useless import remove useless import fix intendation
* | | | Merge pull request #14566 from owncloud/fix-avatars-in-masterMorris Jobke2015-02-271-1/+1
|\ \ \ \ | | | | | | | | | | Fix avatars in master
| * | | | 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 aswell
| * | | | 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 endpoints
| * | | | Add more HTTPS endpointsLukas Reschke2015-02-272-5/+5
| |/ / / | | | | | | | | | | | | The doc server can now finally speak SSL...
* | | | Merge pull request #14437 from owncloud/node-check-fileinfoThomas Müller2015-02-272-2/+31
|\ \ \ \ | |/ / / |/| | | Check if we have a proper fileinfo
| * | | 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
|\ \ \ \ | |_|/ / |/| | | Make version check work on the lowest common version denominator