Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Nextcloud bot | 2018-08-13 | 50 | -38/+234 |
* | [tx-robot] updated from transifex | Nextcloud bot | 2018-08-11 | 30 | -0/+52 |
* | Merge pull request #10610 from nextcloud/fix/noid/dontcountwithldap | Roeland Jago Douma | 2018-08-10 | 1 | -6/+11 |
|\ | |||||
| * | do not trigger counting on LDAP | Arthur Schiwon | 2018-08-10 | 1 | -6/+11 |
* | | Merge pull request #10639 from nextcloud/bugfix/10607/appsettings-fixes | Roeland Jago Douma | 2018-08-10 | 4 | -10/+5 |
|\ \ | |||||
| * | | Recompile | Roeland Jago Douma | 2018-08-10 | 1 | -3800/+123 |
| * | | Bump bundled javascript from settings | Julius Härtl | 2018-08-10 | 2 | -124/+3800 |
| * | | Sort apps by a proper hierarchical order (active, update, name) | Julius Härtl | 2018-08-10 | 1 | -7/+3 |
| * | | Fix removeing apps in the sidebar | Julius Härtl | 2018-08-10 | 1 | -1/+1 |
* | | | Merge pull request #10642 from nextcloud/bump/autoloaders | Roeland Jago Douma | 2018-08-10 | 20 | -20/+20 |
|\ \ \ | |||||
| * | | | Bump autoloaders | Roeland Jago Douma | 2018-08-10 | 20 | -20/+20 |
* | | | | Merge pull request #10615 from nextcloud/fix-trashbin-actions | Roeland Jago Douma | 2018-08-10 | 1 | -2/+0 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix trashbin file actions | Robin Appelman | 2018-08-09 | 1 | -2/+0 |
* | | | | Merge pull request #10543 from nextcloud/ignore-deactivated-users | Roeland Jago Douma | 2018-08-10 | 4 | -16/+43 |
|\ \ \ \ | |||||
| * | | | | Test sync service when user is deactivated | Thomas Citharel | 2018-08-06 | 1 | -5/+21 |
| * | | | | Ignore deactivated users in collaborators user search plugin | Thomas Citharel | 2018-08-06 | 2 | -2/+8 |
| * | | | | Remove users from system addressbook when user deactivated | Thomas Citharel | 2018-08-06 | 2 | -10/+15 |
* | | | | | Merge pull request #10623 from nextcloud/bugfix/10622/mobile-header | Roeland Jago Douma | 2018-08-10 | 1 | -0/+2 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Apply flex-basis to right header | Julius Härtl | 2018-08-09 | 1 | -0/+2 |
* | | | | | Merge pull request #10619 from nextcloud/bugfix/4550/redirect-page-update | Roeland Jago Douma | 2018-08-10 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Redirect to the same page after an update | Julius Härtl | 2018-08-09 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #10636 from nextcloud/fix/2fa-enforced-backup-codes | blizzz | 2018-08-10 | 2 | -4/+35 |
|\ \ \ \ \ | |||||
| * | | | | | Remove unused import | Christoph Wurst | 2018-08-10 | 1 | -1/+0 |
| * | | | | | Fix 2FA being enforced if only backup codes provider is active | Christoph Wurst | 2018-08-10 | 2 | -4/+36 |
* | | | | | | Merge pull request #10618 from nextcloud/mimetype-insert-if-not-exists | Roeland Jago Douma | 2018-08-10 | 1 | -14/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | use insertIfNotExists to store new mimetypes. | Robin Appelman | 2018-08-09 | 1 | -14/+7 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #10546 from nextcloud/popover-tokens | Christoph Wurst | 2018-08-10 | 3 | -44/+27 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | POpovermenu fix and token settings design fixes | John Molakvoæ (skjnldsv) | 2018-08-06 | 3 | -44/+27 |
| | |_|/ / | |/| | | | |||||
* | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-08-10 | 112 | -122/+122 |
* | | | | | Merge pull request #10614 from nextcloud/bugfix/noid/fix_including_invalid_file | Roeland Jago Douma | 2018-08-09 | 3 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Do not use file as template parameter | Roeland Jago Douma | 2018-08-09 | 3 | -3/+3 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #10626 from nextcloud/bugfix/noid/quickaccess-spaces | Roeland Jago Douma | 2018-08-09 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Fix quickaccess active indicator for folders with spaces | Julius Härtl | 2018-08-09 | 1 | -2/+2 |
* | | | | | | Merge pull request #10598 from schoonc/patch-1 | Roeland Jago Douma | 2018-08-09 | 1 | -2/+0 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Removed unused variable isFile | schoonc | 2018-08-09 | 1 | -2/+0 |
| |/ / / / | |||||
* | | | | | Merge pull request #10611 from nextcloud/fix/2fa-provider-user-dao-duplicate-key | Roeland Jago Douma | 2018-08-09 | 2 | -6/+38 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Fix double-inserts of the same provider state | Christoph Wurst | 2018-08-09 | 2 | -8/+21 |
| * | | | | Add integration/unit test for the double-insert of same values | Christoph Wurst | 2018-08-09 | 1 | -0/+19 |
|/ / / / | |||||
* | | | | Merge pull request #10588 from nextcloud/fix/single-2fa-provider-login-redirect | Roeland Jago Douma | 2018-08-09 | 4 | -6/+36 |
|\ \ \ \ | |||||
| * | | | | Rename providerset method to get primary providers | Christoph Wurst | 2018-08-08 | 3 | -3/+3 |
| * | | | | Fix login redirection if only one 2FA provider is active | Christoph Wurst | 2018-08-08 | 4 | -6/+36 |
* | | | | | Merge pull request #10604 from nextcloud/release/14/beta3v14.0.0beta3 | Roeland Jago Douma | 2018-08-09 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Nextcloud 14.0.0 beta3 | Roeland Jago Douma | 2018-08-09 | 1 | -2/+2 |
|/ / / / / | |||||
* | | | | | Merge pull request #10255 from nextcloud/add-support-for-room-shares | Björn Schießle | 2018-08-09 | 23 | -24/+828 |
|\ \ \ \ \ | |||||
| * | | | | | Add support for tokens in room shares | Daniel Calviño Sánchez | 2018-08-08 | 2 | -0/+59 |
| * | | | | | Suppress Phan warnings about calling undeclared class methods | Daniel Calviño Sánchez | 2018-08-08 | 2 | -0/+8 |
| * | | | | | Add custom handling for room shares to the resharer information | Daniel Calviño Sánchez | 2018-08-08 | 1 | -0/+11 |
| * | | | | | Add custom handling for room shares to the list of sharees | Daniel Calviño Sánchez | 2018-08-08 | 1 | -1/+3 |
| * | | | | | Log sharing and unsharing with a room in the auditing app | Daniel Calviño Sánchez | 2018-08-08 | 1 | -0/+25 |
| * | | | | | Transfer room shares too with the "files:transfer-ownership" command | Daniel Calviño Sánchez | 2018-08-08 | 1 | -1/+1 |