Webpack encore #709
Draft
Webpack encore #709
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* master: (734 commits) Fix test method name. Remove testdox. Fix fqcn. More StartValueParameterTest. Fix StartValueParameterTest. Merge tests. Fix BoundingBoxQueryTest. WIP. Generalize DateTimeQueryTest. Generalize RadiusQueryTest. These are cities, not rides. Fixes. Delete unused tests. Fix distance issues. Generalize OrderByDistanceParameterTest. Fix CoordinateInterface and correspondig entities. Generalize OrderByParameterTest. Introduce generic SizeParameterTest. Broken WIP for generic StartValueParameterTest. SizeParameterTest. ... # Conflicts: # composer.json # composer.lock # config/bundles.php # src/Kernel.php
…lmass into webpack-encore * 'webpack-encore' of https://github.com/calderacc/criticalmass: Play with CookieNotice. # Conflicts: # assets/js/app.js # assets/js/modules/CookieNotice.js
* master: (376 commits) Use proxy server if defined. Introduce new env vars. WIP QND ï Fix counter. More fixes. Add since_id again. Merge fixes. Done. Do not roll over string ending. Fix raw media string. Show instagram photos in timeline. Much wip for fetcher. First bunch of WIP for instagram fetching. Require instagram php scraper. Well. Decode null values. Do not set last tweet id to null if there are no new tweets. Replace unsupported json type with text. Remove debug output. ... # Conflicts: # composer.lock # config/bundles.php # config/packages/framework.yaml # package-lock.json # symfony.lock # templates/Timeline/Items/rideEdit.html.twig
* master: (62 commits) Minor improvements. Registry is never used here. Fix ride merging. Fetch lazy. Extract abstract class. More fixes. Add $viewRelation to Ride entity. Fix doctrine migration. Return 201 when creating resources. Fix double view creation. Use constant for status code. Add types to properties. Allow to persist retrieved data to database. Expose Weather properties. Remove all WeatherInterface traces. Remove more caldera bundle stuff. Remove more admin routes. Add twig extra bundles again. Remove admin security rules. Remove sonata config. ... # Conflicts: # composer.lock # config/bundles.php # config/packages/framework.yaml # package-lock.json
* master: Bump kind-of from 6.0.2 to 6.0.3 Bump clean-css and gulp-clean-css Bump yargs-parser from 5.0.0 to 5.0.1 Bump tar from 4.4.8 to 6.1.11 Bump ini from 1.3.5 to 1.3.8 Bump y18n from 3.2.1 to 3.2.2 Bump hosted-git-info from 2.7.1 to 2.8.9 Bump path-parse from 1.0.6 to 1.0.7 Remove php curl class. Bump scss-tokenizer, gulp-sass and node-sass Bump got and npm Bump minimist, minimist and mkdirp Bump moment from 2.29.2 to 2.29.4 Fix return type for monthlist key. Use repositories instead finder as they are not accessable as private services. Do not show hidden posts. Add message for closing down. Fix ride list for frontpage. Fix ViewStoragePersister one more time. Replace most symfony stuff with framework-bundle. # Conflicts: # composer.lock # package-lock.json # package.json
* main: (185 commits) Add docker-compose.yaml More reverts. Cleanup. Cleanup. composer update Revert even more. Revert unused stuff. Next try to revert. Revert. More fixes. Adjustments. Remove unused namespaces. Bump minimatch from 3.0.4 to 3.0.8 Use original calendr, adjustments. Fix old CalendRExtension. Remove vimeo/psalm. Update phpunit/phpunit to ^9 to get rid of phpunit/php-token-stream. Finally ignore .env files. Disable html5 for now. Replace deprecated has_role() with is_granted(). ... # Conflicts: # .env # .gitignore # composer.json # composer.lock # config/bundles.php # docker-compose.yml # package-lock.json # src/Controller/Api/PhotoController.php # src/Controller/Api/SubrideController.php # src/Controller/Api/TrackController.php # src/Controller/Track/TrackManagementController.php # src/Controller/Track/TrackRangeController.php # src/Criticalmass/Geocoding/ReverseGeocoder.php # src/Form/Type/CityCycleType.php # src/Form/Type/RideType.php # symfony.lock # templates/City/show.html.twig # templates/Heatmap/city.html.twig # templates/Heatmap/list.html.twig # templates/Heatmap/ride.html.twig
# Conflicts: # src/Entity/Track.php
# Conflicts: # composer.lock # package-lock.json
* main: Add migration. Add indizes for timeline relevant columns. Require symfony/twig-bridge Update twig/extra-bundle Fix cycle api. Remove format option from ExecuteCityCycleType. Fix social media list. Hide panel when there are no profiles. Remove psalm.xml Bump http-cache-semantics from 4.1.0 to 4.1.1 Sort attribute arguments. Add migration. Tokens can be very long. Bump decode-uri-component from 0.2.0 to 0.2.2 Remove psalm. # Conflicts: # composer.json # composer.lock # package-lock.json
# Conflicts: # composer.json # composer.lock
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.