summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #408 from nextcloud/psr4-themingBjörn Schießle2016-07-289-45/+81
|\
| * Fix testsJoas Schilling2016-07-285-29/+70
| * Update routes.phpJoas Schilling2016-07-281-4/+2
| * Remove useless checkJoas Schilling2016-07-281-3/+1
| * Use the methods on the Response objectJoas Schilling2016-07-281-11/+10
| * Use public API preferableJoas Schilling2016-07-281-1/+1
| * Move classes to PSR-4Joas Schilling2016-07-286-0/+0
|/
* Merge pull request #636 from nextcloud/theming-fixMorris Jobke2016-07-282-4/+4
|\
| * fix background id selector for the first run wizardBjoern Schiessle2016-07-282-4/+4
* | Merge pull request #590 from nextcloud/fixing-undefined-OfflineUser-composeAn...Morris Jobke2016-07-281-2/+8
|\ \
| * | [stable9.1] Fix undefined OfflineUser::composeAndStoreDisplayName() - fixes #...Thomas Müller2016-07-271-2/+8
* | | Merge pull request #592 from nextcloud/ldap-avoidneedlesssetemailonloginLukas Reschke2016-07-281-1/+4
|\ \ \
| * | | Prevent setting email and triggering events at login time (#25553)Vincent Petry2016-07-271-1/+4
| |/ /
* | | Merge pull request #632 from nextcloud/vmMorris Jobke2016-07-281-0/+5
|\ \ \ | |_|/ |/| |
| * | wordingDaniel Hansson2016-07-281-2/+2
| * | add info about the Nextcloud VMDaniel Hansson2016-07-281-0/+5
* | | Merge pull request #583 from nextcloud/issue-577-add-l10nMorris Jobke2016-07-283-14/+26
|\ \ \ | |/ / |/| |
| * | Add L10N supportJoas Schilling2016-07-273-14/+26
* | | Merge pull request #624 from nextcloud/users-capitalizationWilliam Bargent2016-07-284-11/+11
|\ \ \
| * | | fix capitalization of text in users managementJan-Christoph Borchardt2016-07-284-11/+11
* | | | Merge pull request #620 from nextcloud/theming-firstrunwizardBjörn Schießle2016-07-282-53/+159
|\ \ \ \
| * | | | fix unit testsBjoern Schiessle2016-07-281-53/+143
| * | | | re-use background color from theme in the firstrunwizardBjoern Schiessle2016-07-281-0/+9
| * | | | apply theme to the firstrunwizardBjoern Schiessle2016-07-281-0/+7
|/ / / /
* | | | Merge pull request #612 from nextcloud/improve-xml-loaded-version-handlingLukas Reschke2016-07-281-2/+8
|\ \ \ \
| * | | | libxml - compare against loaded versionMorris Jobke2016-07-281-2/+8
* | | | | Merge pull request #415 from nextcloud/theming-colorize-checkboxesJan-Christoph Borchardt2016-07-288-61/+194
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Theming: Cleanup and remove opacity from checkbox/radiobuttonJulius Haertl2016-07-272-4/+1
| * | | | Theming: Generate colorized radio buttons dynamicallyJulius Haertl2016-07-275-56/+51
| * | | | Theming: Colorize radio buttons and append new styles on previewJulius Haertl2016-07-277-56/+121
| * | | | Theming: Clean up css generation and fix testsJulius Haertl2016-07-272-55/+87
| * | | | Theming: Colorize checkboxes depending on luminanceJulius Haertl2016-07-273-2/+28
| * | | | Theming: Preview for colorized checkboxesJulius Haertl2016-07-271-5/+18
| * | | | Colorize checkboxes depending on theming colorJulius Haertl2016-07-272-4/+9
| |/ / /
* | | | Merge pull request #519 from GitHubUser4234/masterblizzz2016-07-2825-97/+1084
|\ \ \ \
| * | | | Nextcloud license header for new filesroot2016-07-288-64/+83
| * | | | Merge branch 'master' of https://github.com/nextcloud/serverroot2016-07-27133-178/+914
| |\ \ \ \
| * | | | | comments amendedroot2016-07-273-3/+2
| * | | | | final changesroot2016-07-278-30/+23
| * | | | | Merge branch 'master' of https://github.com/nextcloud/serverroot2016-07-2577-175/+346
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://github.com/nextcloud/serverroot2016-07-2218-20/+20
| |\ \ \ \ \ \
| * | | | | | | New LDAPProvider for user_ldaproot2016-07-2226-98/+1074
* | | | | | | | Merge pull request #494 from nextcloud/systemtag-managementLukas Reschke2016-07-286-1/+287
|\ \ \ \ \ \ \ \
| * | | | | | | | Add a simple Admin UI to manage systemtagsJoas Schilling2016-07-276-1/+287
* | | | | | | | | [tx-robot] updated from transifexNextcloud bot2016-07-288-16/+16
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge pull request #606 from nextcloud/ocs_middleware_support_subdirMorris Jobke2016-07-272-1/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | Support subdir in the OCS v2 endpointRoeland Jago Douma2016-07-272-1/+31
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #571 from nextcloud/no-missing-previewMorris Jobke2016-07-2713-20/+133
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | fix js testRobin Appelman2016-07-271-5/+10
| * | | | | | | only load sidebar previews when we know it's availableRobin Appelman2016-07-272-5/+16