summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ / / / |/| | | |
* | | | | 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