Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge master into webdav-injection | Robin Appelman | 2014-04-22 | 538 | -7398/+8062 |
|\ | |||||
| * | Merge pull request #8255 from owncloud/fix-public-download-button | Raghu Nayyar | 2014-04-22 | 1 | -0/+13 |
| |\ | |||||
| | * | keep long file names in one line to not overflow download button on mobile | Jan-Christoph Borchardt | 2014-04-17 | 1 | -0/+13 |
| * | | Merge pull request #8286 from owncloud/use-proper-jsdoc | Thomas Müller | 2014-04-22 | 4 | -148/+296 |
| |\ \ | |||||
| | * | | Fix typo | Lukas Reschke | 2014-04-22 | 1 | -2/+2 |
| | * | | fixing typos | Thomas Müller | 2014-04-22 | 1 | -25/+24 |
| | * | | fixing typo | Thomas Müller | 2014-04-22 | 1 | -1/+1 |
| | * | | Fix JSDoc | Lukas Reschke | 2014-04-21 | 4 | -41/+43 |
| | * | | Reuse selector | Lukas Reschke | 2014-04-21 | 1 | -7/+9 |
| | * | | Use proper JSDoc documentation | Lukas Reschke | 2014-04-21 | 1 | -86/+231 |
| * | | | Merge pull request #8247 from owncloud/l10n-files_trasbin-fix | Thomas Müller | 2014-04-22 | 1 | -4/+4 |
| |\ \ \ | |||||
| | * | | | Fix localization issues of files_trashbin | Volkan Gezer | 2014-04-17 | 1 | -4/+4 |
| * | | | | Merge pull request #8239 from owncloud/directlink-overflow | Thomas Müller | 2014-04-22 | 1 | -0/+1 |
| |\ \ \ \ | |||||
| | * | | | | add max-width to directLink input to prevent overflow | Jan-Christoph Borchardt | 2014-04-16 | 1 | -0/+1 |
| * | | | | | Merge pull request #8283 from owncloud/translatable-max-in-upload | Jörn Friedrich Dreyer | 2014-04-22 | 2 | -2/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | make max. text translatable | Volkan Gezer | 2014-04-21 | 2 | -2/+2 |
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-22 | 45 | -256/+275 |
| * | | | | | | Merge pull request #8281 from owncloud/public-responses | Morris Jobke | 2014-04-22 | 6 | -6/+6 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | make download and redirectresponse public | Bernhard Posselt | 2014-04-20 | 6 | -6/+6 |
| * | | | | | | | Merge pull request #8287 from owncloud/phpdoc-base | Frank Karlitschek | 2014-04-21 | 31 | -127/+243 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| | * | | | | | | Some more PHPDoc fixes | Lukas Reschke | 2014-04-21 | 31 | -127/+243 |
| |/ / / / / / | |||||
| * | / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-21 | 24 | -121/+160 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | Merge pull request #7988 from owncloud/routing-cache-webroot | Andreas Fischer | 2014-04-20 | 1 | -1/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | Sort parameters and cast to int | Robin Appelman | 2014-04-15 | 1 | -1/+2 |
| | * | | | | | add delimiter between host and baseurl | Robin Appelman | 2014-04-07 | 1 | -1/+1 |
| | * | | | | | Merge branch 'master' into routing-cache-webroot | Robin Appelman | 2014-04-07 | 551 | -17796/+16340 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Keep cached urls with different hostnames or baseurls seperate | Robin Appelman | 2014-04-01 | 1 | -1/+1 |
| * | | | | | | | Merge pull request #8203 from owncloud/correct-link | Andreas Fischer | 2014-04-20 | 1 | -3/+2 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Link to previous directory | Lukas Reschke | 2014-04-16 | 1 | -2/+2 |
| | * | | | | | | | Use direct link instead of JS | Lukas Reschke | 2014-04-14 | 1 | -3/+2 |
| * | | | | | | | | Merge pull request #8169 from owncloud/change-to-show | Andreas Fischer | 2014-04-20 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Change from showHTML to show | Lukas Reschke | 2014-04-11 | 1 | -1/+1 |
| * | | | | | | | | | Merge pull request #8277 from owncloud/add-type-hints | Andreas Fischer | 2014-04-20 | 1 | -11/+11 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Add type hinting | Lukas Reschke | 2014-04-20 | 1 | -11/+11 |
| | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-20 | 12 | -12/+12 |
| * | | | | | | | | | Merge pull request #8229 from owncloud/menutoggle-mobile | Lukas Reschke | 2014-04-20 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | do not show menu toggle on public share links as there is no menu | Jan-Christoph Borchardt | 2014-04-16 | 1 | -0/+5 |
| | | |_|_|_|/ / / | | |/| | | | | | | |||||
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-19 | 22 | -135/+144 |
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-18 | 12 | -34/+34 |
| * | | | | | | | | Merge pull request #8220 from owncloud/type-hinting-ldap | blizzz | 2014-04-17 | 6 | -4/+25 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Add missing param hint | Bart Visscher | 2014-04-16 | 1 | -0/+1 |
| | * | | | | | | | | Fix PHPdoc in user_ldap | Bart Visscher | 2014-04-15 | 6 | -4/+24 |
| * | | | | | | | | | Merge pull request #8249 from owncloud/correct-m | Morris Jobke | 2014-04-17 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| | * | | | | | | | | Use JS as content-type due to mimesniffing | Lukas Reschke | 2014-04-17 | 1 | -2/+2 |
| * | | | | | | | | | Merge pull request #8205 from owncloud/fix-8202 | Morris Jobke | 2014-04-17 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | remove unneeded LOWER. Fixes #8202 | Victor Dubiniuk | 2014-04-14 | 1 | -1/+1 |
| * | | | | | | | | | | Merge pull request #8222 from owncloud/type-hinting | Morris Jobke | 2014-04-17 | 14 | -18/+55 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Fix PHPdoc in lib/public | Bart Visscher | 2014-04-15 | 3 | -1/+13 |
| | * | | | | | | | | | | Fix PHPdoc in lib/private | Bart Visscher | 2014-04-15 | 11 | -17/+42 |
| | | |_|/ / / / / / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #8246 from Gared/master | Morris Jobke | 2014-04-17 | 1 | -19/+21 |
| |\ \ \ \ \ \ \ \ \ \ |