summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fixed a typoMarko Korhonen2018-08-171-1/+1
* Merge pull request #10731 from nextcloud/update-bundlesBjörn Schießle2018-08-172-2/+4
|\
| * add deck and mail to the groupware bundle, remove talkBjoern Schiessle2018-08-172-2/+4
|/
* Merge pull request #10718 from nextcloud/occ-recover-encryptionBjörn Schießle2018-08-176-12/+146
|\
| * add occ command to recover encrypted files in case of password lostBjoern Schiessle2018-08-166-12/+146
* | Merge pull request #10715 from nextcloud/fix/noid/filterwhatsnewRoeland Jago Douma2018-08-163-2/+79
|\ \
| * | and the user popover needs a higher z-index, to make it visible againArthur Schiwon2018-08-162-1/+2
| * | fix wrong return value of filtered whats new infoArthur Schiwon2018-08-162-1/+77
|/ /
* | Merge pull request #10703 from nextcloud/release/noid/14_beta4v14.0.0beta4Roeland Jago Douma2018-08-161-2/+2
|\ \
| * | Nextcloud 14 Beta 4Roeland Jago Douma2018-08-161-2/+2
|/ /
* | Merge pull request #10608 from nextcloud/header-menu-fixesJulius Härtl2018-08-164-8/+13
|\ \
| * | Tests fixesJohn Molakvoæ (skjnldsv)2018-08-101-6/+6
| * | Align to the leftJohn Molakvoæ (skjnldsv)2018-08-091-1/+1
| * | TypoJohn Molakvoæ (skjnldsv)2018-08-091-1/+1
| * | Fix header menu & contact popoverJohn Molakvoæ (skjnldsv)2018-08-092-1/+6
* | | Merge pull request #10695 from nextcloud/sharing-public-settings-fixesJulius Härtl2018-08-162-25/+95
|\ \ \
| * | | Disabled checkboxes and design fixesJohn Molakvoæ (skjnldsv)2018-08-162-21/+17
| * | | Fix password enforce on public linksJohn Molakvoæ (skjnldsv)2018-08-151-14/+88
* | | | Merge pull request #10692 from nextcloud/deleted-share-remove-actionsRoeland Jago Douma2018-08-162-4/+26
|\ \ \ \
| * | | | Object.values polyfillJohn Molakvoæ (skjnldsv)2018-08-161-0/+14
| * | | | Do not show action menu if no actions are availableJohn Molakvoæ (skjnldsv)2018-08-152-4/+12
| |/ / /
* | | | [tx-robot] updated from transifexNextcloud bot2018-08-1610-120/+126
* | | | Merge pull request #10702 from nextcloud/bugfix/10622/user-management-actionsRoeland Jago Douma2018-08-151-1/+1
|\ \ \ \
| * | | | Fix missing actions menu on small screens in the user managementJulius Härtl2018-08-151-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #10701 from nextcloud/bugfix/noid/timepicker-zindexJohn Molakvoæ2018-08-151-0/+1
|\ \ \ \
| * | | | Fix timepicker z-index to be above the sidebarJulius Härtl2018-08-151-0/+1
| |/ / /
* | | | Merge pull request #10645 from nextcloud/fix-password-resetBjörn Schießle2018-08-152-2/+51
|\ \ \ \ | |/ / / |/| | |
| * | | update unit testsBjoern Schiessle2018-08-151-1/+41
| * | | only warn about data lose on password reset if per-user keys are usedBjoern Schiessle2018-08-151-1/+10
|/ / /
* | | Merge pull request #10691 from nextcloud/various-beta14-design-fixesJulius Härtl2018-08-156-26/+45
|\ \ \
| * | | Added feedback on autocomplete uiJohn Molakvoæ (skjnldsv)2018-08-152-4/+15
| * | | TypoJohn Molakvoæ (skjnldsv)2018-08-151-1/+1
| * | | Ellipsis long username/mails in share viewJohn Molakvoæ (skjnldsv)2018-08-151-0/+4
| * | | Fix footer and public min-heightJohn Molakvoæ (skjnldsv)2018-08-153-22/+24
| * | | Undo button fix in themingJohn Molakvoæ (skjnldsv)2018-08-151-0/+2
| |/ /
* | | Merge pull request #10689 from nextcloud/darktheme-theming-fixesJulius Härtl2018-08-151-1/+34
|\ \ \
| * | | Add default theming into accessibility compilerJohn Molakvoæ (skjnldsv)2018-08-151-1/+34
| |/ /
* | | Merge pull request #10688 from nextcloud/fix/10492/disabled-users-navigationRoeland Jago Douma2018-08-154-3/+17
|\ \ \ | |/ / |/| |
| * | Fixes hiding the disabled users nav item if there are no disabled usersMichael Weimann2018-08-143-3/+3
| * | Adds an acceptance test for the users settings navigation without disabled usersMichael Weimann2018-08-141-0/+14
* | | [tx-robot] updated from transifexNextcloud bot2018-08-1514-0/+32
|/ /
* | Merge pull request #8855 from nextcloud/feature/noid/ldap-integration-autotestsblizzz2018-08-1414-732/+358
|\ \
| * | don't add new LDAP configs if one is already presentArthur Schiwon2018-08-122-2/+8
| * | improve fail info and disable cache for a caseArthur Schiwon2018-08-122-1/+2
| * | Phpunit changed, use proper Assert classArthur Schiwon2018-08-121-7/+7
| * | tests for user storage locationArthur Schiwon2018-08-104-197/+44
| * | convert pagination testsArthur Schiwon2018-08-094-57/+84
| * | convert connection testsArthur Schiwon2018-08-093-172/+31
| * | fix prov testsArthur Schiwon2018-08-091-0/+1
| * | simplify tests and move some out to a new feature as we need a pristineArthur Schiwon2018-08-093-27/+35