Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #13156 from nextcloud/enhancement/npmize | Roeland Jago Douma | 2019-01-09 | 102 | -32391/+6493 |
|\ | | | | | Use npm for js depdencies, bundle with webpack | ||||
| * | Bump select2 from 3.4.5 to 3.4.8 | Christoph Wurst | 2019-01-09 | 5 | -46/+54 |
| | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | Fix select2 style preference | Julius Härtl | 2019-01-09 | 1 | -3/+3 |
| | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| * | Use upstream strengthify lib | Christoph Wurst | 2019-01-09 | 2 | -3/+3 |
| | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | Override select2 lib styling | John Molakvoæ (skjnldsv) | 2019-01-09 | 1 | -5/+6 |
| | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
| * | Update select2, include css | Christoph Wurst | 2019-01-09 | 6 | -31/+36 |
| | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | Mergejs is gone | Roeland Jago Douma | 2019-01-09 | 1 | -2/+0 |
| | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | Use `jquery-ui-dist` instead of `jquery-ui` to resolve an issue with effects | Christoph Wurst | 2019-01-09 | 5 | -195/+104 |
| | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | Adjust release file list | Christoph Wurst | 2019-01-09 | 1 | -2/+4 |
| | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | Don't load old vendor files during jsunit tests | Christoph Wurst | 2019-01-09 | 5 | -65531/+1 |
| | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | Move dev deps to devDependencies | Christoph Wurst | 2019-01-09 | 2 | -207/+772 |
| | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | Remove core.js | Christoph Wurst | 2019-01-09 | 5 | -97/+0 |
| | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | Move vendored css ponyfill to npm | Christoph Wurst | 2019-01-09 | 8 | -70/+201 |
| | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | Remove Bower | Christoph Wurst | 2019-01-09 | 5 | -93/+7 |
| | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | Npmize (vendor) scripts | Christoph Wurst | 2019-01-09 | 94 | -32174/+71370 |
| | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
* | | Merge pull request #13446 from nextcloud/bugfix/13430/prevent-php-info-log | Morris Jobke | 2019-01-09 | 1 | -1/+1 |
|\ \ | | | | | | | Prevent php info about missing index for old events | ||||
| * | | Prevent php info about missing index for old events | Joas Schilling | 2019-01-09 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | Merge pull request #13177 from rummatee/issue7629 | Jan-Christoph Borchardt | 2019-01-09 | 4 | -3/+151 |
|\ \ \ | |_|/ |/| | | Create Folders when moving files | ||||
| * | | use triple equal signs according to style guide | Florian Schunk | 2019-01-09 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de> | ||||
| * | | move to new folder | Florian Schunk | 2019-01-09 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de> | ||||
| * | | use triple equal signs according to style guide | Florian Schunk | 2019-01-09 | 2 | -2/+2 |
| | | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de> | ||||
| * | | fix button position for chrome | Florian Schunk | 2019-01-09 | 1 | -2/+2 |
| | | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de> | ||||
| * | | change menu's orientation to make sure it is completly visible | Florian Schunk | 2019-01-09 | 3 | -2/+3 |
| | | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de> | ||||
| * | | open name prompt on pressing enter | Florian Schunk | 2019-01-09 | 1 | -0/+11 |
| | | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de> | ||||
| * | | reset name of new folder and prevent the form from being submitted twice | Florian Schunk | 2019-01-09 | 1 | -1/+6 |
| | | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de> | ||||
| * | | adjust design to match file app | Florian Schunk | 2019-01-09 | 1 | -6/+7 |
| | | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de> | ||||
| * | | add functionality to create new folder in file picker | Florian Schunk | 2019-01-09 | 4 | -3/+107 |
| | | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de> | ||||
| * | | added button for new folder to interface | Florian Schunk | 2019-01-09 | 2 | -1/+27 |
| | | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de> | ||||
* | | | Merge pull request #13420 from nextcloud/enh/13042/default-frame-anchestor-set | Roeland Jago Douma | 2019-01-09 | 6 | -63/+65 |
|\ \ \ | | | | | | | | | Set default frame-ancestors to 'self' | ||||
| * | | | Set default frame-ancestors to 'self' | Roeland Jago Douma | 2019-01-08 | 6 | -63/+65 |
| | | | | | | | | | | | | | | | | | | | | | | | | For #13042 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | Merge pull request #12969 from nextcloud/db-migration-boolean-default | Joas Schilling | 2019-01-09 | 1 | -1/+5 |
|\ \ \ \ | |_|_|/ |/| | | | add support for boolean default | ||||
| * | | | add support for boolean default | Maxence Lange | 2019-01-09 | 1 | -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_css | Roeland Jago Douma | 2019-01-09 | 7 | -19/+522 |
|\ \ \ | |/ / |/| | | Use the scoped css on the personal page | ||||
| * | | Use the scoped css on the personal page | Roeland Jago Douma | 2019-01-09 | 7 | -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 Douma | 2019-01-09 | 6 | -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 activity | Joas Schilling | 2019-01-08 | 4 | -1/+128 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | Correctly handle the classification of events in the activity stream | Joas Schilling | 2019-01-08 | 2 | -3/+20 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | Merge pull request #13436 from nextcloud/enh/2fa-backup-to-nx-axios | Roeland Jago Douma | 2019-01-09 | 5 | -25/+20 |
|\ \ \ | | | | | | | | | Use nextcloud-axios in 2fa backupcodes js | ||||
| * | | | Use nextcloud-axios in 2fa backupcodes js | Roeland Jago Douma | 2019-01-09 | 5 | -25/+20 |
| | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | Merge pull request #13432 from nextcloud/3rdparty/symfony/event-dispatcher-4.2.2 | Roeland Jago Douma | 2019-01-09 | 1 | -0/+0 |
|\ \ \ \ | |/ / / |/| | | | [3rdparty] Bump symfony/event-dispatcher to 4.2.2 | ||||
| * | | | [3rdparty] Bump symfony/event-dispatcher to 4.2.2 | Roeland Jago Douma | 2019-01-09 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2019-01-09 | 8 | -10/+12 |
|/ / / | |||||
* | | | Merge pull request #13429 from nextcloud/optimization-syntax | Morris Jobke | 2019-01-08 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Switch around syntax of scour command for SVG image optimization | ||||
| * | | | Switch around syntax of scour command for SVG image optimization | Jan-Christoph Borchardt | 2019-01-08 | 1 | -1/+1 |
|/ / / | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
* | | | Merge pull request #13418 from nextcloud/fix/11999/headers_can_be_empty | Roeland Jago Douma | 2019-01-08 | 1 | -1/+7 |
|\ \ \ | |_|/ |/| | | HttpClient getHeader can return empty string | ||||
| * | | HttpClient getHeader can return empty string | Roeland Jago Douma | 2019-01-08 | 1 | -1/+7 |
|/ / | | | | | | | | | | | Fixes #11999 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | Merge pull request #13421 from nextcloud/3rdparty/to-master | Roeland Jago Douma | 2019-01-08 | 1 | -0/+0 |
|\ \ | | | | | | | Actually point 3rdparty to master | ||||
| * | | Actually point 3rdparty to master | Roeland Jago Douma | 2019-01-08 | 1 | -0/+0 |
|/ / | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | Merge pull request #12899 from nextcloud/feature/run-setupcheck-on-overwie | Morris Jobke | 2019-01-08 | 1 | -57/+63 |
|\ \ | | | | | | | Run setupchecks when #security-warnings is present | ||||
| * | | Run setupchecks when #security-warnings is present | Daniel Kesselberg | 2019-01-05 | 1 | -57/+63 |
| | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de> |