Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
K
kohinos-tav
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 1
    • Merge Requests 1
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • agplv3
  • kohinos-tav
  • Merge Requests
  • !2

Merged
Opened Nov 15, 2022 by Yvon Kerdoncuff@Yvon 
  • Report abuse
Report abuse

4111 evol role comptoir des habitants

  • Discussion 2
  • Commits 4
  • Changes 5
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Yvon Kerdoncuff @Yvon

    added 10 commits

    • e340d0e5 - add environment variable in .env.dist
    • 0f28d5f5 - install.md: add gd in php requirements
    • dee05606 - install.md: add instructions to launch locally & add php-version file
    • a7089129 - default config in .env.dist is now tav_env=0
    • 6dbdb329 - Merge branch '4130-tav-env' into 'develop'
    • 74e91d0c - update INSTALL.md
    • 30c36d27 - add tav_env to twig globals
    • c1b51736 - add tav_env in parameters
    • f8b11f0f - rework previous commits so that display depends on tav_env
    • a9bef831 - Merge branch 'develop' into 4111-evol-role-comptoir-des-habitants

    Compare with previous version

    Nov 17, 2022

    added 10 commits

    • e340d0e5 - add environment variable in .env.dist
    • 0f28d5f5 - install.md: add gd in php requirements
    • dee05606 - install.md: add instructions to launch locally & add php-version file
    • a7089129 - default config in .env.dist is now tav_env=0
    • 6dbdb329 - Merge branch '4130-tav-env' into 'develop'
    • 74e91d0c - update INSTALL.md
    • 30c36d27 - add tav_env to twig globals
    • c1b51736 - add tav_env in parameters
    • f8b11f0f - rework previous commits so that display depends on tav_env
    • a9bef831 - Merge branch 'develop' into 4111-evol-role-comptoir-des-habitants

    Compare with previous version

    added 10 commits <ul><li>e340d0e5 - add environment variable in .env.dist</li><li>0f28d5f5 - install.md: add gd in php requirements</li><li>dee05606 - install.md: add instructions to launch locally &amp; add php-version file</li><li>a7089129 - default config in .env.dist is now tav_env=0</li><li>6dbdb329 - Merge branch &#39;4130-tav-env&#39; into &#39;develop&#39;</li><li>74e91d0c - update INSTALL.md</li><li>30c36d27 - add tav_env to twig globals</li><li>c1b51736 - add tav_env in parameters</li><li>f8b11f0f - rework previous commits so that display depends on tav_env</li><li>a9bef831 - Merge branch &#39;develop&#39; into 4111-evol-role-comptoir-des-habitants</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic/kohinos-tav/merge_requests/2/diffs?diff_id=1905&start_sha=7530ccf43588cc3e68e173e96727b96e1c01dcaa)
    Toggle commit list
  • Yvon Kerdoncuff @Yvon

    changed target branch from master to develop

    Nov 17, 2022

    changed target branch from master to develop

    changed target branch from `master` to `develop`
    Toggle commit list
  • Damien Moulard
    @DamienM started a discussion on an old version of the diff Nov 18, 2022
    Resolved by Damien Moulard Nov 25, 2022
    templates/themes/kohinos/block/useradmin.html.twig
    31 31 {% elseif app.user and is_granted('ROLE_COMPTOIR') %}
    32 32
    33 33 {% include '@kohinos/block/admin_comptoir.html.twig' %}
    34 {% if tav_env %}
    35 <a href='https://kohinos-fede.cooperatic.fr/admin/adherent/create' rel="noopener noreferrer" class='ml-2 text-center'><i class="fa fa-plus mr-2" aria-hidden="true"></i> Inscrire/modifier un habitant</a><br/><br/>
    • Damien Moulard @DamienM commented Nov 18, 2022
      Master

      Il ne faut pas utiliser un lien dur, sinon ça ne marchera pas quand on passera sur un autre environnement (prod...).

      Voir templates/themes/kohinos/block/cotisations.html.twig pour un exemple de redirection.

      Il ne faut pas utiliser un lien dur, sinon ça ne marchera pas quand on passera sur un autre environnement (prod...). Voir templates/themes/kohinos/block/cotisations.html.twig pour un exemple de redirection.
    • Yvon Kerdoncuff @Yvon

      changed this line in version 5 of the diff

      Nov 22, 2022

      changed this line in version 5 of the diff

      changed this line in [version 5 of the diff](https://gl.cooperatic.fr/cooperatic/kohinos-tav/merge_requests/2/diffs?diff_id=1915&start_sha=a9bef831d75317de76fb7f584658d606c0db71f2#88079e18572a4921c1e15cd6dc9cf13feb1d8f14_35_35)
      Toggle commit list
    Please register or sign in to reply
  • Yvon Kerdoncuff @Yvon

    added 12 commits

    • a9bef831...9a2d6212 - 10 commits from branch develop
    • 28299e90 - replace hard link
    • 136eb296 - Merge branch 'develop' into 4111-evol-role-comptoir-des-habitants

    Compare with previous version

    Nov 22, 2022

    added 12 commits

    • a9bef831...9a2d6212 - 10 commits from branch develop
    • 28299e90 - replace hard link
    • 136eb296 - Merge branch 'develop' into 4111-evol-role-comptoir-des-habitants

    Compare with previous version

    added 12 commits <ul><li>a9bef831...9a2d6212 - 10 commits from branch <code>develop</code></li><li>28299e90 - replace hard link</li><li>136eb296 - Merge branch &#39;develop&#39; into 4111-evol-role-comptoir-des-habitants</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic/kohinos-tav/merge_requests/2/diffs?diff_id=1915&start_sha=a9bef831d75317de76fb7f584658d606c0db71f2)
    Toggle commit list
  • Yvon Kerdoncuff @Yvon commented Nov 22, 2022
    Master

    Ouch en effet merci, c'est corrigé !

    Ouch en effet merci, c'est corrigé !
  • Damien Moulard @DamienM

    resolved all discussions

    Nov 25, 2022

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Damien Moulard @DamienM

    merged

    Nov 25, 2022

    merged

    merged
    Toggle commit list
  • Damien Moulard @DamienM

    mentioned in commit f029d839

    Nov 25, 2022

    mentioned in commit f029d839

    mentioned in commit f029d839794661b694c3b517ab429addf0fd43cb
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: agplv3/kohinos-tav!2
×

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.