summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Allow passing a test file just like in autotest.shJoas Schilling2014-12-021-7/+7
|
* Better manage the output when running autotest.cmdJoas Schilling2014-12-021-5/+12
|
* Merge pull request #12310 from kampka/masterThomas Müller2014-12-022-2/+52
|\ | | | | Implement a logger to log to error_log
| * Implement a logger to log to error_logChristian Kampka2014-12-012-2/+52
| |
* | Merge pull request #12419 from owncloud/read-only-configThomas Müller2014-12-015-6/+38
|\ \ | | | | | | Allow read-only configuration
| * | Allow read-only configurationLukas Reschke2014-11-255-6/+38
| | | | | | | | | | | | | | | | | | Workaround required for IIS setups running ownCloud to prevent dataloss. Long-term solution would be to move some configuration settings to the database
* | | Merge pull request #12469 from owncloud/issue/12460-port-local-changes2mappedVincent Petry2014-12-011-2/+21
|\ \ \ | | | | | | | | Issue/12460 port local changes2mapped
| * | | Also clearstatcache() in MappedLocal before using the statsJoas Schilling2014-11-271-0/+1
| | | | | | | | | | | | | | | | Local change 283c10f010f5da4ca0b6b7658ac1fa730b8858bf
| * | | Check whether file exists before trying to touch() itJoas Schilling2014-11-271-0/+3
| | | | | | | | | | | | | | | | | | | | Local changes from d069ee8a8bce6a08d8b7921ad378c60af2a0439e and 258ad38fd3c1e3cdc4ec20238b166e78c334b814
| * | | Check return of disk_free_space before returning itJoas Schilling2014-11-271-1/+5
| | | | | | | | | | | | | | | | | | | | Local changes copied from ed8359737199a8a6640986e00df80d971aa6e1d7 and 25370fcb8235d2129cab0f8a5843c4784b3673d0
| * | | Check file existance in MappedLocal in hasUpdated()Joas Schilling2014-11-271-1/+5
| | | | | | | | | | | | | | | | Only fixed in Local by eeee9eacea333035e22ef3ed938e36f56bc762cd
| * | | Make MappedLocal::isLocal() true like for LocalJoas Schilling2014-11-271-0/+7
| | | | | | | | | | | | | | | | Missed in 788c8540aa6aac50795c37b088eeaa561d44b86c
* | | | Merge pull request #12427 from ↵Lukas Reschke2014-12-011-3/+88
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/issue/6101-deprecate-namespaced-functions Depcrate namespaced functions, since they can not be autoloaded
| * | | | Depcrate namespaced functions, since they can not be autoloadedJoas Schilling2014-11-261-3/+88
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-012-2/+2
| | | | |
* | | | | Merge pull request #12398 from oparoz/patch-5Morris Jobke2014-11-301-0/+4
|\ \ \ \ \ | | | | | | | | | | | | You can only change the oritentation of a JPEG
| * | | | | You can only change the oritentation of a JPEGOlivier Paroz2014-11-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TIFFs also have EXIF headers, but they're not supported by the Image class PHP doc http://php.net/manual/en/function.exif-read-data.php
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-304-0/+4
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-2912-10/+26
| | | | | |
* | | | | | Merge pull request #12499 from owncloud/disableMSSQLLukas Reschke2014-11-282-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Disable MSSQL and OCI for new CE installations
| * | | | | | Adjust sample configLukas Reschke2014-11-281-1/+1
| | | | | | |
| * | | | | | Disable OCI as it is unsupported by most CE appsLukas Reschke2014-11-281-1/+1
| | | | | | |
| * | | | | | Disable MSSQL for new CE installationsLukas Reschke2014-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since automatic schema migrations are not yet possible let's disable this for now.
* | | | | | | Merge pull request #12488 from owncloud/activity_group_multiple_conditionsLukas Reschke2014-11-282-4/+19
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | activitymanager: concatenate queries with 'or'
| * | | | | | concatenate queries with 'or'Bjoern Schiessle2014-11-282-4/+19
| | | | | | |
* | | | | | | Merge pull request #12486 from owncloud/activity_prioritiesLukas Reschke2014-11-281-0/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | add activity priorities to core so that other apps can reuse it
| * | | | | | | add activity priorities to core so that other apps can reuse itBjoern Schiessle2014-11-281-0/+7
| |/ / / / / /
* | | | | | | Merge pull request #12483 from owncloud/issue/6101-preview-providersLukas Reschke2014-11-2821-424/+491
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Issue/6101 Autoload preview providers
| * | | | | | | Split bitmap providers into one per fileJoas Schilling2014-11-287-74/+119
| | | | | | | |
| * | | | | | | Split office providers into one class per fileJoas Schilling2014-11-288-125/+166
| | | | | | | |
| * | | | | | | Fix intendation and doc blocks of preview providersJoas Schilling2014-11-288-116/+143
| | | | | | | |
| * | | | | | | Move registration of core preview providers to previewJoas Schilling2014-11-2710-132/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So the class files only have class code and don't execute code
* | | | | | | | Merge pull request #12489 from owncloud/skip-sendpassword-email-test-windowsThomas Müller2014-11-281-0/+5
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Skip lostcontroller sending email test on windows
| * | | | | | | Skip lostcontroller sending email test on windowsJoas Schilling2014-11-281-0/+5
|/ / / / / / /
* | | | | | | Merge pull request #12432 from owncloud/nosqliteVincent Petry2014-11-281-2/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add notes that SQLite is CE only
| * | | | | | | Markup correctionsCarla Schroder2014-11-251-3/+2
| | | | | | | |
| * | | | | | | Add notes that SQLite is CE onlyCarla Schroder2014-11-251-2/+5
| | | | | | | |
* | | | | | | | Merge pull request #12472 from owncloud/modifyCookiesMorris Jobke2014-11-289-25/+207
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add functions to modify cookies to response class
| * | | | | | | | Pass \OC::$WEBROOT to the ctrLukas Reschke2014-11-272-5/+12
| | | | | | | | |
| * | | | | | | | Remove redundant codeLukas Reschke2014-11-271-3/+3
| | | | | | | | |
| * | | | | | | | Use server containerLukas Reschke2014-11-273-1/+17
| | | | | | | | |
| * | | | | | | | Add functions to modify cookies to response classLukas Reschke2014-11-276-18/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently there is no AppFramework way to modify cookies, which makes it unusable for quite some use-cases or results in untestable code. This PR adds some basic functionalities to add and invalidate cookies. Usage: ```php $response = new TemplateResponse(...); $response->addCookie('foo', 'bar'); $response->invalidateCookie('foo'); $response->addCookie('bar', 'foo', new \DateTime('2015-01-01 00:00')); ``` Existing cookies can be accessed with the AppFramework using `$this->request->getCookie($name)`.
* | | | | | | | | Merge pull request #12443 from owncloud/issue/6101-all-classes-autoloadableMorris Jobke2014-11-289-100/+171
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Issue/6101 Make all interfaces/classes autoloadable
| * | | | | | | | | Move NaturalSort_DefaultCollator to its own fileJoas Schilling2014-11-272-11/+19
| | | | | | | | | |
| * | | | | | | | | Move iHomeStorage to own fileJoas Schilling2014-11-272-4/+24
| | | | | | | | | |
| * | | | | | | | | Move share interfaces to own files so they can be autoloadedJoas Schilling2014-11-275-85/+128
| | | | | | | | | |
* | | | | | | | | | Merge pull request #12479 from rclarkson/masterMorris Jobke2014-11-281-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Limit blacklist to php files
| * | | | | | | | | | Limit blacklist to php filesRichard Clarkson2014-11-271-1/+1
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During performance optimization I have discovered that the installer scans all files for the blacklisted words. This greatly impacts speed on lower end devices such as the raspberry pie. This commit limits it to PHP files which seems to achieve the desired effect. I have used the --include option to achieve this, see http://stackoverflow.com/questions/1987926/how-do-i-grep-recursively This contribution is MIT licensed
* / | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-2816-22/+98
|/ / / / / / / / /
* | | | | | | | | Merge pull request #12426 from owncloud/jail-mask-wrappersRobin Appelman2014-11-2711-5/+1384
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add Jail and PermissionsMask storage wrappers