summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-0570-70/+80
* Merge pull request #12619 from owncloud/use-also-original-heaMorris Jobke2014-12-041-1/+1
|\
| * Merge headersLukas Reschke2014-12-041-1/+1
* | Merge pull request #12616 from owncloud/node-fileinfoMorris Jobke2014-12-043-28/+60
|\ \
| * | make \OC\Files\Node\Node implement the FileInfo interfaceRobin Appelman2014-12-043-28/+60
* | | Merge pull request #12607 from owncloud/this-is-an-awesome-dayClark Tomlinson2014-12-041-11/+2
|\ \ \ | |_|/ |/| |
| * | PHP 5.4 is now required for masterLukas Reschke2014-12-041-11/+2
| |/
* | Merge pull request #12609 from owncloud/remove-53-fixmeThomas Müller2014-12-041-18/+2
|\ \
| * | Remove workaround for 5.3Lukas Reschke2014-12-041-18/+2
| |/
* | no nested xml tags on dependenciesThomas Müller2014-12-041-2/+2
* | fix an issue where the types tag holds an empty stringThomas Müller2014-12-041-4/+8
* | adjust dependency analyzer to use attributes properlyThomas Müller2014-12-041-14/+27
* | switch to different parsing implementation to get xml attributes properly han...Thomas Müller2014-12-041-1/+56
* | adding supported databasesThomas Müller2014-12-042-0/+32
* | introduce dependency analyzer to take care of app dependenciesThomas Müller2014-12-043-2/+79
* | adding default key value pair for 'types'Thomas Müller2014-12-041-0/+3
* | translate labels properlyThomas Müller2014-12-041-2/+2
|/
* Merge pull request #12572 from owncloud/issue/12571-disabled-preview-logfloodLukas Reschke2014-12-031-1/+1
|\
| * Stop flooding the log, when previews are disabledJoas Schilling2014-12-031-1/+1
* | Merge pull request #12553 from owncloud/default-iosidThomas Müller2014-12-031-0/+8
|\ \ | |/ |/|
| * add missing public interface for iOS client app idMorris Jobke2014-12-021-0/+8
* | 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 #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-021-0/+48
|\ \
| * | Implement a logger to log to error_logChristian Kampka2014-12-011-0/+48
* | | Merge pull request #12419 from owncloud/read-only-configThomas Müller2014-12-012-3/+11
|\ \ \ | |_|/ |/| |
| * | Allow read-only configurationLukas Reschke2014-11-252-3/+11
* | | 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
* | | | | 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-292-0/+6
* | | | | | Merge pull request #12499 from owncloud/disableMSSQLLukas 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-281-2/+14
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | concatenate queries with 'or'Bjoern Schiessle2014-11-281-2/+14
* | | | | | | 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
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |