summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-04-2124-121/+160
* Merge pull request #7988 from owncloud/routing-cache-webrootAndreas Fischer2014-04-201-1/+2
|\
| * Sort parameters and cast to intRobin Appelman2014-04-151-1/+2
| * add delimiter between host and baseurlRobin Appelman2014-04-071-1/+1
| * Merge branch 'master' into routing-cache-webrootRobin Appelman2014-04-07551-17796/+16340
| |\
| * | Keep cached urls with different hostnames or baseurls seperateRobin Appelman2014-04-011-1/+1
* | | Merge pull request #8203 from owncloud/correct-linkAndreas Fischer2014-04-201-3/+2
|\ \ \
| * | | Link to previous directoryLukas Reschke2014-04-161-2/+2
| * | | Use direct link instead of JSLukas Reschke2014-04-141-3/+2
* | | | Merge pull request #8169 from owncloud/change-to-showAndreas Fischer2014-04-201-1/+1
|\ \ \ \
| * | | | Change from showHTML to showLukas Reschke2014-04-111-1/+1
* | | | | Merge pull request #8277 from owncloud/add-type-hintsAndreas Fischer2014-04-201-11/+11
|\ \ \ \ \
| * | | | | Add type hintingLukas Reschke2014-04-201-11/+11
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-2012-12/+12
* | | | | | Merge pull request #8229 from owncloud/menutoggle-mobileLukas Reschke2014-04-201-0/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | do not show menu toggle on public share links as there is no menuJan-Christoph Borchardt2014-04-161-0/+5
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-1922-135/+144
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-1812-34/+34
* | | | | | Merge pull request #8220 from owncloud/type-hinting-ldapblizzz2014-04-176-4/+25
|\ \ \ \ \ \
| * | | | | | Add missing param hintBart Visscher2014-04-161-0/+1
| * | | | | | Fix PHPdoc in user_ldapBart Visscher2014-04-156-4/+24
* | | | | | | Merge pull request #8249 from owncloud/correct-mMorris Jobke2014-04-171-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Use JS as content-type due to mimesniffingLukas Reschke2014-04-171-2/+2
* | | | | | | | Merge pull request #8205 from owncloud/fix-8202Morris Jobke2014-04-171-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | remove unneeded LOWER. Fixes #8202Victor Dubiniuk2014-04-141-1/+1
* | | | | | | | | Merge pull request #8222 from owncloud/type-hintingMorris Jobke2014-04-1714-18/+55
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix PHPdoc in lib/publicBart Visscher2014-04-153-1/+13
| * | | | | | | | | Fix PHPdoc in lib/privateBart Visscher2014-04-1511-17/+42
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #8246 from Gared/masterMorris Jobke2014-04-171-19/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix javascript error in calendar appStefan2014-04-161-19/+21
* | | | | | | | | | Merge pull request #8236 from owncloud/header-right-fixMorris Jobke2014-04-172-36/+49
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix header code duplication, code style fixesJan-Christoph Borchardt2014-04-162-21/+28
| * | | | | | | | | | remove duplication of 'header-right' element, also make it overflow when too ...Jan-Christoph Borchardt2014-04-162-16/+22
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #8189 from Xenopathic/misc_fixesRobin McCorkell2014-04-173-16/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix user_ldap default setting valueRobin McCorkell2014-04-131-1/+1
| * | | | | | | | | | Prevent error from cache update on deleted filesRobin McCorkell2014-04-131-1/+5
| * | | | | | | | | | Prevent error in files_trashbinRobin McCorkell2014-04-131-7/+9
| * | | | | | | | | | Adjust logic for deciding if trashbin emptyRobin McCorkell2014-04-131-7/+5
* | | | | | | | | | | Merge pull request #8240 from owncloud/thumbnail-on-short-videos-masterJörn Friedrich Dreyer2014-04-171-7/+30
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | escape $second + update PHPDocThomas Müller2014-04-161-7/+7
| * | | | | | | | | | videos which are shorter then 5 seconds will now get a proper thumbnail at 1 ...Thomas Müller2014-04-161-7/+30
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-1718-135/+180
* | | | | | | | | | | Merge pull request #8183 from owncloud/move-security-headersMorris Jobke2014-04-165-33/+29
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix typoLukas Reschke2014-04-141-1/+1
| * | | | | | | | | | | Typo + Line breaksLukas Reschke2014-04-131-5/+3
| * | | | | | | | | | | Remove uneeded usages of nosniffLukas Reschke2014-04-133-10/+0
| * | | | | | | | | | | Fix indentationLukas Reschke2014-04-131-1/+2
| * | | | | | | | | | | Move security headers to base.phpLukas Reschke2014-04-132-25/+32
* | | | | | | | | | | | Merge pull request #7994 from owncloud/fix-login-fieldsMorris Jobke2014-04-161-15/+39
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | fix overlapping infield labelsJan-Christoph Borchardt2014-04-161-1/+1