summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update pear/archive_tar to 1.3.13Thomas Müller2014-10-302-2/+0
* Merge pull request #11860 from owncloud/fix-stupid-error-because-im-a-moroThomas Müller2014-10-301-1/+1
|\
| * Fix stupid copy paste failLukas Reschke2014-10-301-1/+1
* | Merge pull request #11821 from owncloud/generic-responseMorris Jobke2014-10-308-29/+292
|\ \
| * | add dataresponseBernhard Posselt2014-10-298-29/+292
* | | Merge pull request #11863 from owncloud/fix-enc-sharingtestsMorris Jobke2014-10-301-1/+7
|\ \ \
| * | | Properly register sharing hooks and proxiesVincent Petry2014-10-301-1/+7
| | |/ | |/|
* / | update 3rdparty to match it's master branchMorris Jobke2014-10-301-0/+0
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2014-10-30366-780/+1561
* | fix style of generated documentationMorris Jobke2014-10-291-1/+2
* | Merge pull request #11409 from owncloud/watcher-reuseVincent Petry2014-10-295-43/+53
|\ \
| * | Better reuse of cache data for getFolderContentsRobin Appelman2014-10-242-8/+14
| * | Fix shared cache getFolderContentsRobin Appelman2014-10-241-17/+14
| * | also update shared watcherRobin Appelman2014-10-241-2/+4
| * | Pass the cached data to the filesystem watcherRobin Appelman2014-10-242-16/+21
* | | Merge pull request #11835 from owncloud/enc-fixmovingsharekeystofolderMorris Jobke2014-10-293-35/+42
|\ \ \
| * | | Added encryption test when moving file as non-ownerVincent Petry2014-10-291-2/+15
| * | | Fix warning with unset extension checkVincent Petry2014-10-291-1/+1
| * | | Fix moving share keys as non-owner to subdirVincent Petry2014-10-291-32/+26
* | | | Merge pull request #11831 from owncloud/make-search-non-blockingLukas Reschke2014-10-291-0/+1
|\ \ \ \
| * | | | Close session for searchLukas Reschke2014-10-291-0/+1
* | | | | just add merge commit of 3rdparty repoMorris Jobke2014-10-291-0/+0
* | | | | Merge pull request #11638 from owncloud/oc8-translationsThomas Müller2014-10-293017-48185/+95745
|\ \ \ \ \
| * | | | | Fix implementation of translation short cutThomas Müller2014-10-291-9/+2
| * | | | | Adding translations for settingsThomas Müller2014-10-291-1/+3
| * | | | | Fix language file detectionVincent Petry2014-10-291-1/+1
| * | | | | update all translation files to js and jsonThomas Müller2014-10-292983-47944/+95191
| * | | | | adding console command to generate javascript translation files based on exis...Thomas Müller2014-10-2911-56/+187
| * | | | | Include core translationsVincent Petry2014-10-293-11/+20
| * | | | | in case a translation javascript is not found we no longer bail outThomas Müller2014-10-295-45/+5
| * | | | | Added OC.L10N namespace with translation functionsVincent Petry2014-10-2917-130/+343
| * | | | | l10n.pl now generates js files as wellThomas Müller2014-10-292-5/+10
| |/ / / /
* | | | | Merge pull request #11689 from owncloud/doctrine-2.5Thomas Müller2014-10-292-2/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update doctrine/dbal to 2.5Thomas Müller2014-10-282-2/+0
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-2921-26/+76
|/ / / /
* | | | Merge pull request #11738 from owncloud/update-patchwork-utf8Morris Jobke2014-10-282-2/+0
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Use composer autoloader to load PatchworkThomas Müller2014-10-282-2/+0
|/ /
* | Merge pull request #11805 from owncloud/AdamWill-issue9643Lukas Reschke2014-10-283-59/+18
|\ \
| * | use Composer autoloader not OC for non-Composer 3rdparty (#9643)Adam Williamson2014-10-283-59/+18
* | | Merge pull request #11600 from owncloud/refactor-appsettings-to-app-frameworkLukas Reschke2014-10-285-100/+143
|\ \ \ | |/ / |/| |
| * | Migrate new app settings to AppFrameworkLukas Reschke2014-10-155-100/+143
* | | Merge pull request #11791 from owncloud/webdav-getquotainfo-503-handlingMorris Jobke2014-10-281-7/+11
|\ \ \
| * | | Properly catch 503 storage not available in getQuotaInfoVincent Petry2014-10-271-7/+11
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-2821-87/+123
* | | | Merge pull request #11799 from owncloud/no-stable-etags-on-windowsLukas Reschke2014-10-271-0/+8
|\ \ \ \
| * | | | On Windows platform we have no stable etag generation - yetThomas Müller2014-10-271-0/+8
* | | | | Merge pull request #11786 from owncloud/MakeSupportedDBsConfigurableLukas Reschke2014-10-276-58/+271
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | code cleanup during review :+1:Thomas Müller2014-10-272-25/+25
| * | | | Make supported DBs configurable within config.phpLukas Reschke2014-10-276-35/+248
* | | | | Merge pull request #11783 from owncloud/allow_passing_driver_optionsMorris Jobke2014-10-272-0/+14
|\ \ \ \ \