Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2044 from nextcloud/login-credential-store | Morris Jobke | 2017-01-30 | 6 | -6/+248 |
|\ | |||||
| * | always allow remembered login | Christoph Wurst | 2017-01-11 | 4 | -6/+0 |
| * | do not hard-require the token provider | Christoph Wurst | 2017-01-11 | 1 | -1/+9 |
| * | use login hook credentials as fallback | Christoph Wurst | 2017-01-11 | 1 | -8/+55 |
| * | add login credential store | Christoph Wurst | 2017-01-11 | 2 | -0/+193 |
* | | Merge pull request #2822 from nextcloud/add-navigation-via-info.xml | Morris Jobke | 2017-01-27 | 1 | -0/+66 |
|\ \ | |||||
| * | | Force to specify the name | Joas Schilling | 2017-01-27 | 1 | -4/+6 |
| * | | Add navigation via info.xml (#26785) | Thomas Müller | 2016-12-22 | 1 | -0/+64 |
* | | | Merge pull request #3284 from nextcloud/remove-avatar-fixup | Morris Jobke | 2017-01-26 | 1 | -189/+0 |
|\ \ \ | |||||
| * | | | remote now unneeded AvatarPermissions repair step | Robin Appelman | 2017-01-26 | 1 | -189/+0 |
* | | | | Merge pull request #3246 from nextcloud/fix-sqlite-dependency | Morris Jobke | 2017-01-26 | 1 | -14/+2 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Remove useless dependency on SQLite (non-PDO) | Morris Jobke | 2017-01-25 | 1 | -14/+2 |
* | | | | Merge pull request #3208 from nextcloud/issue-3125-bring-user-management-endp... | Morris Jobke | 2017-01-25 | 1 | -145/+64 |
|\ \ \ \ | |||||
| * | | | | Error out when subadmin doesn't select any group | Joas Schilling | 2017-01-23 | 1 | -145/+64 |
* | | | | | Merge pull request #3232 from nextcloud/add-profile-data-to-provisioning-api | Björn Schießle | 2017-01-25 | 1 | -18/+0 |
|\ \ \ \ \ | |||||
| * | | | | | unify endpoints form core and the the provisioning api | Bjoern Schiessle | 2017-01-25 | 1 | -18/+0 |
| |/ / / / | |||||
* | | | | | Merge pull request #3030 from nextcloud/filesapi-renamefailcase | Morris Jobke | 2017-01-24 | 3 | -532/+483 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Add tests for move/copy hooks in Node API | Vincent Petry | 2017-01-12 | 1 | -0/+81 |
| * | | | | Fix files node API failed rename/copy | Vincent Petry | 2017-01-12 | 2 | -4/+46 |
| * | | | | Refactor files node API for more code reuse | Vincent Petry | 2017-01-11 | 3 | -530/+358 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #3151 from nextcloud/navigation-icons | Morris Jobke | 2017-01-24 | 1 | -30/+44 |
|\ \ \ \ | |||||
| * | | | | Fix the manager tests | Joas Schilling | 2017-01-19 | 1 | -30/+44 |
* | | | | | Mimetype detection for hidden files | Magnus Walbeck | 2017-01-23 | 1 | -0/+4 |
| |_|/ / |/| | | | |||||
* | | | | Adjust the tests | Joas Schilling | 2017-01-20 | 1 | -2/+2 |
|/ / / | |||||
* | | | add some unit tests | Bjoern Schiessle | 2017-01-18 | 2 | -1/+85 |
* | | | Merge pull request #1594 from nextcloud/markdown-support-for-app-descriptions | Joas Schilling | 2017-01-17 | 2 | -9/+15 |
|\ \ \ | |||||
| * | | | Apply DOMPurify over HTML | Lukas Reschke | 2017-01-13 | 1 | -1/+2 |
| * | | | Fix JSUnit tests | Morris Jobke | 2017-01-13 | 1 | -1/+2 |
| * | | | Fix tests | Joas Schilling | 2017-01-13 | 1 | -8/+12 |
* | | | | Merge pull request #3023 from nextcloud/issue-2915-filter-out-sensitive-appco... | Christoph Wurst | 2017-01-17 | 2 | -0/+29 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix tests | Joas Schilling | 2017-01-12 | 2 | -0/+29 |
* | | | | Merge pull request #3060 from nextcloud/cleanup-js-tests | Joas Schilling | 2017-01-13 | 1 | -2/+7 |
|\ \ \ \ | |||||
| * | | | | fix image warnings | Christoph Wurst | 2017-01-13 | 1 | -1/+3 |
| * | | | | allow/fix loading of fonts | Christoph Wurst | 2017-01-13 | 1 | -1/+4 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #2918 from nextcloud/encryption-recovery-improvements | Morris Jobke | 2017-01-13 | 2 | -38/+43 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | create new encryption keys on password reset and backup the old one | Bjoern Schiessle | 2017-01-10 | 2 | -38/+43 |
* | | | | fix coding style and increase code coverage | Christoph Wurst | 2017-01-11 | 1 | -40/+111 |
* | | | | Fix tests | Cornelius Kölbel | 2017-01-11 | 1 | -2/+5 |
| |/ / |/| | | |||||
* | | | Merge pull request #2745 from nextcloud/oc_26590 | Roeland Jago Douma | 2017-01-11 | 1 | -0/+21 |
|\ \ \ | |||||
| * | | | Only check for local shared storages | Roeland Jago Douma | 2017-01-10 | 1 | -2/+3 |
| * | | | Skip local shares in bkg scan and occ files:scan (#26590) | Vincent Petry | 2017-01-10 | 1 | -0/+20 |
* | | | | Merge pull request #2951 from nextcloud/handle-nextcloud-log-type-gracefully | Roeland Jago Douma | 2017-01-11 | 1 | -0/+18 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Better fallback for unknown log types | Joas Schilling | 2017-01-10 | 1 | -2/+4 |
| * | | | Add tests | Joas Schilling | 2017-01-09 | 1 | -0/+16 |
* | | | | Merge pull request #3012 from nextcloud/fix-karma-image-warnings | Roeland Jago Douma | 2017-01-10 | 1 | -2/+3 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | show fewer warnings in karma test runs | Christoph Wurst | 2017-01-10 | 1 | -2/+3 |
* | | | | Merge pull request #3000 from nextcloud/cache-no-store | Roeland Jago Douma | 2017-01-10 | 3 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | fix controller test | Christoph Wurst | 2017-01-10 | 1 | -1/+1 |
| * | | | | fix data response test expected cache headers | Christoph Wurst | 2017-01-10 | 1 | -1/+1 |
| * | | | | set 'no-store' cache header if we do not want FF to cache | Christoph Wurst | 2017-01-09 | 1 | -1/+1 |