summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-08-1350-38/+234
* [tx-robot] updated from transifexNextcloud bot2018-08-1130-0/+52
* Merge pull request #10610 from nextcloud/fix/noid/dontcountwithldapRoeland Jago Douma2018-08-101-6/+11
|\
| * do not trigger counting on LDAPArthur Schiwon2018-08-101-6/+11
* | Merge pull request #10639 from nextcloud/bugfix/10607/appsettings-fixesRoeland Jago Douma2018-08-104-10/+5
|\ \
| * | RecompileRoeland Jago Douma2018-08-101-3800/+123
| * | Bump bundled javascript from settingsJulius Härtl2018-08-102-124/+3800
| * | Sort apps by a proper hierarchical order (active, update, name)Julius Härtl2018-08-101-7/+3
| * | Fix removeing apps in the sidebarJulius Härtl2018-08-101-1/+1
* | | Merge pull request #10642 from nextcloud/bump/autoloadersRoeland Jago Douma2018-08-1020-20/+20
|\ \ \
| * | | Bump autoloadersRoeland Jago Douma2018-08-1020-20/+20
* | | | Merge pull request #10615 from nextcloud/fix-trashbin-actionsRoeland Jago Douma2018-08-101-2/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Fix trashbin file actionsRobin Appelman2018-08-091-2/+0
* | | | Merge pull request #10543 from nextcloud/ignore-deactivated-usersRoeland Jago Douma2018-08-104-16/+43
|\ \ \ \
| * | | | Test sync service when user is deactivatedThomas Citharel2018-08-061-5/+21
| * | | | Ignore deactivated users in collaborators user search pluginThomas Citharel2018-08-062-2/+8
| * | | | Remove users from system addressbook when user deactivatedThomas Citharel2018-08-062-10/+15
* | | | | Merge pull request #10623 from nextcloud/bugfix/10622/mobile-headerRoeland Jago Douma2018-08-101-0/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Apply flex-basis to right headerJulius Härtl2018-08-091-0/+2
* | | | | Merge pull request #10619 from nextcloud/bugfix/4550/redirect-page-updateRoeland Jago Douma2018-08-101-1/+1
|\ \ \ \ \
| * | | | | Redirect to the same page after an updateJulius Härtl2018-08-091-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #10636 from nextcloud/fix/2fa-enforced-backup-codesblizzz2018-08-102-4/+35
|\ \ \ \ \
| * | | | | Remove unused importChristoph Wurst2018-08-101-1/+0
| * | | | | Fix 2FA being enforced if only backup codes provider is activeChristoph Wurst2018-08-102-4/+36
* | | | | | Merge pull request #10618 from nextcloud/mimetype-insert-if-not-existsRoeland Jago Douma2018-08-101-14/+7
|\ \ \ \ \ \
| * | | | | | use insertIfNotExists to store new mimetypes.Robin Appelman2018-08-091-14/+7
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #10546 from nextcloud/popover-tokensChristoph Wurst2018-08-103-44/+27
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | POpovermenu fix and token settings design fixesJohn Molakvoæ (skjnldsv)2018-08-063-44/+27
| | |_|/ / | |/| | |
* | | | | [tx-robot] updated from transifexNextcloud bot2018-08-10112-122/+122
* | | | | Merge pull request #10614 from nextcloud/bugfix/noid/fix_including_invalid_fileRoeland Jago Douma2018-08-093-3/+3
|\ \ \ \ \
| * | | | | Do not use file as template parameterRoeland Jago Douma2018-08-093-3/+3
| | |_|/ / | |/| | |
* | | | | Merge pull request #10626 from nextcloud/bugfix/noid/quickaccess-spacesRoeland Jago Douma2018-08-091-2/+2
|\ \ \ \ \
| * | | | | Fix quickaccess active indicator for folders with spacesJulius Härtl2018-08-091-2/+2
* | | | | | Merge pull request #10598 from schoonc/patch-1Roeland Jago Douma2018-08-091-2/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Removed unused variable isFileschoonc2018-08-091-2/+0
| |/ / / /
* | | | | Merge pull request #10611 from nextcloud/fix/2fa-provider-user-dao-duplicate-keyRoeland Jago Douma2018-08-092-6/+38
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix double-inserts of the same provider stateChristoph Wurst2018-08-092-8/+21
| * | | | Add integration/unit test for the double-insert of same valuesChristoph Wurst2018-08-091-0/+19
|/ / / /
* | | | Merge pull request #10588 from nextcloud/fix/single-2fa-provider-login-redirectRoeland Jago Douma2018-08-094-6/+36
|\ \ \ \
| * | | | Rename providerset method to get primary providersChristoph Wurst2018-08-083-3/+3
| * | | | Fix login redirection if only one 2FA provider is activeChristoph Wurst2018-08-084-6/+36
* | | | | Merge pull request #10604 from nextcloud/release/14/beta3v14.0.0beta3Roeland Jago Douma2018-08-091-2/+2
|\ \ \ \ \
| * | | | | Nextcloud 14.0.0 beta3Roeland Jago Douma2018-08-091-2/+2
|/ / / / /
* | | | | Merge pull request #10255 from nextcloud/add-support-for-room-sharesBjörn Schießle2018-08-0923-24/+828
|\ \ \ \ \
| * | | | | Add support for tokens in room sharesDaniel Calviño Sánchez2018-08-082-0/+59
| * | | | | Suppress Phan warnings about calling undeclared class methodsDaniel Calviño Sánchez2018-08-082-0/+8
| * | | | | Add custom handling for room shares to the resharer informationDaniel Calviño Sánchez2018-08-081-0/+11
| * | | | | Add custom handling for room shares to the list of shareesDaniel Calviño Sánchez2018-08-081-1/+3
| * | | | | Log sharing and unsharing with a room in the auditing appDaniel Calviño Sánchez2018-08-081-0/+25
| * | | | | Transfer room shares too with the "files:transfer-ownership" commandDaniel Calviño Sánchez2018-08-081-1/+1