Bootstrap 4 #411
Open
Bootstrap 4 #411
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: Update gdpr impress. Update impress. # Conflicts: # templates/Static/impress.html.twig
* master: Add leading zeros. Add flipcounter and styles.
* master: Even more dependency stuff went wrong. Add missing colon for routing. Remove Automap from non automapable timeline items. Fix dateformat for search typeahead. Fix to find next photo. Require dependency injection by 4.2.3-dev Declare strict types. As the ride list is indexed, there is no key 0. Raise dependencies to php 7.3 First try to get started with docker. Replace chartjs with Chart.bundle. Purge public fonts. Implement flipcounter into scss. Purge old css stuff. Someone broke photo repository.
* master: (128 commits) Remove unused StoreViewCommand. Add AbstractViewConsumer. Introduce ViewFactory. Resort all the classes. More fixes. Add RobustViewStorageCache with exception handling. Make connections lazy so they are not initialized right during service creation. Bugfix. Remove old source. Move and reorder class structure. Work in progress. WIP. Fix typo. Heavy work in progress. Implement StreamListConverter. Much work in progress. Remove serializer annotations. Much random wip. And suddenly strava activity ids are larger than integers. Looks like they changed the order of those lists. ... # Conflicts: # templates/Crawler/_website.html.twig # templates/Frontpage/index.html.twig # templates/ProfileManagement/manage.html.twig # templates/Ride/Ride.html.twig
* master: Allow to escape asterisk. Nasty fix. Enable headlines again.
* master: Remove $visibleSince and $visibleUntil properties from Ride entity. Remove $expectedStartDateTime property from Ride entity. Prevent frontpage timeline elements from broken items.
* master: More tests. Add description property to test. Done. More tests. Much wip for first test case. Refactoring for ical generation. Remove properties and add migration. Remove hasLocation and hasTime from js assets. Remove hasTime() from templates. Remove hasLocation() from templates. Remove hasTime() and hasLocation() from source. Deprecate those properties and access methods. # Conflicts: # templates/City/Includes-bs4/_nextTour.html.twig # templates/City/show-bs4.html.twig # templates/RideManagement/edit.html.twig # templates/Search/includes/_ride.html.twig
* master: (1264 commits) Longitude may vary from -180 to +180. Sort promotions by creation date descending. Sort blog posts by creation date descending. Add button to geocode. Add geocoding to editridepage. Allow to geocode in viewbox. This must be written in uppercase. Add doc to ride api. Add RideTypeQuery. Improve more api doc. Add rideType to api doc. Fix migration. Add more properties to ride type. Do not die for null properties. Getting done so far with rides. Replace link to api doc. Fix more swagger doc. More apidoc fixes. More apidoc conversion. Forgot to commit these. ... # Conflicts: # assets/scss/criticalmass.scss # gulpfile.js # package-lock.json # package.json # src/Form/Type/StandardCityType.php # templates/BikeRight/view.html.twig # templates/Board/view_thread.html.twig # templates/City/Includes-bs4/_locations.html.twig # templates/City/Includes-bs4/_nearCities.html.twig # templates/City/Includes-bs4/_nextTour.html.twig # templates/City/Includes-bs4/_rideListSort.html.twig # templates/City/Includes-bs4/_socialMedia.html.twig # templates/City/Includes-bs4/_statistic.html.twig # templates/City/Includes/_nextTour.html.twig # templates/City/Includes/_rideListSort.html.twig # templates/City/Includes/_socialMedia.html.twig # templates/City/Includes/_statistic.html.twig # templates/City/ride_list.html.twig # templates/City/show-bs4.html.twig # templates/City/show.html.twig # templates/CityCycle/edit.html.twig # templates/CityCycle/list.html.twig # templates/CityManagement/edit.html.twig # templates/Frontpage/_bikeright.html.twig # templates/Frontpage/index.html.twig # templates/Participation/_list.html.twig # templates/Photo/_social_networks.html.twig # templates/PhotoGallery/gallery_list.html.twig # templates/PhotoManagement/manage.html.twig # templates/PhotoManagement/ride_list.html.twig # templates/Post/write.html.twig # templates/Post/write_failed.html.twig # templates/ProfileManagement/manage.html.twig # templates/Region/index.html.twig # templates/Ride/Includes/_participation.html.twig # templates/Ride/Includes/_rideDetails.html.twig # templates/Ride/Includes/_socialMedia.html.twig # templates/Ride/Includes/_statistic.html.twig # templates/Ride/Ride.html.twig # templates/RideTabs/DetailsTab.html.twig # templates/RideTabs/GalleryTab.html.twig # templates/RideTabs/SubridesTab.html.twig # templates/RideTabs/TracksTab.html.twig # templates/Search/result.html.twig # templates/SocialNetwork/list.html.twig # templates/Statistic/list_rides.html.twig # templates/Statistic/top.html.twig # templates/Strava/list.html.twig # templates/Timeline/Items/blogPost.html.twig # templates/Timeline/Items/blogPostComment.html.twig # templates/Timeline/Items/rideComment.html.twig # templates/Timeline/Items/rideEdit.html.twig # templates/Timeline/Items/rideParticipationEstimate.html.twig # templates/Timeline/Items/ridePhoto.html.twig # templates/Timeline/Items/rideTrack.html.twig # templates/Timeline/Items/socialNetworkFeed.html.twig # templates/Track/list.html.twig # templates/Track/range.html.twig # templates/Track/upload.html.twig # templates/Track/view.html.twig # templates/bundles/FOSUserBundle/ChangePassword/change_password.html.twig # templates/bundles/FOSUserBundle/Registration/register.html.twig # templates/bundles/FOSUserBundle/Security/loginForm.html.twig # templates/bundles/FOSUserBundle/Security/loginModalForm.html.twig
# Conflicts: # config/packages/knp_paginator.yaml # package-lock.json # package.json # templates/City/Includes/_live.html.twig # templates/City/Includes/_socialMedia.html.twig # templates/City/show-bs4.html.twig # templates/City/show.html.twig # templates/Frontpage/_ride_list.html.twig # templates/Frontpage/index.html.twig # templates/Help/_macro.html.twig # templates/Help/one_column.html.twig # templates/Help/two_columns.html.twig # templates/Photo/_social_networks.html.twig # templates/Photo/show.html.twig # templates/Ride/Includes/_live.html.twig # templates/Ride/Includes/_socialMedia.html.twig # templates/RideTabs/DetailsTab.html.twig # templates/RideTabs/StatisticTab.html.twig # templates/RideTabs/TracksTab.html.twig # templates/Static/impress.html.twig # templates/Statistic/top.html.twig # templates/Template/Includes/_adserver.html.twig # templates/Timeline/Items/blogPost.html.twig # templates/Timeline/Items/blogPostComment.html.twig # templates/Timeline/yearmonth.html.twig # templates/bundles/FOSUserBundle/Security/loginModalForm.html.twig
# Conflicts: # assets/js/modules/CookieNotice.js # gulpfile.js # package-lock.json # package.json # templates/ProfileColor/color.html.twig # templates/Template/MasterTemplate.html.twig
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.