summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #10472 from ↵Roeland Jago Douma2018-07-311-0/+3
|\ | | | | | | | | nextcloud/add-notification-container-to-public-layout-template Add notification container to public layout template
| * Add notification container to public layout templateDaniel Calviño Sánchez2018-07-311-0/+3
| | | | | | | | | | | | | | This is needed to show notifications using the standard "OC.Notification.show" function. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | Merge pull request #9242 from ↵Roeland Jago Douma2018-07-318-13/+140
|\ \ | |/ |/| | | | | nextcloud/fix-display-name-ignored-when-creating-new-user Fix display name ignored when creating new user
| * Compile vueRoeland Jago Douma2018-07-312-8/+8
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Add acceptance test for creating a user with a custom display nameDaniel Calviño Sánchez2018-07-312-0/+62
| | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Set display name (if specified) when a new user is createdDaniel Calviño Sánchez2018-07-314-12/+14
| | | | | | | | | | | | | | | | Although the form to create a new user included a field to set the display name its value was not taken into account, so the new user ended with the default display name (the same as the user name). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Add optional "displayName" parameter to add user endpointDaniel Calviño Sánchez2018-07-312-7/+70
| | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | Merge pull request #10469 from nextcloud/bugfix/10420/tags-managementRoeland Jago Douma2018-07-312-12/+10
|\ \ | | | | | | Revert to regular buttons in system tags management
| * | Revert to regular buttons in system tags managementJulius Härtl2018-07-312-12/+10
| |/ | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #10468 from nextcloud/bugfix/10094/apps-management-spaceRoeland Jago Douma2018-07-311-5/+21
|\ \ | | | | | | Add more spacing to the apps management sidebar
| * | Add more spacing to the apps management sidebarJulius Härtl2018-07-311-5/+21
| |/ | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #10467 from nextcloud/fix/10403/reword_noteRoeland Jago Douma2018-07-312-2/+2
|\ \ | |/ |/| Reword share comment feature
| * Reword share comment featureRoeland Jago Douma2018-07-312-2/+2
|/ | | | | | Fixes #10403 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #10444 from ↵blizzz2018-07-313-4/+10
|\ | | | | | | | | nextcloud/feature/noid/allow-to-filter-unread-count-by-verb Allow to filter the unread count by verb
| * Allow to filter the unread count by verbJoas Schilling2018-07-303-4/+10
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #10459 from nextcloud/bugfix/noid/install-pageRoeland Jago Douma2018-07-312-1/+2
|\ \ | | | | | | Fix caret icon on installation page
| * | Fix caret icon on installation pageJulius Härtl2018-07-302-1/+2
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #10460 from nextcloud/bugfix/10443/theming-iconsRoeland Jago Douma2018-07-311-5/+8
|\ \ \ | | | | | | | | Use icon mixins for the theming scss
| * | | Use icon mixins for the theming scssJulius Härtl2018-07-311-5/+8
| |/ / | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #10462 from nextcloud/fix/provider-registry-duplicate-entriesRoeland Jago Douma2018-07-312-10/+37
|\ \ \ | | | | | | | | Fix duplicate inserts in the 2fa provider registry DAO
| * | | Fix duplicate inserts in the 2fa provider registry DAOChristoph Wurst2018-07-312-10/+37
|/ / / | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* / / [tx-robot] updated from transifexNextcloud bot2018-07-3148-24/+102
|/ /
* | Merge pull request #10451 from nextcloud/fix/9693/move_logcondition_upRoeland Jago Douma2018-07-301-1/+2
|\ \ | | | | | | Fetch logcondition earlier
| * | Fetch logcondition earlierRoeland Jago Douma2018-07-301-1/+2
| | | | | | | | | | | | | | | | | | Fixes #9693 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #10221 from ↵Roeland Jago Douma2018-07-302-2/+421
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/prevent-too-long-identifiers Prevent too long identifier names
| * | | Fix primary key handling on postgresJoas Schilling2018-07-271-3/+4
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Ignore custom prefixes which are longerJoas Schilling2018-07-272-19/+19
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Ignore automatic generated sequencesJoas Schilling2018-07-271-1/+10
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix calculation of default nameJoas Schilling2018-07-272-6/+83
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Add unit testsJoas Schilling2018-07-271-1/+293
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Prevent too long identifier namesJoas Schilling2018-07-271-1/+41
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #10435 from nextcloud/rakekniven-patch-1Joas Schilling2018-07-301-1/+1
|\ \ \ \ | | | | | | | | | | Typo fix: Triple dot to ellipsis
| * | | | Update IMipPlugin.phprakekniven2018-07-301-1/+1
| | | | | | | | | | | | | | | Added space before ellipsis
| * | | | Typo fix: Triple dot to ellipsisrakekniven2018-07-291-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Mark Ziegler <mark.ziegler@rakekniven.de>
* | | | | Merge pull request #8357 from nextcloud/ui-regressionRoeland Jago Douma2018-07-3014-3/+1235
|\ \ \ \ \ | |_|_|/ / |/| | | | Frontend testing using puppeteer
| * | | | Keep timestamp replacements at the beginningJulius Härtl2018-07-301-2/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Fix install button layout to avoid irregular test failuresJulius Härtl2018-07-301-3/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Improve test durationJulius Härtl2018-07-303-15/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> Reincrement network idle to 3 s Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Add custom network idle waiting and some JS injection to make tests more stableJulius Härtl2018-07-293-17/+67
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Fix new settings and login testsJulius Härtl2018-07-298-17/+28
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Use correct domain for ci-assetsJulius Härtl2018-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Update object storageMorris Jobke2018-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Frontend regression testing with puppeteerJulius Härtl2018-07-2913-0/+1173
| |/ / / | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #10421 from nextcloud/content-wrapper-cleanupRoeland Jago Douma2018-07-305-59/+34
|\ \ \ \ | | | | | | | | | | Really cleanup the content-wrapper
| * | | | Mobile scroll fixesJohn Molakvoæ (skjnldsv)2018-07-302-4/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Mobile fixes and list fixesJohn Molakvoæ (skjnldsv)2018-07-272-29/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | App-content list fixes for new layoutJohn Molakvoæ (skjnldsv)2018-07-271-8/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Height fix for contentJohn Molakvoæ (skjnldsv)2018-07-271-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Really cleanup the content-wrapperJohn Molakvoæ (skjnldsv)2018-07-274-20/+7
| | |/ / | |/| | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #10447 from nextcloud/contactsmenu-height-fixRoeland Jago Douma2018-07-301-1/+1
|\ \ \ \ | |_|_|/ |/| | | Fix contactsmenu overflow