summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #11539 from owncloud/mount-setup-onceVincent Petry2014-10-311-1/+6
|\
| * Reset the users setup after clearing mountsRobin Appelman2014-10-281-0/+1
| * Only mount the storages for the user onceRobin Appelman2014-10-271-1/+5
* | [tx-robot] updated from transifexJenkins for ownCloud2014-10-312-2/+14
* | Merge pull request #11877 from owncloud/fix-11875-masterMorris Jobke2014-10-301-1/+1
|\ \
| * | prevent PHP noticeThomas Müller2014-10-301-1/+1
* | | Merge pull request #11080 from owncloud/addheader-text-2Vincent Petry2014-10-303-11/+28
|\ \ \
| * | | Fix the "addHeader($tag, $attributes, $text)" methods to not ignore the $text...Lukas Reschke2014-10-283-11/+28
* | | | Merge pull request #11740 from owncloud/update-archive-tarThomas Müller2014-10-301-2/+0
|\ \ \ \
| * | | | Update pear/archive_tar to 1.3.13Thomas Müller2014-10-301-2/+0
* | | | | Merge pull request #11864 from owncloud/clear-session-after-logoutLukas Reschke2014-10-301-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Clear session after logoutLukas Reschke2014-10-301-0/+1
* | | | | Merge pull request #11858 from owncloud/fix-11064Morris Jobke2014-10-301-1/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Allow any outgoing XHR connectionsLukas Reschke2014-10-301-1/+2
* | | | | 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-304-5/+107
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | add dataresponseBernhard Posselt2014-10-294-5/+107
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-3020-10/+298
| |/ / / |/| | |
* | | | Merge pull request #11409 from owncloud/watcher-reuseVincent Petry2014-10-292-22/+32
|\ \ \ \
| * | | | Better reuse of cache data for getFolderContentsRobin Appelman2014-10-241-6/+11
| * | | | Pass the cached data to the filesystem watcherRobin Appelman2014-10-242-16/+21
* | | | | Merge pull request #11638 from owncloud/oc8-translationsThomas Müller2014-10-29357-5645/+11051
|\ \ \ \ \
| * | | | | Fix implementation of translation short cutThomas Müller2014-10-291-9/+2
| * | | | | Fix language file detectionVincent Petry2014-10-291-1/+1
| * | | | | update all translation files to js and jsonThomas Müller2014-10-29351-5599/+10972
| * | | | | adding console command to generate javascript translation files based on exis...Thomas Müller2014-10-291-31/+33
| * | | | | Include core translationsVincent Petry2014-10-291-1/+2
| * | | | | in case a translation javascript is not found we no longer bail outThomas Müller2014-10-293-12/+5
| * | | | | Added OC.L10N namespace with translation functionsVincent Petry2014-10-294-2/+46
* | | | | | Merge pull request #11689 from owncloud/doctrine-2.5Thomas Müller2014-10-291-2/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update doctrine/dbal to 2.5Thomas Müller2014-10-281-2/+0
| | |/ / / | |/| | |
* / | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-291-0/+2
|/ / / /
* | | | Use composer autoloader to load PatchworkThomas Müller2014-10-281-2/+0
* | | | use Composer autoloader not OC for non-Composer 3rdparty (#9643)Adam Williamson2014-10-282-44/+18
* | | | 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-281-0/+2
| |_|/ / |/| | |
* | | | Merge pull request #11786 from owncloud/MakeSupportedDBsConfigurableLukas Reschke2014-10-273-24/+122
|\ \ \ \
| * | | | code cleanup during review :+1:Thomas Müller2014-10-271-17/+17
| * | | | Make supported DBs configurable within config.phpLukas Reschke2014-10-273-8/+106
* | | | | Merge pull request #11783 from owncloud/allow_passing_driver_optionsMorris Jobke2014-10-271-0/+7
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | allow passing driver options, fixes #11718Jörn Friedrich Dreyer2014-10-271-0/+7
* | | | | Merge pull request #11763 from owncloud/stable-etagsRobin Appelman2014-10-271-0/+21
|\ \ \ \ \
| * | | | | Generate stable etags for local filesRobin Appelman2014-10-241-0/+21
* | | | | | Merge pull request #11787 from owncloud/fix-php-docsMorris Jobke2014-10-271-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix PHPDocLukas Reschke2014-10-271-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #11708 from owncloud/fix-momentjsVincent Petry2014-10-271-1/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Setting moment locale based on user selectionClark Tomlinson2014-10-231-1/+4
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-271-0/+21