aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #13156 from nextcloud/enhancement/npmizeRoeland Jago Douma2019-01-09102-32391/+6493
|\ | | | | Use npm for js depdencies, bundle with webpack
| * Bump select2 from 3.4.5 to 3.4.8Christoph Wurst2019-01-095-46/+54
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * Fix select2 style preferenceJulius Härtl2019-01-091-3/+3
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * Use upstream strengthify libChristoph Wurst2019-01-092-3/+3
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * Override select2 lib stylingJohn Molakvoæ (skjnldsv)2019-01-091-5/+6
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Update select2, include cssChristoph Wurst2019-01-096-31/+36
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * Mergejs is goneRoeland Jago Douma2019-01-091-2/+0
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Use `jquery-ui-dist` instead of `jquery-ui` to resolve an issue with effectsChristoph Wurst2019-01-095-195/+104
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * Adjust release file listChristoph Wurst2019-01-091-2/+4
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * Don't load old vendor files during jsunit testsChristoph Wurst2019-01-095-65531/+1
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * Move dev deps to devDependenciesChristoph Wurst2019-01-092-207/+772
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * Remove core.jsChristoph Wurst2019-01-095-97/+0
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * Move vendored css ponyfill to npmChristoph Wurst2019-01-098-70/+201
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * Remove BowerChristoph Wurst2019-01-095-93/+7
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * Npmize (vendor) scriptsChristoph Wurst2019-01-0994-32174/+71370
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #13446 from nextcloud/bugfix/13430/prevent-php-info-logMorris Jobke2019-01-091-1/+1
|\ \ | | | | | | Prevent php info about missing index for old events
| * | Prevent php info about missing index for old eventsJoas Schilling2019-01-091-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #13177 from rummatee/issue7629Jan-Christoph Borchardt2019-01-094-3/+151
|\ \ \ | |_|/ |/| | Create Folders when moving files
| * | use triple equal signs according to style guideFlorian Schunk2019-01-091-1/+1
| | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
| * | move to new folderFlorian Schunk2019-01-091-1/+1
| | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
| * | use triple equal signs according to style guideFlorian Schunk2019-01-092-2/+2
| | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
| * | fix button position for chromeFlorian Schunk2019-01-091-2/+2
| | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
| * | change menu's orientation to make sure it is completly visibleFlorian Schunk2019-01-093-2/+3
| | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
| * | open name prompt on pressing enterFlorian Schunk2019-01-091-0/+11
| | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
| * | reset name of new folder and prevent the form from being submitted twiceFlorian Schunk2019-01-091-1/+6
| | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
| * | adjust design to match file appFlorian Schunk2019-01-091-6/+7
| | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
| * | add functionality to create new folder in file pickerFlorian Schunk2019-01-094-3/+107
| | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
| * | added button for new folder to interfaceFlorian Schunk2019-01-092-1/+27
| | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
* | | Merge pull request #13420 from nextcloud/enh/13042/default-frame-anchestor-setRoeland Jago Douma2019-01-096-63/+65
|\ \ \ | | | | | | | | Set default frame-ancestors to 'self'
| * | | Set default frame-ancestors to 'self'Roeland Jago Douma2019-01-086-63/+65
| | | | | | | | | | | | | | | | | | | | | | | | For #13042 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #12969 from nextcloud/db-migration-boolean-defaultJoas Schilling2019-01-091-1/+5
|\ \ \ \ | |_|_|/ |/| | | add support for boolean default
| * | | add support for boolean defaultMaxence Lange2019-01-091-1/+5
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com> code cleaning Signed-off-by: Maxence Lange <maxence@artificial-owl.com> code cleaning Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | | Merge pull request #13438 from nextcloud/enh/2fa_backup_use_scoped_cssRoeland Jago Douma2019-01-097-19/+522
|\ \ \ | |/ / |/| | Use the scoped css on the personal page
| * | Use the scoped css on the personal pageRoeland Jago Douma2019-01-097-19/+522
|/ / | | | | | | | | | | Saves loading the style file when we visit the security page. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #13430 from ↵Roeland Jago Douma2019-01-096-3/+147
|\ \ | | | | | | | | | | | | nextcloud/bugfix/13331/respect-classification-of-calendar-events-in-activity-stream Respect classification of calendar events in activity stream
| * | Add a repair step to remove sensitive event activityJoas Schilling2019-01-084-1/+128
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Correctly handle the classification of events in the activity streamJoas Schilling2019-01-082-3/+20
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #13436 from nextcloud/enh/2fa-backup-to-nx-axiosRoeland Jago Douma2019-01-095-25/+20
|\ \ \ | | | | | | | | Use nextcloud-axios in 2fa backupcodes js
| * | | Use nextcloud-axios in 2fa backupcodes jsRoeland Jago Douma2019-01-095-25/+20
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #13432 from nextcloud/3rdparty/symfony/event-dispatcher-4.2.2Roeland Jago Douma2019-01-091-0/+0
|\ \ \ \ | |/ / / |/| | | [3rdparty] Bump symfony/event-dispatcher to 4.2.2
| * | | [3rdparty] Bump symfony/event-dispatcher to 4.2.2Roeland Jago Douma2019-01-091-0/+0
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2019-01-098-10/+12
|/ / /
* | | Merge pull request #13429 from nextcloud/optimization-syntaxMorris Jobke2019-01-081-1/+1
|\ \ \ | | | | | | | | Switch around syntax of scour command for SVG image optimization
| * | | Switch around syntax of scour command for SVG image optimizationJan-Christoph Borchardt2019-01-081-1/+1
|/ / / | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Merge pull request #13418 from nextcloud/fix/11999/headers_can_be_emptyRoeland Jago Douma2019-01-081-1/+7
|\ \ \ | |_|/ |/| | HttpClient getHeader can return empty string
| * | HttpClient getHeader can return empty stringRoeland Jago Douma2019-01-081-1/+7
|/ / | | | | | | | | | | Fixes #11999 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #13421 from nextcloud/3rdparty/to-masterRoeland Jago Douma2019-01-081-0/+0
|\ \ | | | | | | Actually point 3rdparty to master
| * | Actually point 3rdparty to masterRoeland Jago Douma2019-01-081-0/+0
|/ / | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #12899 from nextcloud/feature/run-setupcheck-on-overwieMorris Jobke2019-01-081-57/+63
|\ \ | | | | | | Run setupchecks when #security-warnings is present
| * | Run setupchecks when #security-warnings is presentDaniel Kesselberg2019-01-051-57/+63
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>