aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* OCS API for server-to-server sharingBjoern Schiessle2014-12-0414-55/+612
|
* 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
| * | | | Add storage and cache wrappers to apply a permissions mask to a storageRobin Appelman2014-11-274-12/+252
| | | | |
| * | | | Add storage and cache wrappers to jail a storage to a subfolderRobin Appelman2014-11-278-5/+1144
| | | | |
* | | | | Merge pull request #12470 from owncloud/jenkins-12447Lukas Reschke2014-11-278-33/+80
|\ \ \ \ \ | | | | | | | | | | | | Jenkins 12447
| * | | | | Move OC_USER_BACKEND_* constants to OC_User_Backend classJoas Schilling2014-11-274-22/+47
| | | | | |
| * | | | | Move OC_GROUP_BACKEND_* constants to OC_Group_Backend classJoas Schilling2014-11-274-11/+33
| | | | | |
* | | | | | Merge pull request #12462 from owncloud/issue/12460-localstorage-buildpathVincent Petry2014-11-272-63/+79
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Introduce buildPath() in Storage\Local to reduce the difference to MappedLocal
| * | | | | Remove unused 2nd parameter of buildPath() and rename to getSourcePath()Joas Schilling2014-11-271-32/+33
| | | | | |
| * | | | | Introduce getSourcePath() in Storage\Local to reduce the difference to ↵Joas Schilling2014-11-271-31/+46
| | |/ / / | |/| | | | | | | | | | | | | MappedLocal
* | | | | Merge pull request #12449 from owncloud/issue/12444-namespace-exceptionsJoas Schilling2014-11-2712-46/+61
|\ \ \ \ \ | | | | | | | | | | | | Issue/12444 namespace exceptions
| * | | | | Replace exception with standard exceptionJoas Schilling2014-11-271-4/+1
| | | | | |
| * | | | | Correctly namespace and autoload DatabaseExceptionJoas Schilling2014-11-275-29/+38
| | | | | |
| * | | | | Correctly namespace DatabaseSetupExceptionJoas Schilling2014-11-266-13/+22
| |/ / / /
* | | | | Merge pull request #12418 from owncloud/delete_previewsMorris Jobke2014-11-271-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | delete old previews
| * | | | delete old previewsGeorg Ehrke2014-11-251-1/+1
| | | | |
* | | | | Merge pull request #12464 from owncloud/cache-available-languagesVincent Petry2014-11-271-0/+6
|\ \ \ \ \ | | | | | | | | | | | | Cache results of available languages
| * | | | | Cache results of available languagesLukas Reschke2014-11-271-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is about 8 times calles for every single page call, when caching this variable I was able to gain a small performance improvement from 20,512 µs to 630 µs profiled with xhprof Surely, this is no gigantic gain but if we would do that for every function out there...
* | | | | | Merge pull request #12451 from owncloud/issue/6101-remove-gettype-classVincent Petry2014-11-271-12/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Move constants from GET_TYPE to OC\Files so they can be autoloaded
| * | | | | | Move constants from GET_TYPE to OC\Files so they can be autoloadedJoas Schilling2014-11-261-12/+9
| | |_|/ / / | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-278-0/+8
| |_|_|/ / |/| | | |
* | | | | Merge pull request #12433 from owncloud/appstoreVincent Petry2014-11-261-0/+1
|\ \ \ \ \ | | | | | | | | | | | | added comment that App Store is disabled for EE
| * | | | | added comment that App Store is disabled for EECarla Schroder2014-11-251-0/+1
| | | | | |
* | | | | | Merge pull request #12304 from oparoz/patch-1Vincent Petry2014-11-261-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use a more universal shebang