Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Deprecate getEditionString() | Joas Schilling | 2016-09-06 | 4 | -20/+5 |
| | |||||
* | Merge pull request #1284 from nextcloud/allow-status.php-before-install | Roeland Jago Douma | 2016-09-06 | 1 | -1/+1 |
|\ | | | | | Allow status.php before install | ||||
| * | Allow to call status.php before the instance is installed | Joas Schilling | 2016-09-06 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1275 from nextcloud/OCS_forward_headers_cleanup | Morris Jobke | 2016-09-06 | 7 | -51/+311 |
|\ \ | | | | | | | Internal OCS Controller cleanup | ||||
| * | | Fix autoloader | Roeland Jago Douma | 2016-09-06 | 2 | -0/+6 |
| | | | |||||
| * | | Split OCS version handling | Roeland Jago Douma | 2016-09-06 | 5 | -51/+305 |
| |/ | | | | | | | | | | | This cleans up a bit the OCSController/Middleware. Since the 2 versions of OCS differ a bit. Moved a lot of stuff internal since it is of no concern to the outside. | ||||
* | | Merge pull request #1235 from ↵ | Morris Jobke | 2016-09-06 | 1 | -1/+9 |
|\ \ | |/ |/| | | | | | nextcloud/issue-1192-move-navigation-entries-without-order-to-the-end Move navigation entries without order to the end | ||||
| * | Move navigation entries without order to the end | Joas Schilling | 2016-09-02 | 1 | -1/+9 |
| | | |||||
* | | Update autoloader | Roeland Jago Douma | 2016-09-05 | 2 | -0/+2 |
| | | |||||
* | | Add FileDisplayResponse | Roeland Jago Douma | 2016-09-05 | 1 | -0/+70 |
| | | | | | | | | | | A lazy implementation of the DisplayResponse that only hits the filesystem if the etag and mtime do not match. | ||||
* | | Merge pull request #1158 from nextcloud/cache_avatars | Lukas Reschke | 2016-09-05 | 5 | -6/+26 |
|\ \ | | | | | | | Cache avatars | ||||
| * | | Cache avatars properly | Roeland Jago Douma | 2016-08-30 | 5 | -6/+26 |
| | | | | | | | | | | | | | | | * Set proper caching headers for avatars (15 minutes) * For our own avatar use some extra logic to invalidate when we update | ||||
* | | | Merge pull request #1271 from nextcloud/fix-docs-for-notifications | Joas Schilling | 2016-09-05 | 3 | -7/+0 |
|\ \ \ | | | | | | | | | Null !== void, those methods are void | ||||
| * | | | Null !== void, those methods are void | Joas Schilling | 2016-09-05 | 3 | -7/+0 |
| | | | | |||||
* | | | | Merge pull request #1259 from nextcloud/language_order | Joas Schilling | 2016-09-05 | 4 | -20/+65 |
|\ \ \ \ | | | | | | | | | | | ACCEPT_LANGUAGE goes before default_langauge | ||||
| * | | | | Autoloader update | Roeland Jago Douma | 2016-09-04 | 2 | -0/+2 |
| | | | | | |||||
| * | | | | ACCEPT_LANGUAGE goes before default_langauge | Roeland Jago Douma | 2016-09-04 | 2 | -20/+63 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/nextcloud/server/issues/970 Before we had 1. Users settings in personal settings 2. Admins default language settings 3. Accept-Language settings of the browser However this is not in line with https://www.w3.org/International/questions/qa-lang-priorities So this changes the order to 1. Users settings in personal settings 3. Accept-Language settings of the browser 2. Admins default language settings | ||||
* | | | | | Merge pull request #1171 from nextcloud/2fa-backup-codes | Marius Blüm | 2016-09-05 | 1 | -2/+18 |
|\ \ \ \ \ | | | | | | | | | | | | | add 2fa backup codes app | ||||
| * | | | | | add 2fa backup codes app | Christoph Wurst | 2016-09-05 | 1 | -2/+18 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | * add backup codes app unit tests * add integration tests for the backup codes app | ||||
* | | | | | Merge pull request #1269 from nextcloud/deprecate_ocs_response | Lukas Reschke | 2016-09-05 | 1 | -2/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Deprecate OCSRespone | ||||
| * | | | | | Deprecate OCSRespone | Roeland Jago Douma | 2016-09-05 | 1 | -2/+3 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | The OCSResponse should not be used by apps. They should extend the OCSController and use normal DataResponses instead. | ||||
* / / / / | Use proper ALTER ROLE syntax | Roeland Jago Douma | 2016-09-05 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | Fixes #1260 See https://www.postgresql.org/docs/9.0/static/sql-alterrole.html | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-09-05 | 4 | -4/+48 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-09-04 | 4 | -0/+24 |
|/ / / | |||||
* | | | Merge pull request #1225 from nextcloud/allow-to-validate-password-policy | Roeland Jago Douma | 2016-09-02 | 1 | -3/+9 |
|\ \ \ | | | | | | | | | Allow to validate the password_policy app | ||||
| * | | | Allow to validate the password_policy app | Joas Schilling | 2016-09-01 | 1 | -3/+9 |
| | |/ | |/| | |||||
* | | | Cache parsing of info.xml | Roeland Jago Douma | 2016-09-02 | 1 | -2/+11 |
| | | | |||||
* | | | Merge pull request #1221 from nextcloud/proper_204_304_response | Morris Jobke | 2016-09-01 | 1 | -5/+14 |
|\ \ \ | | | | | | | | | No body or content-length for 204 and 304 responses | ||||
| * | | | No body or content-length for 204 and 304 responses | Roeland Jago Douma | 2016-08-31 | 1 | -5/+14 |
| | | | | | | | | | | | | | | | | See: https://tools.ietf.org/html/rfc7230#section-3.3 | ||||
* | | | | Merge pull request #1227 from nextcloud/improve-tests | Joas Schilling | 2016-09-01 | 1 | -17/+0 |
|\ \ \ \ | | | | | | | | | | | Improve tests | ||||
| * | | | | Remove unneeded Windows logic | Morris Jobke | 2016-09-01 | 1 | -17/+0 |
| | |/ / | |/| | | |||||
* / | | | Activate APCu on PHP 7 | Morris Jobke | 2016-09-01 | 1 | -2/+30 |
|/ / / | | | | | | | | | | | | | | | | Fix an issue with APCus inc and dec methods on PHP 7 see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221 for details | ||||
* / / | [tx-robot] updated from transifex | Nextcloud bot | 2016-09-01 | 10 | -6/+112 |
|/ / | |||||
* | | Merge pull request #797 from nextcloud/only-match-for-auth-cookie | Joas Schilling | 2016-08-31 | 1 | -2/+15 |
|\ \ | | | | | | | Match only for actual session cookie | ||||
| * | | Match only for actual session cookie | Lukas Reschke | 2016-08-09 | 1 | -2/+15 |
| | | | | | | | | | | | | OVH has implemented load balancing in a very questionable way where the reverse proxy actually internally adds some cookies which would trigger a security exception. To work around this, this change only checks for the session cookie. | ||||
* | | | Merge pull request #1201 from nextcloud/usermountcache-orphanedshare | Roeland Jago Douma | 2016-08-31 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | [master] Usermountcache orphanedshare | ||||
| * | | | Prevent error with orphaned shares when updating user mount cache | Vincent Petry | 2016-08-30 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge pull request #608 from nextcloud/small-encryption-improvement | Joas Schilling | 2016-08-31 | 1 | -0/+4 |
|\ \ \ \ | |/ / / |/| | | | skip shared files, if files get decrypted only for a specific user we… | ||||
| * | | | skip shared files, if files get decrypted only for a specific user we ↵ | Bjoern Schiessle | 2016-07-27 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | shouldn't touch files owned by a different user. | ||||
* | | | | Merge pull request #1087 from nextcloud/get-delay-twice | Lukas Reschke | 2016-08-30 | 2 | -3/+5 |
|\ \ \ \ | | | | | | | | | | | dont get bruteforce delay twice | ||||
| * | | | | dont get bruteforce delay twice | Robin Appelman | 2016-08-29 | 2 | -3/+5 |
| | | | | | |||||
* | | | | | Short circuit processing of the heartbeat request | Robin Appelman | 2016-08-30 | 1 | -0/+3 |
| | | | | | |||||
* | | | | | Merge pull request #1089 from nextcloud/allow-to-prevent-previews | Roeland Jago Douma | 2016-08-30 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Check if the file isReadable() before sending a (cached) preview | ||||
| * | | | | Check if the file isReadable() before sending a (cached) preview | Joas Schilling | 2016-08-29 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #891 from nextcloud/us_25810 | Morris Jobke | 2016-08-30 | 1 | -2/+48 |
|\ \ \ \ | | | | | | | | | | | [OC] Fix unmerged shares repair targetdecision | ||||
| * | | | | Improve regexp to detect duplicate folders when repairing unmerged shares | Vincent Petry | 2016-08-17 | 1 | -8/+6 |
| | | | | | |||||
| * | | | | Fix unmerged shares repair with mixed group and direct shares | Vincent Petry | 2016-08-17 | 1 | -3/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever a group share is created after a direct share, the stime order needs to be properly considered in the repair routine, considering that the direct user share is appended to the $subShares array and breaking its order. | ||||
| * | | | | Improve file_target finding logic when repairing unmerged shares | Vincent Petry | 2016-08-17 | 1 | -1/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pick the most recent subshare that has no parenthesis from duplication which should match whichever name the user picked last. If all subshares have duplicate parenthesis names, use the least recent group share's target instead. | ||||
* | | | | | Merge pull request #1142 from nextcloud/fix-case-sensitive-settings | Roeland Jago Douma | 2016-08-29 | 1 | -0/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix issues where some user settings cannot be loaded when the user id… | ||||
| * | | | | | Fix issues where some user settings cannot be loaded when the user id ↵ | Thomas Müller | 2016-08-29 | 1 | -0/+10 |
| | |/ / / | |/| | | | | | | | | | | | | | differs in case sensitivity - fixes #25684 (#25686) |