Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #13963 from RealRancor/external_user_note | Morris Jobke | 2015-02-07 | 1 | -3/+3 |
|\ | | | | | external user app: Add note to enable it first | ||||
| * | external user app: Add note to enable it first | RealRancor | 2015-02-07 | 1 | -3/+3 |
|/ | |||||
* | Merge pull request #12283 from oparoz/sfnt-fonts | Morris Jobke | 2015-02-07 | 4 | -84/+218 |
|\ | | | | | Updated the media type of some font types | ||||
| * | Updated the media type of some font types | Olivier Paroz | 2015-01-24 | 4 | -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-favicon | Morris Jobke | 2015-02-07 | 3 | -6/+6 |
|\ \ | | | | | | | Allow application-specific favicons | ||||
| * | | Allow application-specific favicons | Lode Hoste | 2015-01-18 | 3 | -6/+6 |
| | | | |||||
* | | | Merge pull request #13502 from owncloud/streamline-authentication-in-newfile | Morris Jobke | 2015-02-07 | 1 | -6/+3 |
|\ \ \ | | | | | | | | | Streamline CSRF and login check | ||||
| * | | | Streamline CSRF and login check | Lukas Reschke | 2015-01-20 | 1 | -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_#13632 | Morris Jobke | 2015-02-07 | 2 | -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 zooming | Sugaroverdose | 2015-01-28 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Play with z-index to make proper dropdown overlap | Sugaroverdose | 2015-01-28 | 2 | -1/+8 |
| | | | | | |||||
| * | | | | Fix #13632 and make new file menu more consistent with button | Sugaroverdose | 2015-01-25 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | Merge pull request #13753 from owncloud/use-403-instead-of-200 | Morris Jobke | 2015-02-07 | 2 | -5/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | Use 403 instead of 200 response | ||||
| * | | | | | Use 403 instead of 200 response | Lukas Reschke | 2015-01-29 | 2 | -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-404 | Morris Jobke | 2015-02-07 | 1 | -2/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Don't encode url unecessary twice | ||||
| * | | | | | | Don't encode url unecessary twice | Lukas Reschke | 2015-02-02 | 1 | -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-warn | Morris Jobke | 2015-02-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Reduce log level of bind failed to WARN - fixes #11624 | ||||
| * | | | | | | | Reduce log level of bind failed to WARN - fixes #11624 | Morris Jobke | 2015-02-03 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #13889 from owncloud/catch-exception | Morris Jobke | 2015-02-07 | 2 | -8/+18 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Catch exception properly | ||||
| * | | | | | | | | Catch exception properly | Lukas Reschke | 2015-02-04 | 2 | -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 transifex | Jenkins for ownCloud | 2015-02-07 | 22 | -48/+158 |
| | | | | | | | | | |||||
* | | | | | | | | | 8.0 finalv8.0.0 | Frank Karlitschek | 2015-02-06 | 1 | -2/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #13960 from owncloud/revert-13692-capabilities | Lukas Reschke | 2015-02-07 | 3 | -280/+0 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Revert "Add OCS sharing info to capabilities" | ||||
| * | | | | | | | | | Revert "Add OCS sharing info to capabilities" | Lukas Reschke | 2015-02-07 | 3 | -280/+0 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge pull request #13692 from rullzer/capabilities | Frank Karlitschek | 2015-02-06 | 3 | -0/+280 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add OCS sharing info to capabilities | ||||
| * | | | | | | | | | Updated unit tests | Roeland Jago Douma | 2015-02-06 | 1 | -43/+123 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Bit better formatting when using json output | Roeland Jago Douma | 2015-02-06 | 1 | -2/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Updated sharing capabilities | Roeland Jago Douma | 2015-02-06 | 1 | -9/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved to files_sharing Added more capabilities. Tried to order to capabilities more OO style | ||||
| * | | | | | | | | | Split up unit tests | Roeland Jago Douma | 2015-02-04 | 1 | -16/+24 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Added unit test to test getCapabilities for files_sharing | Roeland Jago Douma | 2015-02-04 | 1 | -0/+113 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Converted getCapabilities to non static function | Roeland Jago Douma | 2015-02-04 | 1 | -7/+24 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Use single quotes | Roeland Jago Douma | 2015-02-04 | 1 | -7/+7 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Only return capabilities if they are set | Roeland Jago Douma | 2015-02-04 | 1 | -14/+8 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Added capabilities whether a server allows public links | Roeland Jago Douma | 2015-02-04 | 2 | -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-retrieval | Thomas Müller | 2015-02-06 | 2 | -7/+18 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix enc mig user retrieval | ||||
| * | | | | | | | | | | always specify limit, except you do like questionable surprises | Arthur Schiwon | 2015-02-06 | 2 | -7/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | always specify limit, except you do like questionable surprises, part 2 | ||||
* | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-06 | 70 | -296/+420 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #13952 from owncloud/fix_migration | Frank Karlitschek | 2015-02-06 | 1 | -5/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [encryption] don't check if we have a valid user during migration | ||||
| * | | | | | | | | | | | don't check if we have a valid user | Bjoern Schiessle | 2015-02-06 | 1 | -5/+1 |
| |/ / / / / / / / / / | |||||
* / / / / / / / / / / | Normalize before processing | Lukas Reschke | 2015-02-06 | 4 | -8/+51 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-06 | 26 | -16/+70 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #13937 from cmeh/patch-1 | Thomas Müller | 2015-02-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Coherent use of "SQLite" in lines 119 and 124 | ||||
| * | | | | | | | | | | Coherent use of "SQLite" in lines 119 and 124 | cmeh | 2015-02-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just a cosmetic detail, but very obvious when working on localisations. | ||||
* | | | | | | | | | | | Merge pull request #13942 from cmeh/patch-2 | Thomas Müller | 2015-02-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Coherent use of "SQLite" in lines 159 and 161 | ||||
| * | | | | | | | | | | | Update installation.php | cmeh | 2015-02-06 | 1 | -1/+1 |
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | In line 161, "SQLite" has now the same capitalisation as in line 159. | ||||
* | | | | | | | | | | | Merge pull request #13932 from owncloud/revert-sabredav-etag-master | Thomas Müller | 2015-02-06 | 3 | -20/+15 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | Revert "adding OC-ETag header" | ||||
| * | | | | | | | | | | Revert "adding OC-ETag header" | Vincent Petry | 2015-02-05 | 3 | -20/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 96a931929ea837a40a7e9b836252587c949a8127. | ||||
* | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-06 | 164 | -288/+398 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #13933 from owncloud/enhance-sqlite-warning-2 | Thomas Müller | 2015-02-05 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Don't highly discourage | ||||
| * | | | | | | | | | | | Don't highly discourage | Thomas Müller | 2015-02-05 | 2 | -2/+2 |
|/ / / / / / / / / / / |