summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #11972 from owncloud/usermanager-remove-deleteLukas Reschke2014-11-062-22/+5
|\
| * Remove confusingly names \OC\User\Manager::delete and fix the automatic cache...Robin Appelman2014-11-052-22/+5
* | Merge pull request #11928 from owncloud/support-HTML-in-logoThomas Müller2014-11-051-0/+12
|\ \ | |/ |/|
| * Support HTML in logo claimLukas Reschke2014-11-031-0/+12
* | fix shortcuts - underline instead of camelCaseMorris Jobke2014-11-041-2/+2
* | Merge pull request #11916 from owncloud/introduce-bowerMorris Jobke2014-11-042-16/+74
|\ \
| * | ability to add bower resourcesMorris Jobke2014-11-032-16/+74
| |/
* | Merge pull request #11924 from owncloud/firstCheckIfItIsDefaultConfigMorris Jobke2014-11-031-1/+1
|\ \ | |/ |/|
| * First check whether it is the default config before touchignLukas Reschke2014-11-031-1/+1
* | Update Pimple to V3.0Thomas Müller2014-11-032-13/+16
|/
* fix odd behaviourMorris Jobke2014-10-311-4/+8
* Merge pull request #9044 from owncloud/add-missing-email-principalVincent Petry2014-10-311-0/+12
|\
| * adding missing email address for principallibasys2014-10-241-0/+12
* | 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
* | | 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-302-9/+24
|\ \ \ \
| * | | | Fix the "addHeader($tag, $attributes, $text)" methods to not ignore the $text...Lukas Reschke2014-10-282-9/+24
* | | | | 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-301-2/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | add dataresponseBernhard Posselt2014-10-291-2/+3
* | | | | 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
| | |_|_|/ | |/| | |
* | | | | Fix implementation of translation short cutThomas Müller2014-10-291-9/+2
* | | | | Fix language file detectionVincent Petry2014-10-291-1/+1
* | | | | adding console command to generate javascript translation files based on exis...Thomas Müller2014-10-291-31/+33
* | | | | 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-292-2/+36
| |/ / / |/| | |
* | | | 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
* | | | Merge pull request #11786 from owncloud/MakeSupportedDBsConfigurableLukas Reschke2014-10-272-23/+121
|\ \ \ \
| * | | | code cleanup during review :+1:Thomas Müller2014-10-271-17/+17
| * | | | Make supported DBs configurable within config.phpLukas Reschke2014-10-272-7/+105
* | | | | 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 #11708 from owncloud/fix-momentjsVincent Petry2014-10-271-1/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Setting moment locale based on user selectionClark Tomlinson2014-10-231-1/+4
* | | | | Merge pull request #11760 from owncloud/add-type-hints-where-sensibleLukas Reschke2014-10-256-54/+27
|\ \ \ \ \