summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4603 from nextcloud/basic-settingsblizzz2017-04-292-3/+3
|\
| * Rename “Server settings” to “Basic settings”Marius Blüm2017-04-292-3/+3
|/
* Merge pull request #4583 from nextcloud/theming-fixes-adminJan-Christoph Borchardt2017-04-297-132/+114
|\
| * Code cleanup and preview for undo actionsJulius Härtl2017-04-293-34/+19
| * Make sure that ThemingDefaults uses the correct default values from \OC_DefaultsJulius Härtl2017-04-293-56/+36
| * Use generated SCSS for theming previewJulius Härtl2017-04-294-45/+62
* | Merge pull request #4597 from nextcloud/tooltips-invertMorris Jobke2017-04-291-30/+31
|\ \
| * | Invert tooltip color to white, fix #4563Jan-Christoph Borchardt2017-04-291-30/+31
* | | Merge pull request #1234 from nextcloud/rebase-413-by-faldonMorris Jobke2017-04-2914-110/+878
|\ \ \ | |_|/ |/| |
| * | align popovermenu next to … buttonthingyArthur Schiwon2017-04-291-0/+1
| * | consolidate setEnabled methodArthur Schiwon2017-04-292-88/+28
| * | UserManager can now count disabled usersArthur Schiwon2017-04-294-8/+60
| * | Use short array syntaxChristoph Wurst2017-04-291-112/+111
| * | fix unit testsMorris Jobke2017-04-291-16/+6
| * | use proper return codes and handle failure casesMorris Jobke2017-04-293-7/+21
| * | Improve wording of error messagesMorris Jobke2017-04-293-11/+11
| * | fix greyed out display nameMorris Jobke2017-04-291-1/+1
| * | fix unit testsMorris Jobke2017-04-291-24/+13
| * | check $user object before using itMorris Jobke2017-04-291-24/+24
| * | add unit tests for enable methodMorris Jobke2017-04-291-1/+221
| * | add unit tests for disable methodMorris Jobke2017-04-291-1/+219
| * | adjust tests to have at least one disabled userMorris Jobke2017-04-291-2/+13
| * | change group id to _disabledUsersMorris Jobke2017-04-295-15/+15
| * | optimize SVGsMorris Jobke2017-04-292-20/+4
| * | Fix unit testsRoeland Jago Douma2017-04-291-1/+59
| * | improve layoutMorris Jobke2017-04-291-5/+14
| * | Implemented visual feedback if a user is disabled in admin user menu.Thomas Pulzer2017-04-2910-41/+324
|/ /
* | Merge pull request #3869 from nextcloud/verify-personal-dataMorris Jobke2017-04-2923-56/+957
|\ \
| * | Fix unit testsMorris Jobke2017-04-291-4/+4
| * | send signature to lookup serverBjoern Schiessle2017-04-282-0/+4
| * | Updated autoloaderRoeland Jago Douma2017-04-282-0/+2
| * | fix unit testBjoern Schiessle2017-04-281-21/+24
| * | fix path to the website proofBjoern Schiessle2017-04-282-2/+2
| * | don't add multiple retry jobsBjoern Schiessle2017-04-281-13/+21
| * | cleanup templateBjoern Schiessle2017-04-283-18/+25
| * | use already available instance if l10nBjoern Schiessle2017-04-281-2/+2
| * | allow to display the verification code also while verification is already run...Bjoern Schiessle2017-04-284-26/+35
| * | move translatable strings out of the templateBjoern Schiessle2017-04-282-9/+30
| * | verification button should be clickable directly after status change, not onl...Bjoern Schiessle2017-04-281-13/+20
| * | fix name of website input fieldBjoern Schiessle2017-04-281-1/+1
| * | only close verification dialog if the user clicks outside of the dialogBjoern Schiessle2017-04-281-11/+10
| * | Fix text overflow in website popoverJan-Christoph Borchardt2017-04-281-0/+1
| * | update message in verify popupBjoern Schiessle2017-04-281-2/+2
| * | only show verify button if scope is public and the input field contain some v...Bjoern Schiessle2017-04-281-10/+34
| * | Fix verification button placement on mobileJan-Christoph Borchardt2017-04-281-2/+3
| * | Fix dialog widthJan-Christoph Borchardt2017-04-281-2/+1
| * | Improve placeholders for website and Twitter handleJan-Christoph Borchardt2017-04-281-2/+2
| * | only show verification buttons for public fields and field with some actual v...Bjoern Schiessle2017-04-281-3/+3
| * | show and hide verification dialogBjoern Schiessle2017-04-282-11/+12
| * | fix email verification statusBjoern Schiessle2017-04-282-2/+6