summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Move actual password reset to vueJulius Härtl2019-07-3112-92/+226
* [tx-robot] updated from transifexNextcloud bot2019-07-298-2/+8
* Merge pull request #16573 from nextcloud/fix-default-timeouts-in-oc-notificationRoeland Jago Douma2019-07-288-16/+118
|\
| * Add unit tests for "OC.Notification.hide()"Daniel Calviño Sánchez2019-07-261-0/+56
| * Fix default timeouts in OC.NotificationDaniel Calviño Sánchez2019-07-268-11/+39
| * Fix mixed test for "show" and "showTemporary"Daniel Calviño Sánchez2019-07-261-1/+19
| * Check number of elements instead of if the jQuery object is definedDaniel Calviño Sánchez2019-07-261-4/+4
* | Merge pull request #16583 from nextcloud/dependabot/npm_and_yarn/webpack-4.38.0Roeland Jago Douma2019-07-282-4/+4
|\ \
| * | Bump webpack from 4.36.1 to 4.38.0dependabot-preview[bot]2019-07-282-4/+4
* | | [tx-robot] updated from transifexNextcloud bot2019-07-2864-56/+38
|/ /
* | Merge pull request #16560 from nextcloud/bugfix/noid/fix_cutype_reportingRoeland Jago Douma2019-07-271-11/+16
|\ \
| * | fix CUType reportingGeorg Ehrke2019-07-261-11/+16
* | | Merge pull request #16558 from nextcloud/enh/less_verbose_locked_loggingRoeland Jago Douma2019-07-271-3/+3
|\ \ \
| * | | Do not log all locked exceptionsRoeland Jago Douma2019-07-261-3/+3
| | |/ | |/|
* | | [tx-robot] updated from transifexNextcloud bot2019-07-27126-212/+218
* | | Merge pull request #16556 from nextcloud/feature/16554_adminAuditShareByMail/...Morris Jobke2019-07-261-0/+25
|\ \ \
| * | | log email shares in admin_audit logSascha Wiswedel2019-07-261-0/+25
| |/ /
* | | Merge pull request #16557 from nextcloud/enh/do_not_log_locked_filesMorris Jobke2019-07-261-1/+8
|\ \ \
| * | | Do not log locked filesRoeland Jago Douma2019-07-261-1/+8
* | | | Merge pull request #16555 from nextcloud/fix/16529/mask-keysMorris Jobke2019-07-262-4/+7
|\ \ \ \
| * | | | treat sensitive config keys by patternArthur Schiwon2019-07-262-4/+7
| | |/ / | |/| |
* | | | Merge pull request #16551 from nextcloud/fix/12735/displayname-emailMorris Jobke2019-07-262-1/+227
|\ \ \ \
| * | | | supresses disclosing the userid for LDAP users in the welcome mailArthur Schiwon2019-07-262-1/+227
| | |/ / | |/| |
* | | | Merge pull request #16456 from nextcloud/dep/searchByTagRoeland Jago Douma2019-07-2610-306/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove deprecated searchByTagRoeland Jago Douma2019-07-2610-306/+0
| |/ /
* | | Merge pull request #16461 from nextcloud/fix/noid/pgsql-versionRoeland Jago Douma2019-07-261-2/+2
|\ \ \ | |/ / |/| |
| * | fixes the check for postgresqlArthur Schiwon2019-07-181-2/+2
* | | Merge pull request #16542 from nextcloud/dependabot/npm_and_yarn/build/fstrea...Roeland Jago Douma2019-07-261-17/+3
|\ \ \
| * | | [Security] Bump fstream from 1.0.11 to 1.0.12 in /builddependabot-preview[bot]2019-07-251-17/+3
* | | | [tx-robot] updated from transifexNextcloud bot2019-07-2612-54/+56
* | | | Merge pull request #16532 from nextcloud/bugfix/14776/maxcontrast-fixMorris Jobke2019-07-251-3/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Trigger fallback code to get max contrast value and use integer thereMorris Jobke2019-07-251-2/+5
| * | | Fix max contrast retrieval to limit minimum color for relative timeMorris Jobke2019-07-241-1/+1
* | | | Merge pull request #16503 from nextcloud/bugfix/5504/create_new_birthday_cale...Roeland Jago Douma2019-07-251-0/+5
|\ \ \ \
| * | | | allow to provide supported calendar component set internally as a stringGeorg Ehrke2019-07-221-0/+5
| |/ / /
* | | | [tx-robot] updated from transifexNextcloud bot2019-07-2514-12/+50
* | | | Merge pull request #16528 from nextcloud/shipped-texteditorMorris Jobke2019-07-241-1/+0
|\ \ \ \
| * | | | Remove files_texteditor from shipped appsJulius Härtl2019-07-241-1/+0
|/ / / /
* | | | Merge pull request #15637 from nextcloud/bugfix/15567/ignore-hidden-shareblizzz2019-07-242-4/+51
|\ \ \ \
| * | | | Fix wrong indentationDaniel Kesselberg2019-07-221-1/+1
| * | | | Fix invalid recursionDaniel Kesselberg2019-07-212-3/+3
| * | | | Allow hidden smb sharesDaniel Kesselberg2019-07-162-1/+48
* | | | | Merge pull request #16523 from nextcloud/bugfix/noid/nested-recursion-breakin...blizzz2019-07-241-2/+2
|\ \ \ \ \
| * | | | | PHPStorm code cleanupJoas Schilling2019-07-241-2/+2
| * | | | | Get the topmost parent for the parent instead of doing endless recursionJoas Schilling2019-07-241-1/+1
|/ / / / /
* | | | | Merge pull request #16493 from nextcloud/enh/remove-curly-bracesRoeland Jago Douma2019-07-241-1/+1
|\ \ \ \ \
| * | | | | The array and string offset access syntax using curly braces is deprecated.Daniel Kesselberg2019-07-211-1/+1
* | | | | | [tx-robot] updated from transifexNextcloud bot2019-07-244-0/+6
* | | | | | Merge pull request #16505 from nextcloud/enh/nitpicks-14954Roeland Jago Douma2019-07-232-5/+4
|\ \ \ \ \ \
| * | | | | | Dont assign $options to $options and cleanup docDaniel Kesselberg2019-07-222-5/+4
| | |_|/ / / | |/| | | |