summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #10738 from nextcloud/fix/10669/store-sorting-only-for-log...blizzz2018-08-202-1/+32
|\ \ \ \ \ \ \ \
| * | | | | | | | Improves the testsMichael Weimann2018-08-171-9/+24
| * | | | | | | | Stores the sorting only if there is an userMichael Weimann2018-08-171-1/+1
| * | | | | | | | Adds a test to check that the sorting isn't stored without an userMichael Weimann2018-08-171-0/+16
* | | | | | | | | Merge pull request #10697 from nextcloud/smb-log-removed-entriesMorris Jobke2018-08-201-11/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | log entries that are hidden during file listingRobin Appelman2018-08-161-11/+25
* | | | | | | | | | Merge pull request #10687 from nextcloud/fix/noid/false-positive-change-mentionMorris Jobke2018-08-204-35/+72
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix unit testsArthur Schiwon2018-08-151-10/+47
| * | | | | | | | | | don't force LDAP updates on userExists anymoreArthur Schiwon2018-08-141-9/+1
| * | | | | | | | | | don't blame email address changersArthur Schiwon2018-08-142-16/+24
* | | | | | | | | | | Merge pull request #10755 from nextcloud/documentation/noid/fix-comments-in-c...Morris Jobke2018-08-201-5/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix comment style in config sampleMorris Jobke2018-08-201-5/+5
* | | | | | | | | | | | Merge pull request #10712 from nextcloud/fix/noid/check_if_provider_is_availa...blizzz2018-08-202-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Check if a preview provider is available before using itRoeland Jago Douma2018-08-172-2/+16
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #10744 from nextcloud/update-help-phpMorris Jobke2018-08-201-16/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Update help.phpMarius Blüm2018-08-181-16/+2
* | | | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2018-08-206-10/+16
| |_|_|_|_|/ / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #10734 from ReekyMarko/masterRoeland Jago Douma2018-08-193-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Recompile settingsRoeland Jago Douma2018-08-182-2/+2
| * | | | | | | | | | Fixed a typoMarko Korhonen2018-08-171-1/+1
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #10707 from nextcloud/dark-theme-fixesJulius Härtl2018-08-181-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix public pages backgroundJohn Molakvoæ (skjnldsv)2018-08-161-1/+1
* | | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2018-08-186-0/+16
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | 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