Skip to content
Snippets Groups Projects

Resolve "Add rules and permissions"

Merged Jonathan Weth requested to merge 73-add-rules-and-permissions into master

Closes #73 (closed)

Closes #79 (closed)

Edited by Nik | Klampfradler

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Jonathan Weth
  • I think the persons someone can select to register an absence should be filtered according to one's permissions. @yuha

  • assigned to @nik

  • @nik Please review as soon as it's possible for you – that would be very nice. (Despite it's still WIP.)

  • Nik | Klampfradler
  • Nik | Klampfradler
  • Nik | Klampfradler
  • Jonathan Weth added 34 commits

    added 34 commits

    Compare with previous version

  • Jonathan Weth added 1 commit

    added 1 commit

    • c0e47390 - Merge branch 'master' into 73-add-rules-and-permissions

    Compare with previous version

  • Jonathan Weth added 2 commits

    added 2 commits

    • a85bcae6 - Merge branch 'master' into 73-add-rules-and-permissions
    • 451cdb33 - Merge branch '73-add-rules-and-permissions' of...

    Compare with previous version

  • Jonathan Weth added 1 commit

    added 1 commit

    • 2a84050c - Fix order of has_perm and perm check in lesson template

    Compare with previous version

  • Hangzhi Yu added 1 commit

    added 1 commit

    • 45de9a0c - Merge branch 'master' into 73-add-rules-and-permissions

    Compare with previous version

  • Hangzhi Yu added 2 commits

    added 2 commits

    • 420f07a0 - Add rules&permissions in class register template
    • a95d775a - Replace ugettext with gettext

    Compare with previous version

  • Hangzhi Yu added 1 commit

    added 1 commit

    • 2011793a - Add tooltips in alsijil_helpers.py

    Compare with previous version

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading