summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #13852 from owncloud/cache-app-versionsVincent Petry2015-02-091-2/+7
|\ | | | | Cache app versions
| * clear app version cache on upgradeRobin Appelman2015-02-031-0/+1
| |
| * Cache app versionsRobin Appelman2015-02-031-2/+6
| |
* | Merge pull request #13870 from owncloud/drop-oc-preferences-2Vincent Petry2015-02-091-181/+0
|\ \ | | | | | | drop OC\Preferences
| * | drop OC\PreferencesMorris Jobke2015-02-041-181/+0
| | |
* | | Merge pull request #13869 from owncloud/drop-oc-preferencesVincent Petry2015-02-092-122/+0
|\ \ \ | | | | | | | | drop OC_Preferences
| * | | drop OC_PreferencesMorris Jobke2015-02-042-122/+0
| |/ /
* | | Merge pull request #13973 from owncloud/enhancement/security/13366Lukas Reschke2015-02-096-29/+53
|\ \ \ | | | | | | | | Respect `mod_unique_id` and refactor `OC_Request::getRequestId`
| * | | Respect `mod_unique_id` and refactor `OC_Request::getRequestId`Lukas Reschke2015-02-096-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-existsVincent Petry2015-02-093-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 userRobin Appelman2015-02-033-6/+17
| | | | |
* | | | | Check directory handle before we use itRobin Appelman2015-02-091-6/+8
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-092-0/+2
| |/ / / |/| | |
* | | | Merge pull request #13948 from owncloud/cache-move-transactionLukas Reschke2015-02-081-0/+2
|\ \ \ \ | | | | | | | | | | Use transactions when renaming directory contents
| * | | | Use transactions when renaming directory contentsRobin Appelman2015-02-061-0/+2
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-084-2/+6
| | | | |
* | | | | Merge pull request #12283 from oparoz/sfnt-fontsMorris Jobke2015-02-073-84/+113
|\ \ \ \ \ | | | | | | | | | | | | Updated the media type of some font types
| * | | | | Updated the media type of some font typesOlivier Paroz2015-01-243-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-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
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-072-4/+32
| | | | | | |
* | | | | | | Normalize before processingLukas Reschke2015-02-062-8/+20
| |_|/ / / / |/| | | | |
* | | | | | 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-066-20/+50
| | | | | |
* | | | | | Merge pull request #13881 from owncloud/upload_to_root_of_mountpointBjörn Schießle2015-02-041-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | detect root of mountpoint also if the trailing slash is missed
| * | | | | | detect root of mountpoint also if the trailing slash is missedBjoern Schiessle2015-02-041-0/+5
| |/ / / / /
* | | | / / [tx-robot] updated from transifexJenkins for ownCloud2015-02-042-4/+32
| |_|_|/ / |/| | | |
* | | | | Merge pull request #13843 from owncloud/fix-files-disabledThomas Müller2015-02-034-0/+59
|\ \ \ \ \ | |/ / / / |/| | | | Fix disabled files app
| * | | | enabled disabled files app in repair stepMorris Jobke2015-02-034-2/+54
| | | | |
| * | | | Disallow disabling of files appMorris Jobke2015-02-032-0/+7
| | | | |
* | | | | Merge pull request #13791 from owncloud/extstorage-fixdavexceptionsThomas Müller2015-02-031-0/+22
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fix DAV exceptions, some will still return false now
| * | | | Fix DAV exceptions, some will still return false nowVincent Petry2015-01-301-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 transifexJenkins for ownCloud2015-02-034-28/+56
| |_|/ / |/| | |
* | | | Merge pull request #13822 from owncloud/include-core-version-in-js-version-tagThomas Müller2015-02-021-2/+4
|\ \ \ \ | |_|/ / |/| | | include core version into js/css version tag
| * | | include core version into js/css version tag - fixes #13702Thomas Müller2015-02-021-2/+4
| | | |
* | | | Merge pull request #13817 from owncloud/core-apps-dependenciesMorris Jobke2015-02-021-4/+1
|\ \ \ \ | |/ / / |/| | | encryption requires openssl and user_ldap requires ldap :speak_no_evil:
| * | | add libs which have no version numberThomas Müller2015-02-021-4/+1
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-024-6/+10
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-012-0/+4
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-314-44/+48
|/ / /
* | | Merge pull request #13508 from owncloud/failed-delete-cacheMorris Jobke2015-01-301-3/+3
|\ \ \ | |/ / |/| | Dont remove a file from cache if the delete operation failed
| * | Dont do a cache rename if we cant delete the source fileRobin Appelman2015-01-291-2/+2
| | |
| * | Dont remove a file from cache if the delete operation failedRobin Appelman2015-01-291-1/+1
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-308-6/+12
| | |
* | | Merge pull request #13772 from owncloud/closecursor-allconfigVincent Petry2015-01-291-0/+1
|\ \ \ | | | | | | | | Close cursor after checking for existing config values
| * | | Close cursor after checking for existing config valuesVincent Petry2014-11-281-0/+1
| |/ /
* | | Merge pull request #13760 from owncloud/create_enc_key_for_remote_sharesMorris Jobke2015-01-291-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 sharesBjoern Schiessle2015-01-291-9/+27
| | |
* | | Merge pull request #13757 from ↵Lukas Reschke2015-01-291-1/+1
|\ \ \ | | | | | | | | | | | | | | | | owncloud/issue/13686-scroll-to-file-when-using-searchotherplaces Scroll to file in folder, when using "search in other places" link