summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-02-2414-4/+276
* Merge pull request #8519 from nextcloud/fix-l10n-exceptionMorris Jobke2018-02-231-7/+7
|\
| * Use array in t() calls in exception templateJulius Härtl2018-02-231-7/+7
|/
* Merge pull request #8507 from nextcloud/fix-change-iconMorris Jobke2018-02-233-2/+2
|\
| * Update the change.svg icon in the Settings appMarin Treselj2018-02-221-1/+1
| * Add some whitespace around change.svg iconMarin Treselj2018-02-222-1/+1
* | Merge pull request #8502 from nextcloud/properly-show-hints-in-ocsMorris Jobke2018-02-231-2/+10
|\ \
| * | Show hint in OCS API for user creationMorris Jobke2018-02-221-2/+10
* | | [tx-robot] updated from transifexNextcloud bot2018-02-2316-24/+108
* | | Merge pull request #8499 from nextcloud/avoid-fruitless-login-attemptsMorris Jobke2018-02-223-6/+35
|\ \ \
| * | | don't try login with the same name that just failedArthur Schiwon2018-02-221-3/+5
| * | | track the state of the bind resultArthur Schiwon2018-02-222-3/+30
| |/ /
* | | Merge pull request #8416 from nextcloud/bugfix/8401/usermanagement-popoverblizzz2018-02-222-5/+7
|\ \ \ | |_|/ |/| |
| * | Fix hiding and event propagation issues with the user management popoverJulius Härtl2018-02-182-5/+7
* | | Merge pull request #8495 from nextcloud/fix-ldap-settings-l10ntMorris Jobke2018-02-224-5/+5
|\ \ \ | |_|/ |/| |
| * | 2nd parameter to t() must be arrayArthur Schiwon2018-02-224-5/+5
|/ /
* | Merge pull request #8476 from nextcloud/strict_l10nRoeland Jago Douma2018-02-224-30/+32
|\ \
| * | Fix more templatesRoeland Jago Douma2018-02-211-1/+1
| * | Fix other testsRoeland Jago Douma2018-02-212-5/+6
| * | Proper closure for functionRoeland Jago Douma2018-02-211-2/+2
| * | Make OCP\IL10N strictRoeland Jago Douma2018-02-212-23/+24
* | | Merge pull request #8472 from nextcloud/strict_integritycheckRoeland Jago Douma2018-02-227-34/+47
|\ \ \
| * | | Handle strict typing in Checker and fix testsRoeland Jago Douma2018-02-212-1/+9
| * | | Make OC\IntegrityCheck strictRoeland Jago Douma2018-02-216-33/+38
* | | | Merge pull request #8490 from nextcloud/strict_systemtagsRoeland Jago Douma2018-02-2214-106/+112
|\ \ \ \
| * | | | Properly castRoeland Jago Douma2018-02-211-1/+1
| * | | | Make SystemTag strictRoeland Jago Douma2018-02-2113-105/+111
* | | | | [tx-robot] updated from transifexNextcloud bot2018-02-2216-10/+148
* | | | | Merge pull request #8473 from nextcloud/strict_cmrRoeland Jago Douma2018-02-212-30/+33
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Don't try to match on falseRoeland Jago Douma2018-02-211-17/+19
| * | | | Strict OCP\AppFramework\Utility\IControllerMethodReflectorRoeland Jago Douma2018-02-212-14/+15
| |/ / /
* | | | Merge pull request #8474 from nextcloud/bugfix/ciu-12/log-exceptions-that-hap...Morris Jobke2018-02-211-0/+1
|\ \ \ \
| * | | | Log exceptions that happen when writing the app store reply to storageJoas Schilling2018-02-211-0/+1
| | |/ / | |/| |
* | | | Merge pull request #8456 from nextcloud/bugfix/noid/phpunit-can-now-handle-di...Morris Jobke2018-02-211-11/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Use phpunit's directory featureJoas Schilling2018-02-201-11/+3
* | | | Merge pull request #8466 from nextcloud/strict_middlewaredipatcherRoeland Jago Douma2018-02-215-27/+31
|\ \ \ \
| * | | | Make sure that render always returns a stringRoeland Jago Douma2018-02-211-2/+2
| * | | | Fix testsRoeland Jago Douma2018-02-214-16/+19
| * | | | Make the middlewareDispatcher strictRoeland Jago Douma2018-02-211-9/+10
* | | | | Merge pull request #8471 from nextcloud/fix_upgradeRoeland Jago Douma2018-02-212-1/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | getIncompatibleApps needs a string not an arrayRoeland Jago Douma2018-02-212-1/+2
| |/ / /
* | | | Merge pull request #8468 from nextcloud/fix-unicode-avatarsRoeland Jago Douma2018-02-211-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Use mb_* string methods to extract first character for generated avatarsMorris Jobke2018-02-211-1/+1
* | | | Merge pull request #8465 from nextcloud/strict_dispatcherMorris Jobke2018-02-211-8/+16
|\ \ \ \ | |/ / / |/| | |
| * | | Make AppFramework/Http/Dispatcher strictRoeland Jago Douma2018-02-211-8/+16
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2018-02-2144-70/+250
* | | Merge pull request #8206 from nextcloud/bugfix/noid/fix-collaboration-result-...blizzz2018-02-204-3/+7
|\ \ \
| * | | Better result handling of email searchJoas Schilling2018-02-204-3/+7
* | | | Merge pull request #8336 from nextcloud/cleanup-unused-parameterRoeland Jago Douma2018-02-206-49/+3
|\ \ \ \
| * | | | Remove fromMailAddress from MailSettingsControllerMorris Jobke2018-02-132-10/+1