summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* remove metadataMorris Jobke2014-04-255-45/+0
|
* use trash as delete icon to differentiate from closeJan-Christoph Borchardt2014-04-254-11/+3
|
* compress view-close iconJan-Christoph Borchardt2014-04-251-54/+11
|
* improve upload and download iconsJan-Christoph Borchardt2014-04-224-6/+21
|
* improve delete and close iconsJan-Christoph Borchardt2014-04-226-12/+73
|
* thinner add iconJan-Christoph Borchardt2014-04-222-3/+11
|
* Merge pull request #8283 from owncloud/translatable-max-in-uploadJörn Friedrich Dreyer2014-04-222-2/+2
|\ | | | | make max. text translatable
| * 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 public
| * | 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 fixes
| * | | 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
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use direct link instead of JS * owncloud/correct-link: Link to previous directory Use direct link instead of JS
| * | | | Link to previous directoryLukas Reschke2014-04-161-2/+2
| | | | |
| * | | | Use direct link instead of JSLukas Reschke2014-04-141-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-showAndreas Fischer2014-04-201-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change from showHTML to show * owncloud/change-to-show: Change from showHTML to show
| * | | | | Change from showHTML to showLukas Reschke2014-04-111-1/+1
| | | | | | | | | | | | | | | | | | There is no need to use `showHTML` here.
* | | | | | Merge pull request #8277 from owncloud/add-type-hintsAndreas Fischer2014-04-201-11/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add type hinting * owncloud/add-type-hints: Add type hinting
| * | | | | | 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 menu
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix PHPdoc in user_ldap
| * | | | | | Add missing param hintBart Visscher2014-04-161-0/+1
| | | | | | |
| * | | | | | Fix PHPdoc in user_ldapBart Visscher2014-04-156-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | using scrutinizer patch
* | | | | | | Merge pull request #8249 from owncloud/correct-mMorris Jobke2014-04-171-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use JS as content-type due to mimesniffing
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add one more LOWER.
| * | | | | | | | remove unneeded LOWER. Fixes #8202Victor Dubiniuk2014-04-141-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #8222 from owncloud/type-hintingMorris Jobke2014-04-1714-18/+55
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Type hinting fixes
| * | | | | | | | | Fix PHPdoc in lib/publicBart Visscher2014-04-153-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using scrutinizer patch
| * | | | | | | | | Fix PHPdoc in lib/privateBart Visscher2014-04-1511-17/+42
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | using scrutinizer patch
* | | | | | | | | Merge pull request #8246 from Gared/masterMorris Jobke2014-04-171-19/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix javascript error in calendar app
| * | | | | | | | | Fix javascript error in calendar appStefan2014-04-161-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-fixMorris Jobke2014-04-172-36/+49
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | remove duplication of header and 'header-right' element, also ellipsize when too wide
| * | | | | | | | | | 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
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | wide
* | | | | | | | | | Merge pull request #8189 from Xenopathic/misc_fixesRobin McCorkell2014-04-173-16/+20
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Various fixes
| * | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `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