summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-0324-88/+128
* Merge pull request #10881 from owncloud/touch-statcacheRobin Appelman2014-12-022-0/+2
|\
| * also clear statcache in mapped localRobin Appelman2014-12-021-0/+1
| * Clear statcache before getting the mtime from local storage backendsRobin Appelman2014-12-021-0/+1
* | Merge pull request #12333 from owncloud/delete-selected-filesMorris Jobke2014-12-023-10/+42
|\ \
| * | Add js unit testRobin Appelman2014-11-261-7/+27
| * | Dont show the delete button for selected files if one of the selected files i...Robin Appelman2014-11-261-2/+12
| * | Check if files are deletable before trying to delete themRobin Appelman2014-11-261-1/+3
* | | Merge pull request #11975 from owncloud/Combustible-combustible_devMorris Jobke2014-12-021-254/+267
|\ \ \ | |_|/ |/| |
| * | Use \OCP\ILoggerThomas Müller2014-12-011-257/+264
| * | Added error check to lib/private/image.phpByron Marohn2014-12-011-0/+6
* | | Merge pull request #12310 from kampka/masterThomas Müller2014-12-022-2/+52
|\ \ \
| * | | 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 configurationLukas Reschke2014-11-255-6/+38
* | | | Merge pull request #12469 from owncloud/issue/12460-port-local-changes2mappedVincent Petry2014-12-011-2/+21
|\ \ \ \
| * | | | Also clearstatcache() in MappedLocal before using the statsJoas Schilling2014-11-271-0/+1
| * | | | Check whether file exists before trying to touch() itJoas Schilling2014-11-271-0/+3
| * | | | Check return of disk_free_space before returning itJoas Schilling2014-11-271-1/+5
| * | | | Check file existance in MappedLocal in hasUpdated()Joas Schilling2014-11-271-1/+5
| * | | | Make MappedLocal::isLocal() true like for LocalJoas Schilling2014-11-271-0/+7
* | | | | Merge pull request #12427 from owncloud/issue/6101-deprecate-namespaced-funct...Lukas Reschke2014-12-011-3/+88
|\ \ \ \ \
| * | | | | 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 JPEGOlivier Paroz2014-11-241-0/+4
* | | | | | | [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
|\ \ \ \ \ \ \
| * | | | | | | 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
* | | | | | | | Merge pull request #12488 from owncloud/activity_group_multiple_conditionsLukas Reschke2014-11-282-4/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | 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 itBjoern Schiessle2014-11-281-0/+7
| |/ / / / / / /
* | | | | | | | Merge pull request #12483 from owncloud/issue/6101-preview-providersLukas Reschke2014-11-2821-424/+491
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
* | | | | | | | | Merge pull request #12489 from owncloud/skip-sendpassword-email-test-windowsThomas Müller2014-11-281-0/+5
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Skip lostcontroller sending email test on windowsJoas Schilling2014-11-281-0/+5
|/ / / / / / / /
* | | | | | | | Merge pull request #12432 from owncloud/nosqliteVincent Petry2014-11-281-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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