summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix "Copied" message for public linksMorris Jobke2017-05-011-3/+0
* Merge pull request #4594 from nextcloud/theming-image-defaultMorris Jobke2017-05-012-0/+69
|\
| * Delete theming images when logo/background is reset to defaultJulius Härtl2017-04-302-0/+69
* | Merge pull request #4527 from nextcloud/downstream-27504Morris Jobke2017-05-012-24/+65
|\ \
| * | remove duplicate methodRobin Appelman2017-04-261-26/+8
| * | remove excessive loggingRobin Appelman2017-04-261-25/+8
| * | Add new specific tests for SMBJuan Pablo Villafáñez2017-04-261-0/+19
| * | Adjust SMB permissions on the rootJuan Pablo Villafáñez2017-04-261-3/+60
* | | Merge pull request #4624 from nextcloud/email-settings-htmlLukas Reschke2017-05-011-1/+1
|\ \ \
| * | | fix email settingsRobin Appelman2017-05-011-1/+1
* | | | Merge pull request #4610 from nextcloud/js-semicolonsLukas Reschke2017-05-018-16/+16
|\ \ \ \
| * | | | Fix semicolon at end of JS linesMorris Jobke2017-05-018-16/+16
| | |_|/ | |/| |
* | | | Merge pull request #4614 from nextcloud/js-fix-dialogs-and-octemplateLukas Reschke2017-05-013-4/+6
|\ \ \ \
| * | | | Fix variable definitions in oc dialogsMorris Jobke2017-05-013-4/+6
| |/ / /
* | | | Merge pull request #4513 from nextcloud/bump-version-to-beta1Lukas Reschke2017-05-011-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Bump version to Nextcloud 12.0 beta 1Lukas Reschke2017-04-261-2/+2
* | | | Merge pull request #4616 from nextcloud/js-reduce-complexity-for-sharedialogv...Roeland Jago Douma2017-05-011-7/+4
|\ \ \ \
| * | | | Fix variable definition in sharedialogview.jsMorris Jobke2017-05-011-7/+4
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2017-05-01102-66/+630
* | | | Merge pull request #4602 from nextcloud/make-tooltip-intransparentMorris Jobke2017-04-301-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Make tooltip intransparentMorris Jobke2017-04-291-2/+2
* | | | [tx-robot] updated from transifexNextcloud bot2017-04-30166-206/+274
* | | | 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
|\ \ \ \