Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add FileDisplayResponse | Roeland Jago Douma | 2016-09-05 | 1 | -0/+109 |
* | Merge pull request #1158 from nextcloud/cache_avatars | Lukas Reschke | 2016-09-05 | 2 | -14/+35 |
|\ | |||||
| * | Fix tests | Roeland Jago Douma | 2016-08-30 | 2 | -14/+35 |
* | | Merge pull request #1259 from nextcloud/language_order | Joas Schilling | 2016-09-05 | 1 | -13/+97 |
|\ \ | |||||
| * | | ACCEPT_LANGUAGE goes before default_langauge | Roeland Jago Douma | 2016-09-04 | 1 | -13/+97 |
* | | | 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 | 2 | -12/+91 |
|/ / | |||||
* | | 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 | Roeland Jago Douma | 2016-08-31 | 1 | -1/+28 |
* | | | Merge pull request #1227 from nextcloud/improve-tests | Joas Schilling | 2016-09-01 | 1 | -15/+0 |
|\ \ \ | |||||
| * | | | Remove unneeded Windows logic | Morris Jobke | 2016-09-01 | 1 | -15/+0 |
| |/ / | |||||
* / / | Fix depreccated getMock in Core/Command tests | Roeland Jago Douma | 2016-09-01 | 22 | -90/+167 |
|/ / | |||||
* | | Merge pull request #1188 from nextcloud/2fa-redirect-default-app | Lukas Reschke | 2016-08-31 | 1 | -15/+11 |
|\ \ | |||||
| * | | check same URL in unit tests | Christoph Wurst | 2016-08-30 | 1 | -11/+12 |
| * | | redirect to default app after solving the 2FA challenge | Christoph Wurst | 2016-08-30 | 1 | -6/+1 |
| |/ | |||||
* | | 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 | Lukas Reschke | 2016-08-09 | 1 | -1/+77 |
* | | | 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 shouldn... | Bjoern Schiessle | 2016-07-27 | 1 | -3/+14 |
* | | | | Merge pull request #1087 from nextcloud/get-delay-twice | Lukas Reschke | 2016-08-30 | 1 | -6/+6 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | dont get bruteforce delay twice | Robin Appelman | 2016-08-29 | 1 | -6/+6 |
* | | | | Merge pull request #1172 from nextcloud/core_cleanup | Morris Jobke | 2016-08-30 | 2 | -10/+12 |
|\ \ \ \ | |||||
| * | | | | AvatarController use proper JSONResponse | Roeland Jago Douma | 2016-08-29 | 1 | -3/+3 |
| * | | | | Minor cleanup in core Controllers | Roeland Jago Douma | 2016-08-29 | 1 | -7/+9 |
* | | | | | Merge pull request #891 from nextcloud/us_25810 | Morris Jobke | 2016-08-30 | 1 | -43/+168 |
|\ \ \ \ \ | |||||
| * | | | | | 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 |
| * | | | | | Improve file_target finding logic when repairing unmerged shares | Vincent Petry | 2016-08-17 | 1 | -9/+57 |
* | | | | | | redirect to 2fa provider if there's only one active for the user | Christoph Wurst | 2016-08-29 | 1 | -1/+75 |
| |/ / / / |/| | | | | |||||
* | | | | | always return numeric storage id as int, also check type equality in test ass... | Jörn Friedrich Dreyer | 2016-08-29 | 1 | -29/+15 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #1054 from nextcloud/less-cache-hits | Lukas Reschke | 2016-08-27 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | cache user folders | Robin Appelman | 2016-08-25 | 1 | -0/+1 |
* | | | | | Merge pull request #1058 from nextcloud/avatarController_cleanup | Lukas Reschke | 2016-08-27 | 1 | -62/+83 |
|\ \ \ \ \ | |||||
| * | | | | | AvatarController cleanup | Roeland Jago Douma | 2016-08-25 | 1 | -62/+83 |
* | | | | | | Merge pull request #1031 from nextcloud/2fa-infinite-redirect-loop | Joas Schilling | 2016-08-26 | 2 | -4/+43 |
|\ \ \ \ \ \ | |||||
| * | | | | | | prevent infinite redirect loops if the there is no 2fa provider to pass | Christoph Wurst | 2016-08-24 | 2 | -4/+43 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #1069 from nextcloud/l10ntest_nodb | Joas Schilling | 2016-08-25 | 2 | -8/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | L10N tests do not require DB | Roeland Jago Douma | 2016-08-25 | 2 | -8/+16 |
| | |/ / / / | |/| | | | | |||||
* / | | | | | CappedMemoryCacheTest does not require DB | Roeland Jago Douma | 2016-08-25 | 1 | -2/+0 |
|/ / / / / | |||||
* | | | | | Merge pull request #1024 from nextcloud/remove-password-reset-link-after-succ... | Lukas Reschke | 2016-08-24 | 2 | -18/+38 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Move the reset token to core app | Joas Schilling | 2016-08-23 | 2 | -21/+21 |
| * | | | | Remove "password reset token" after successful login | Joas Schilling | 2016-08-23 | 1 | -0/+20 |
* | | | | | Merge pull request #1007 from nextcloud/shared-storage-non-recursive | Lukas Reschke | 2016-08-23 | 1 | -4/+4 |
|\ \ \ \ \ | |||||
| * | | | | | 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 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | 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 |