summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #11998 from owncloud/add-get-logger-to-interfaceLukas Reschke2014-11-061-0/+7
|\
| * Add getLogger() to IServerContainerLukas Reschke2014-11-061-0/+7
* | Add OCP\Security\IHasherLukas Reschke2014-11-064-0/+220
* | Merge pull request #11883 from owncloud/clear-session-for-setupLukas Reschke2014-11-061-1/+2
|\ \
| * | Clear session before setupLukas Reschke2014-10-311-1/+2
* | | 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
* | | md5 now handled via bowerMorris Jobke2014-11-061-1/+1
* | | bower snapjsMorris Jobke2014-11-061-1/+1
* | | Merge pull request #11982 from owncloud/bower-underscoreVincent Petry2014-11-061-1/+1
|\ \ \
| * | | bower underscoreMorris Jobke2014-11-051-1/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-062-0/+2
|/ / /
* | | Merge pull request #11936 from owncloud/bower-jqueryLukas Reschke2014-11-051-2/+2
|\ \ \
| * | | migrate jQuery to bowerMorris Jobke2014-11-041-2/+2
* | | | Merge pull request #11965 from owncloud/fix-jsonresponseThomas Müller2014-11-051-1/+1
|\ \ \ \
| * | | | fix typo in content typeBernhard Posselt2014-11-051-1/+1
| | |/ / | |/| |
* | | | Merge pull request #11928 from owncloud/support-HTML-in-logoThomas Müller2014-11-052-0/+20
|\ \ \ \ | |/ / / |/| | |
| * | | Support HTML in logo claimLukas Reschke2014-11-032-0/+20
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-052-0/+2
* | | | fix shortcuts - underline instead of camelCaseMorris Jobke2014-11-041-2/+2
| |/ / |/| |
* | | Merge pull request #11916 from owncloud/introduce-bowerMorris Jobke2014-11-043-17/+75
|\ \ \
| * | | replace moment.js with bower versionMorris Jobke2014-11-031-1/+1
| * | | ability to add bower resourcesMorris Jobke2014-11-032-16/+74
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-042-2/+2
* | | 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-033-15/+17
* | | Update Symfony/Console to 2.5 & Update Symfony/Routing to 2.5Thomas Müller2014-11-031-2/+0
|/ /
* | 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
* | | [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
| |/ / / / |/| | | |