Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #13852 from owncloud/cache-app-versions | Vincent Petry | 2015-02-09 | 1 | -2/+7 |
|\ | | | | | Cache app versions | ||||
| * | clear app version cache on upgrade | Robin Appelman | 2015-02-03 | 1 | -0/+1 |
| | | |||||
| * | Cache app versions | Robin Appelman | 2015-02-03 | 1 | -2/+6 |
| | | |||||
* | | Merge pull request #13870 from owncloud/drop-oc-preferences-2 | Vincent Petry | 2015-02-09 | 1 | -181/+0 |
|\ \ | | | | | | | drop OC\Preferences | ||||
| * | | drop OC\Preferences | Morris Jobke | 2015-02-04 | 1 | -181/+0 |
| | | | |||||
* | | | Merge pull request #13869 from owncloud/drop-oc-preferences | Vincent Petry | 2015-02-09 | 2 | -122/+0 |
|\ \ \ | | | | | | | | | drop OC_Preferences | ||||
| * | | | drop OC_Preferences | Morris Jobke | 2015-02-04 | 2 | -122/+0 |
| |/ / | |||||
* | | | Merge pull request #13973 from owncloud/enhancement/security/13366 | Lukas Reschke | 2015-02-09 | 6 | -29/+53 |
|\ \ \ | | | | | | | | | Respect `mod_unique_id` and refactor `OC_Request::getRequestId` | ||||
| * | | | Respect `mod_unique_id` and refactor `OC_Request::getRequestId` | Lukas Reschke | 2015-02-09 | 6 | -29/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `mod_unique_id` is enabled the ID generated by it will be used for logging. This allows for correlation of the Apache logs and the ownCloud logs. Testplan: - [ ] When `mod_unique_id` is enabled the request ID equals the one generated by `mod_unique_id`. - [ ] When `mod_unique_id` is not available the request ID is a 20 character long random string - [ ] The generated Id is stable over the lifespan of one request Changeset looks a little bit larger since I had to adjust every unit test using the HTTP\Request class for proper DI. Fixes https://github.com/owncloud/core/issues/13366 | ||||
* | | | | Merge pull request #13854 from owncloud/avatar-exists | Vincent Petry | 2015-02-09 | 3 | -6/+17 |
|\ \ \ \ | | | | | | | | | | | Add a better way to check if an avatar exists for the user | ||||
| * | | | | Add a better way to check if an avatar exists for the user | Robin Appelman | 2015-02-03 | 3 | -6/+17 |
| | | | | | |||||
* | | | | | Check directory handle before we use it | Robin Appelman | 2015-02-09 | 1 | -6/+8 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-09 | 2 | -0/+2 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #13948 from owncloud/cache-move-transaction | Lukas Reschke | 2015-02-08 | 1 | -0/+2 |
|\ \ \ \ | | | | | | | | | | | Use transactions when renaming directory contents | ||||
| * | | | | Use transactions when renaming directory contents | Robin Appelman | 2015-02-06 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-08 | 4 | -2/+6 |
| | | | | | |||||
* | | | | | Merge pull request #12283 from oparoz/sfnt-fonts | Morris Jobke | 2015-02-07 | 3 | -84/+113 |
|\ \ \ \ \ | | | | | | | | | | | | | Updated the media type of some font types | ||||
| * | | | | | Updated the media type of some font types | Olivier Paroz | 2015-01-24 | 3 | -84/+113 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #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 | ||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-07 | 2 | -4/+32 |
| | | | | | | | |||||
* | | | | | | | Normalize before processing | Lukas Reschke | 2015-02-06 | 2 | -8/+20 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | 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 | 6 | -20/+50 |
| | | | | | | |||||
* | | | | | | Merge pull request #13881 from owncloud/upload_to_root_of_mountpoint | Björn Schießle | 2015-02-04 | 1 | -0/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | detect root of mountpoint also if the trailing slash is missed | ||||
| * | | | | | | detect root of mountpoint also if the trailing slash is missed | Bjoern Schiessle | 2015-02-04 | 1 | -0/+5 |
| |/ / / / / | |||||
* | | | / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-04 | 2 | -4/+32 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge pull request #13843 from owncloud/fix-files-disabled | Thomas Müller | 2015-02-03 | 4 | -0/+59 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix disabled files app | ||||
| * | | | | enabled disabled files app in repair step | Morris Jobke | 2015-02-03 | 4 | -2/+54 |
| | | | | | |||||
| * | | | | Disallow disabling of files app | Morris Jobke | 2015-02-03 | 2 | -0/+7 |
| | | | | | |||||
* | | | | | Merge pull request #13791 from owncloud/extstorage-fixdavexceptions | Thomas Müller | 2015-02-03 | 1 | -0/+22 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Fix DAV exceptions, some will still return false now | ||||
| * | | | | Fix DAV exceptions, some will still return false now | Vincent Petry | 2015-01-30 | 1 | -0/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the Storage interface isn't ready to work directly with exceptions like Forbidden and NotFound, the DAV storage has been adapted to still return false when expected. | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-03 | 4 | -28/+56 |
| |_|/ / |/| | | | |||||
* | | | | Merge pull request #13822 from owncloud/include-core-version-in-js-version-tag | Thomas Müller | 2015-02-02 | 1 | -2/+4 |
|\ \ \ \ | |_|/ / |/| | | | include core version into js/css version tag | ||||
| * | | | include core version into js/css version tag - fixes #13702 | Thomas Müller | 2015-02-02 | 1 | -2/+4 |
| | | | | |||||
* | | | | Merge pull request #13817 from owncloud/core-apps-dependencies | Morris Jobke | 2015-02-02 | 1 | -4/+1 |
|\ \ \ \ | |/ / / |/| | | | encryption requires openssl and user_ldap requires ldap :speak_no_evil: | ||||
| * | | | add libs which have no version number | Thomas Müller | 2015-02-02 | 1 | -4/+1 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-02 | 4 | -6/+10 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-01 | 2 | -0/+4 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-31 | 4 | -44/+48 |
|/ / / | |||||
* | | | Merge pull request #13508 from owncloud/failed-delete-cache | Morris Jobke | 2015-01-30 | 1 | -3/+3 |
|\ \ \ | |/ / |/| | | Dont remove a file from cache if the delete operation failed | ||||
| * | | Dont do a cache rename if we cant delete the source file | Robin Appelman | 2015-01-29 | 1 | -2/+2 |
| | | | |||||
| * | | Dont remove a file from cache if the delete operation failed | Robin Appelman | 2015-01-29 | 1 | -1/+1 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-30 | 8 | -6/+12 |
| | | | |||||
* | | | Merge pull request #13772 from owncloud/closecursor-allconfig | Vincent Petry | 2015-01-29 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Close cursor after checking for existing config values | ||||
| * | | | Close cursor after checking for existing config values | Vincent Petry | 2014-11-28 | 1 | -0/+1 |
| |/ / | |||||
* | | | Merge pull request #13760 from owncloud/create_enc_key_for_remote_shares | Morris Jobke | 2015-01-29 | 1 | -9/+27 |
|\ \ \ | |/ / |/| | | make sure that we always create a public share key for remote shares | ||||
| * | | make sure that we always create a public share key for remote shares | Bjoern Schiessle | 2015-01-29 | 1 | -9/+27 |
| | | | |||||
* | | | Merge pull request #13757 from ↵ | Lukas Reschke | 2015-01-29 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | owncloud/issue/13686-scroll-to-file-when-using-searchotherplaces Scroll to file in folder, when using "search in other places" link |