Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove metadata | Morris Jobke | 2014-04-25 | 5 | -45/+0 |
| | |||||
* | use trash as delete icon to differentiate from close | Jan-Christoph Borchardt | 2014-04-25 | 4 | -11/+3 |
| | |||||
* | compress view-close icon | Jan-Christoph Borchardt | 2014-04-25 | 1 | -54/+11 |
| | |||||
* | improve upload and download icons | Jan-Christoph Borchardt | 2014-04-22 | 4 | -6/+21 |
| | |||||
* | improve delete and close icons | Jan-Christoph Borchardt | 2014-04-22 | 6 | -12/+73 |
| | |||||
* | thinner add icon | Jan-Christoph Borchardt | 2014-04-22 | 2 | -3/+11 |
| | |||||
* | Merge pull request #8283 from owncloud/translatable-max-in-upload | Jörn Friedrich Dreyer | 2014-04-22 | 2 | -2/+2 |
|\ | | | | | make max. text translatable | ||||
| * | 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 | ||||
| * | | 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 | ||||
| * | | | 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 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Keep cached urls with different hostnames or baseurls seperate * owncloud/routing-cache-webroot: Sort parameters and cast to int add delimiter between host and baseurl Keep cached urls with different hostnames or baseurls seperate | ||||
| * | | 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 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use direct link instead of JS * owncloud/correct-link: Link to previous directory Use direct link instead of JS | ||||
| * | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to our CSP policy this link won’t work as it it considered as inline Javascript. This commit replaces the link with a static link to the files app. Reimplementation of #8067 - fixes #7742 | ||||
* | | | | | Merge pull request #8169 from owncloud/change-to-show | Andreas Fischer | 2014-04-20 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change from showHTML to show * owncloud/change-to-show: Change from showHTML to show | ||||
| * | | | | | Change from showHTML to show | Lukas Reschke | 2014-04-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | There is no need to use `showHTML` here. | ||||
* | | | | | | Merge pull request #8277 from owncloud/add-type-hints | Andreas Fischer | 2014-04-20 | 1 | -11/+11 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add type hinting * owncloud/add-type-hints: Add type hinting | ||||
| * | | | | | | 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 | ||||
| * | | | | | 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 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix PHPdoc in user_ldap | ||||
| * | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | using scrutinizer patch | ||||
* | | | | | | | Merge pull request #8249 from owncloud/correct-m | Morris Jobke | 2014-04-17 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Use JS as content-type due to mimesniffing | ||||
| * | | | | | | | 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 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add one more LOWER. | ||||
| * | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Type hinting fixes | ||||
| * | | | | | | | | | Fix PHPdoc in lib/public | Bart Visscher | 2014-04-15 | 3 | -1/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using scrutinizer patch | ||||
| * | | | | | | | | | Fix PHPdoc in lib/private | Bart Visscher | 2014-04-15 | 11 | -17/+42 |
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | using scrutinizer patch | ||||
* | | | | | | | | | Merge pull request #8246 from Gared/master | Morris Jobke | 2014-04-17 | 1 | -19/+21 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix javascript error in calendar app | ||||
| * | | | | | | | | | Fix javascript error in calendar app | Stefan | 2014-04-16 | 1 | -19/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix owncloud/calendar#409 If you haven't allowed to share items per email the element "email" will never appear and you will get a null exception. License: WTFPL | ||||
* | | | | | | | | | | Merge pull request #8236 from owncloud/header-right-fix | Morris Jobke | 2014-04-17 | 2 | -36/+49 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | remove duplication of header and 'header-right' element, also ellipsize when too wide | ||||
| * | | | | | | | | | | fix header code duplication, code style fixes | Jan-Christoph Borchardt | 2014-04-16 | 2 | -21/+28 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | remove duplication of 'header-right' element, also make it overflow when too ↵ | Jan-Christoph Borchardt | 2014-04-16 | 2 | -16/+22 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | wide | ||||
* | | | | | | | | | | Merge pull request #8189 from Xenopathic/misc_fixes | Robin McCorkell | 2014-04-17 | 3 | -16/+20 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Various fixes | ||||
| * | | | | | | | | | | Fix user_ldap default setting value | Robin McCorkell | 2014-04-13 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Prevent error from cache update on deleted files | Robin McCorkell | 2014-04-13 | 1 | -1/+5 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Prevent error in files_trashbin | Robin McCorkell | 2014-04-13 | 1 | -7/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `glob` can return FALSE when the directory is empty, instead of an empty array, causing an error at `foreach`. "Note: On some systems it is impossible to distinguish between empty match and an error." See http://www.php.net/manual/en/function.glob.php -> Return Values |