summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* remove outdated scenarioArthur Schiwon2017-01-201-6/+0
* fix deletion for configIDs < s10Arthur Schiwon2017-01-201-14/+12
* LDAP PUT command now supports setting multiple keys at onceArthur Schiwon2017-01-203-36/+41
* enable user_ldap app for testsArthur Schiwon2017-01-202-1/+2
* fix indentationMorris Jobke2017-01-191-9/+9
* also, let ldap integration tests runArthur Schiwon2017-01-191-0/+10
* LDAP OCS Api for show configArthur Schiwon2017-01-194-0/+136
* test against OCS v2 insteadArthur Schiwon2017-01-192-19/+13
* add LDAP OCS Api for modifying a configurationArthur Schiwon2017-01-194-11/+101
* fix and extend behat testsArthur Schiwon2017-01-194-3/+77
* LDAP OCS Api for delete configArthur Schiwon2017-01-183-0/+66
* LDAP OCS Api for create configArthur Schiwon2017-01-186-19/+177
* Merge pull request #3023 from nextcloud/issue-2915-filter-out-sensitive-appco...Christoph Wurst2017-01-177-12/+103
|\
| * Fix testsJoas Schilling2017-01-123-1/+29
| * Filter out sensitive appconfig valuesJoas Schilling2017-01-114-11/+74
* | [tx-robot] updated from transifexNextcloud bot2017-01-1718-472/+492
* | Merge pull request #3096 from nextcloud/update-theme-urlsMorris Jobke2017-01-161-3/+3
|\ \
| * | Prevent Example-Theme from using invalid URLsMarius Blüm2017-01-161-3/+3
|/ /
* | Merge pull request #3070 from dnel/Clarify-English-settingJoas Schilling2017-01-161-1/+1
|\ \
| * | Update personal.phpDavid Nelson2017-01-131-1/+1
* | | Merge pull request #3033 from nextcloud/share-by-mail-use-display-nameBjörn Schießle2017-01-161-7/+12
|\ \ \
| * | | generate correct path for owner and use the display name instead of the user idBjoern Schiessle2017-01-121-7/+12
* | | | [tx-robot] updated from transifexNextcloud bot2017-01-1684-106/+106
* | | | Merge pull request #3062 from nextcloud/user-settings-tooltipJoas Schilling2017-01-131-2/+2
|\ \ \ \
| * | | | use tooltip in user listChristoph Wurst2017-01-131-2/+2
* | | | | Merge pull request #3024 from nextcloud/apps-scss-optimisationJohn Molakvoæ2017-01-131-258/+232
|\ \ \ \ \
| * | | | | App navigation utils button fixJohn Molakvoæ (skjnldsv)2017-01-131-4/+4
| * | | | | App-navigation action layout fixJohn Molakvoæ (skjnldsv)2017-01-111-8/+8
| * | | | | Fix padding if empty buttonJohn Molakvoæ (skjnldsv)2017-01-111-1/+3
| * | | | | Second optimisation and readabilityJohn Molakvoæ (skjnldsv)2017-01-111-49/+41
| * | | | | CopyrightJohn Molakvoæ (skjnldsv)2017-01-111-1/+8
| * | | | | Comments and cleanupJohn Molakvoæ (skjnldsv)2017-01-111-93/+81
| * | | | | Quote fixJohn Molakvoæ (skjnldsv)2017-01-111-2/+2
| * | | | | popover menu restructuration & unificationJohn Molakvoæ (skjnldsv)2017-01-111-165/+150
| | |_|_|/ | |/| | |
* | | | | Merge pull request #3048 from nextcloud/share-scss-optimisationJohn Molakvoæ2017-01-131-68/+45
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Share scss optimisationJohn Molakvoæ (skjnldsv)2017-01-121-68/+45
* | | | | Merge pull request #3060 from nextcloud/cleanup-js-testsJoas Schilling2017-01-133-3/+17
|\ \ \ \ \
| * | | | | fix image warningsChristoph Wurst2017-01-131-1/+3
| * | | | | allow/fix loading of fontsChristoph Wurst2017-01-131-1/+4
| * | | | | expect warning to be shownChristoph Wurst2017-01-131-1/+3
| * | | | | add spies for l10n warningsChristoph Wurst2017-01-131-0/+7
* | | | | | Merge pull request #3051 from nextcloud/issue-2831-change-row-format-before-c...Joas Schilling2017-01-131-0/+12
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Change the row-format before changing the collationJoas Schilling2017-01-121-0/+12
| |/ / / /
* | | | | Merge pull request #2918 from nextcloud/encryption-recovery-improvementsMorris Jobke2017-01-1310-81/+176
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | create new encryption keys on password reset and backup the old oneBjoern Schiessle2017-01-1010-81/+176
* | | | | Merge pull request #3035 from nextcloud/fix-federationScopeMenu-menuMorris Jobke2017-01-121-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Update federationscopemenu.jsJohn Molakvoæ2017-01-111-1/+1
* | | | | [tx-robot] updated from transifexNextcloud bot2017-01-1212-26/+98
|/ / / /
* | | | Merge pull request #3029 from nextcloud/systemtags-scss-optimisationJohn Molakvoæ2017-01-111-28/+20
|\ \ \ \
| * | | | Systemtags scss optimisationJohn Molakvoæ (skjnldsv)2017-01-111-28/+20