summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge master into webdav-injectionRobin Appelman2014-04-22538-7398/+8062
|\
| * Merge pull request #8255 from owncloud/fix-public-download-buttonRaghu Nayyar2014-04-221-0/+13
| |\
| | * keep long file names in one line to not overflow download button on mobileJan-Christoph Borchardt2014-04-171-0/+13
| * | Merge pull request #8286 from owncloud/use-proper-jsdocThomas Müller2014-04-224-148/+296
| |\ \
| | * | Fix typo Lukas Reschke2014-04-221-2/+2
| | * | fixing typosThomas Müller2014-04-221-25/+24
| | * | fixing typoThomas Müller2014-04-221-1/+1
| | * | Fix JSDocLukas Reschke2014-04-214-41/+43
| | * | Reuse selectorLukas Reschke2014-04-211-7/+9
| | * | Use proper JSDoc documentationLukas Reschke2014-04-211-86/+231
| * | | Merge pull request #8247 from owncloud/l10n-files_trasbin-fixThomas Müller2014-04-221-4/+4
| |\ \ \
| | * | | Fix localization issues of files_trashbinVolkan Gezer2014-04-171-4/+4
| * | | | Merge pull request #8239 from owncloud/directlink-overflowThomas Müller2014-04-221-0/+1
| |\ \ \ \
| | * | | | add max-width to directLink input to prevent overflowJan-Christoph Borchardt2014-04-161-0/+1
| * | | | | Merge pull request #8283 from owncloud/translatable-max-in-uploadJörn Friedrich Dreyer2014-04-222-2/+2
| |\ \ \ \ \
| | * | | | | make max. text translatableVolkan Gezer2014-04-212-2/+2
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-2245-256/+275
| * | | | | | Merge pull request #8281 from owncloud/public-responsesMorris Jobke2014-04-226-6/+6
| |\ \ \ \ \ \
| | * | | | | | make download and redirectresponse publicBernhard Posselt2014-04-206-6/+6
| * | | | | | | Merge pull request #8287 from owncloud/phpdoc-baseFrank Karlitschek2014-04-2131-127/+243
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Some more PHPDoc fixesLukas Reschke2014-04-2131-127/+243
| |/ / / / / /
| * | / / / / [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
| |\ \ \ \ \ \ \ \ \ \