Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bc 408/447 selecteer gebouwen #448

Merged
merged 7 commits into from
Aug 23, 2024

Commits on Aug 21, 2024

  1. in progres

    roefem committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    fd7e14f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bfa7488 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    93ccfbe View commit details
    Browse the repository at this point in the history
  4. reverted sidebar position

    roefem committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    8702d10 View commit details
    Browse the repository at this point in the history
  5. push dist

    roefem committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    ea559f7 View commit details
    Browse the repository at this point in the history
  6. add selecteer gebouw

    roefem committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    53f3d09 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

  1. Merge remote-tracking branch 'origin/bc_408/base' into bc_408/447_sel…

    …ecteer_gebouwen
    
    # Conflicts:
    #	dist/commonjs/zoneerder/components/oe-fullscreen.d.ts
    #	dist/commonjs/zoneerder/components/oe-fullscreen.js
    #	dist/commonjs/zoneerder/components/oe-fullscreen.js.map
    #	dist/commonjs/zoneerder/components/ol-map.html
    #	dist/commonjs/zoneerder/components/ol-map.js.map
    #	dist/commonjs/zoneerder/components/referentielaag-autocorrectie.js
    #	dist/commonjs/zoneerder/components/referentielaag-autocorrectie.js.map
    #	dist/commonjs/zoneerder/components/referentielaag-map.html
    #	dist/native-modules/zoneerder/components/oe-fullscreen.d.ts
    #	dist/native-modules/zoneerder/components/oe-fullscreen.js
    #	dist/native-modules/zoneerder/components/oe-fullscreen.js.map
    #	dist/native-modules/zoneerder/components/ol-map.html
    #	dist/native-modules/zoneerder/components/ol-map.js.map
    #	dist/native-modules/zoneerder/components/referentielaag-autocorrectie.js
    #	dist/native-modules/zoneerder/components/referentielaag-autocorrectie.js.map
    #	dist/native-modules/zoneerder/components/referentielaag-map.html
    #	src/zoneerder/components/oe-fullscreen.ts
    #	src/zoneerder/components/referentielaag-autocorrectie.ts
    #	src/zoneerder/components/referentielaag-map.html
    #	src/zoneerder/components/referentielaag-map.scss
    roefem committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    612d0fa View commit details
    Browse the repository at this point in the history