summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #13963 from RealRancor/external_user_noteMorris Jobke2015-02-071-3/+3
|\ | | | | external user app: Add note to enable it first
| * external user app: Add note to enable it firstRealRancor2015-02-071-3/+3
|/
* Merge pull request #12283 from oparoz/sfnt-fontsMorris Jobke2015-02-074-84/+218
|\ | | | | Updated the media type of some font types
| * Updated the media type of some font typesOlivier Paroz2015-01-244-84/+218
| | | | | | | | | | | | | | | | TTF and TTF have now the same media type Official since 2013 and supported by Firefox and Chrome https://www.iana.org/assignments/media-types/application/font-sfnt Introducing support for Type1 fonts
* | Merge pull request #13435 from Zillode/app-faviconMorris Jobke2015-02-073-6/+6
|\ \ | | | | | | Allow application-specific favicons
| * | Allow application-specific faviconsLode Hoste2015-01-183-6/+6
| | |
* | | Merge pull request #13502 from owncloud/streamline-authentication-in-newfileMorris Jobke2015-02-071-6/+3
|\ \ \ | | | | | | | | Streamline CSRF and login check
| * | | Streamline CSRF and login checkLukas Reschke2015-01-201-6/+3
| | | | | | | | | | | | | | | | Let's make this consistent with other pieces of the code to make it easier to auditable.
* | | | Merge pull request #13655 from Sugaroverdose/fix_#13632Morris Jobke2015-02-072-2/+11
|\ \ \ \ | | | | | | | | | | Do not change color of 'new' button on hover and make new file menu more consistent with button
| * | | | Prevent 1px padding between button and dropdown in ie11 when zoomingSugaroverdose2015-01-281-1/+1
| | | | |
| * | | | Play with z-index to make proper dropdown overlapSugaroverdose2015-01-282-1/+8
| | | | |
| * | | | Fix #13632 and make new file menu more consistent with buttonSugaroverdose2015-01-251-1/+3
| | | | |
* | | | | Merge pull request #13753 from owncloud/use-403-instead-of-200Morris Jobke2015-02-072-5/+5
|\ \ \ \ \ | | | | | | | | | | | | Use 403 instead of 200 response
| * | | | | Use 403 instead of 200 responseLukas Reschke2015-01-292-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | A forbidden should throw a 403 and this makes it easier for me to do some automated testing.
* | | | | | Merge pull request #13830 from owncloud/fix-redirect-404Morris Jobke2015-02-071-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Don't encode url unecessary twice
| * | | | | | Don't encode url unecessary twiceLukas Reschke2015-02-021-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The URL was previously encoded twice which leads to getting redirected to a 404 page when the password has been entered incorrect at least once. Testplan: - [ ] Opening `http://localhost/core/index.php?redirect_url=%2Fcore%2Findex.php%2Fsettings%2Fadmin` redirects to the admin page when providing the correct credentials - [ ] Opening `http://localhost/core/index.php?redirect_url=%2Fcore%2Findex.php%2Fsettings%2Fadmin` redirects to the admin page when providing the invalid credentials and then providing valid ones. - [ ] Logging in as admin then going to the admin page and clearing the cookies and refreshing will show the login and when repeating the above test steps you're redirected correctly. Fixes https://github.com/owncloud/core/issues/9804
* | | | | | | Merge pull request #13848 from owncloud/ldap-warnMorris Jobke2015-02-071-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Reduce log level of bind failed to WARN - fixes #11624
| * | | | | | | Reduce log level of bind failed to WARN - fixes #11624Morris Jobke2015-02-031-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #13889 from owncloud/catch-exceptionMorris Jobke2015-02-072-8/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Catch exception properly
| * | | | | | | | Catch exception properlyLukas Reschke2015-02-042-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `\OCA\Files\Helper::buildFileStorageStatistics` might throw an exception from `OC_Helper::getStorageInfo`, previously this lead to a uncatched exception being thrown when invoking this methods. This was user triggable by for example calling `/index.php/apps/files/ajax/delete.php` with a not existing dir (for example `dir=asdf/../&allfiles=true`)
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-0722-48/+158
| | | | | | | | |
* | | | | | | | | 8.0 finalv8.0.0Frank Karlitschek2015-02-061-2/+2
| | | | | | | | |
* | | | | | | | | Merge pull request #13960 from owncloud/revert-13692-capabilitiesLukas Reschke2015-02-073-280/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert "Add OCS sharing info to capabilities"
| * | | | | | | | | Revert "Add OCS sharing info to capabilities"Lukas Reschke2015-02-073-280/+0
|/ / / / / / / / /
* | | | | | | | | Merge pull request #13692 from rullzer/capabilitiesFrank Karlitschek2015-02-063-0/+280
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add OCS sharing info to capabilities
| * | | | | | | | | Updated unit testsRoeland Jago Douma2015-02-061-43/+123
| | | | | | | | | |
| * | | | | | | | | Bit better formatting when using json outputRoeland Jago Douma2015-02-061-2/+4
| | | | | | | | | |
| * | | | | | | | | Updated sharing capabilitiesRoeland Jago Douma2015-02-061-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved to files_sharing Added more capabilities. Tried to order to capabilities more OO style
| * | | | | | | | | Split up unit testsRoeland Jago Douma2015-02-041-16/+24
| | | | | | | | | |
| * | | | | | | | | Added unit test to test getCapabilities for files_sharingRoeland Jago Douma2015-02-041-0/+113
| | | | | | | | | |
| * | | | | | | | | Converted getCapabilities to non static functionRoeland Jago Douma2015-02-041-7/+24
| | | | | | | | | |
| * | | | | | | | | Use single quotesRoeland Jago Douma2015-02-041-7/+7
| | | | | | | | | |
| * | | | | | | | | Only return capabilities if they are setRoeland Jago Douma2015-02-041-14/+8
| | | | | | | | | |
| * | | | | | | | | Added capabilities whether a server allows public linksRoeland Jago Douma2015-02-042-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes #13673. It now lists link sharing, passwords enforced, and if public uploads are allowed.
* | | | | | | | | | Merge pull request #13954 from owncloud/fix-enc-mig-user-retrievalThomas Müller2015-02-062-7/+18
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix enc mig user retrieval
| * | | | | | | | | | always specify limit, except you do like questionable surprisesArthur Schiwon2015-02-062-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | always specify limit, except you do like questionable surprises, part 2
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-0670-296/+420
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #13952 from owncloud/fix_migrationFrank Karlitschek2015-02-061-5/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [encryption] don't check if we have a valid user during migration
| * | | | | | | | | | | don't check if we have a valid userBjoern Schiessle2015-02-061-5/+1
| |/ / / / / / / / / /
* / / / / / / / / / / Normalize before processingLukas Reschke2015-02-064-8/+51
|/ / / / / / / / / /
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-0626-16/+70
| | | | | | | | | |
* | | | | | | | | | Merge pull request #13937 from cmeh/patch-1Thomas Müller2015-02-061-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Coherent use of "SQLite" in lines 119 and 124
| * | | | | | | | | | Coherent use of "SQLite" in lines 119 and 124cmeh2015-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just a cosmetic detail, but very obvious when working on localisations.
* | | | | | | | | | | Merge pull request #13942 from cmeh/patch-2Thomas Müller2015-02-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Coherent use of "SQLite" in lines 159 and 161
| * | | | | | | | | | | Update installation.phpcmeh2015-02-061-1/+1
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | In line 161, "SQLite" has now the same capitalisation as in line 159.
* | | | | | | | | | | Merge pull request #13932 from owncloud/revert-sabredav-etag-masterThomas Müller2015-02-063-20/+15
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | Revert "adding OC-ETag header"
| * | | | | | | | | | Revert "adding OC-ETag header"Vincent Petry2015-02-053-20/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 96a931929ea837a40a7e9b836252587c949a8127.
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-06164-288/+398
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #13933 from owncloud/enhance-sqlite-warning-2Thomas Müller2015-02-052-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Don't highly discourage
| * | | | | | | | | | | Don't highly discourageThomas Müller2015-02-052-2/+2
|/ / / / / / / / / / /