Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Adding a optional disclaimer to the anonymous upload page | Morris Jobke | 2016-09-08 | 1 | -0/+12 |
| | |||||
* | fix tests | Morris Jobke | 2016-09-07 | 1 | -12/+12 |
| | |||||
* | Deprecate getEditionString() | Joas Schilling | 2016-09-06 | 2 | -2/+2 |
| | |||||
* | Merge pull request #1275 from nextcloud/OCS_forward_headers_cleanup | Morris Jobke | 2016-09-06 | 2 | -28/+85 |
|\ | | | | | Internal OCS Controller cleanup | ||||
| * | Split OCS version handling | Roeland Jago Douma | 2016-09-06 | 2 | -28/+85 |
| | | | | | | | | | | | | 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. | ||||
* | | Fix getMock share | Roeland Jago Douma | 2016-09-06 | 2 | -206/+219 |
| | | |||||
* | | Fix getMock Avatar | Roeland Jago Douma | 2016-09-06 | 1 | -13/+17 |
| | | |||||
* | | Fix getMock Authentication | Roeland Jago Douma | 2016-09-06 | 3 | -16/+22 |
|/ | |||||
* | Add FileDisplayResponse | Roeland Jago Douma | 2016-09-05 | 1 | -0/+109 |
| | | | | | 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 | 1 | -13/+29 |
|\ | | | | | Cache avatars | ||||
| * | Fix tests | Roeland Jago Douma | 2016-08-30 | 1 | -13/+29 |
| | | |||||
* | | Merge pull request #1259 from nextcloud/language_order | Joas Schilling | 2016-09-05 | 1 | -13/+97 |
|\ \ | | | | | | | ACCEPT_LANGUAGE goes before default_langauge | ||||
| * | | ACCEPT_LANGUAGE goes before default_langauge | Roeland Jago Douma | 2016-09-04 | 1 | -13/+97 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | Fix AppTest and intergration test | Roeland Jago Douma | 2016-09-05 | 1 | -2/+7 |
| | | | |||||
* | | | increase core version number to trigger db ugprade and fix app manager tests | Christoph Wurst | 2016-09-05 | 1 | -2/+14 |
| | | | |||||
* | | | add 2fa backup codes app | Christoph Wurst | 2016-09-05 | 1 | -12/+72 |
|/ / | | | | | | | | | * add backup codes app unit tests * add integration tests for the backup codes app | ||||
* | | Merge pull request #1221 from nextcloud/proper_204_304_response | Morris Jobke | 2016-09-01 | 1 | -1/+28 |
|\ \ | | | | | | | 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 | -1/+28 |
| | | | | | | | | | | | | See: https://tools.ietf.org/html/rfc7230#section-3.3 | ||||
* | | | Remove unneeded Windows logic | Morris Jobke | 2016-09-01 | 1 | -15/+0 |
|/ / | |||||
* | | Merge pull request #797 from nextcloud/only-match-for-auth-cookie | Joas Schilling | 2016-08-31 | 1 | -1/+77 |
|\ \ | | | | | | | Match only for actual session cookie | ||||
| * | | Match only for actual session cookie | Lukas Reschke | 2016-08-09 | 1 | -1/+77 |
| | | | | | | | | | | | | 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 #608 from nextcloud/small-encryption-improvement | Joas Schilling | 2016-08-31 | 1 | -3/+14 |
|\ \ \ | | | | | | | | | 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 | -3/+14 |
| | | | | | | | | | | | | | | | | shouldn't touch files owned by a different user. | ||||
* | | | | Merge pull request #1087 from nextcloud/get-delay-twice | Lukas Reschke | 2016-08-30 | 1 | -6/+6 |
|\ \ \ \ | |_|_|/ |/| | | | dont get bruteforce delay twice | ||||
| * | | | dont get bruteforce delay twice | Robin Appelman | 2016-08-29 | 1 | -6/+6 |
| | | | | |||||
* | | | | Merge pull request #891 from nextcloud/us_25810 | Morris Jobke | 2016-08-30 | 1 | -43/+168 |
|\ \ \ \ | | | | | | | | | | | [OC] Fix unmerged shares repair targetdecision | ||||
| * | | | | Improve regexp to detect duplicate folders when repairing unmerged shares | Vincent Petry | 2016-08-17 | 1 | -34/+68 |
| | | | | | |||||
| * | | | | Fix unmerged shares repair with mixed group and direct shares | Vincent Petry | 2016-08-17 | 1 | -1/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -9/+57 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | | always return numeric storage id as int, also check type equality in test ↵ | Jörn Friedrich Dreyer | 2016-08-29 | 1 | -29/+15 |
| |/ / / |/| | | | | | | | | | | | asserts | ||||
* | | | | Merge pull request #1054 from nextcloud/less-cache-hits | Lukas Reschke | 2016-08-27 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Reduce the number of cache operations for dav operations | ||||
| * | | | | cache user folders | Robin Appelman | 2016-08-25 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge pull request #1031 from nextcloud/2fa-infinite-redirect-loop | Joas Schilling | 2016-08-26 | 1 | -4/+41 |
|\ \ \ \ \ | | | | | | | | | | | | | prevent infinite redirect loops if the there is no 2fa provider to pass | ||||
| * | | | | | prevent infinite redirect loops if the there is no 2fa provider to pass | Christoph Wurst | 2016-08-24 | 1 | -4/+41 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes infinite loops that are caused whenever a user is about to solve a 2FA challenge, but the provider app is disabled at the same time. Since the session value usually indicates that the challenge needs to be solved before we grant access we have to remove that value instead in this special case. | ||||
* | | | | | Merge pull request #1069 from nextcloud/l10ntest_nodb | Joas Schilling | 2016-08-25 | 2 | -8/+16 |
|\ \ \ \ \ | | | | | | | | | | | | | L10N tests do not require DB | ||||
| * | | | | | L10N tests do not require DB | Roeland Jago Douma | 2016-08-25 | 2 | -8/+16 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | * Makes CI a bit more efficient * Cleanup getMock warning | ||||
* / / / / | CappedMemoryCacheTest does not require DB | Roeland Jago Douma | 2016-08-25 | 1 | -2/+0 |
|/ / / / | | | | | | | | | | | | | Makes CI a bit more efficient | ||||
* | | | | Merge pull request #1007 from nextcloud/shared-storage-non-recursive | Lukas Reschke | 2016-08-23 | 1 | -4/+4 |
|\ \ \ \ | | | | | | | | | | | Fix shared storage recursive setup | ||||
| * | | | | prevent infinite recursion while getting storage from mount | Robin Appelman | 2016-08-23 | 1 | -4/+4 |
| | | | | | |||||
* | | | | | Merge pull request #995 from nextcloud/workflow-section | Lukas Reschke | 2016-08-23 | 1 | -3/+16 |
|\ \ \ \ \ | | | | | | | | | | | | | Workflow section + hidden empty sections | ||||
| * | | | | | adjust test | Arthur Schiwon | 2016-08-22 | 1 | -11/+6 |
| | | | | | | |||||
| * | | | | | enlist only registered sections that also have settings registered to | Arthur Schiwon | 2016-08-22 | 1 | -3/+21 |
| |/ / / / | |||||
* / / / / | add test | Arthur Schiwon | 2016-08-22 | 1 | -0/+16 |
|/ / / / | |||||
* | | | | Remove reading PATH_INFO from server variable | Lukas Reschke | 2016-08-19 | 1 | -16/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Having two code paths for this is unreliable and can lead to bugs. Also, in some cases Apache isn't setting the PATH_INFO variable when mod_rewrite is used. Fixes https://github.com/nextcloud/server/issues/983 | ||||
* | | | | Fix loading of ThemingDefaults | Julius Haertl | 2016-08-19 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #867 from nextcloud/notification-primary-action-always-first | Roeland Jago Douma | 2016-08-17 | 1 | -0/+29 |
|\ \ \ \ | |/ / / |/| | | | Make sure the primary action is always the first one | ||||
| * | | | Make sure the primary action is always the first one | Joas Schilling | 2016-08-15 | 1 | -0/+29 |
| | | | | |||||
* | | | | Merge pull request #846 from nextcloud/provisioning_api_ocs | Joas Schilling | 2016-08-17 | 1 | -6/+70 |
|\ \ \ \ | | | | | | | | | | | Move Provisioning API to the AppFramework | ||||
| * | | | | Add tests | Roeland Jago Douma | 2016-08-14 | 1 | -6/+70 |
| |/ / / | |||||
* | | | | adjust tests to latest changes | Arthur Schiwon | 2016-08-16 | 2 | -20/+118 |
| | | | |