Skip to content
Snippets Groups Projects

Resolve "Dashboard"

Merged Tom Teichler requested to merge 30-dashboard into master

Merge request reports

Pipeline #563 failed

Pipeline failed for ad3a5f45 on 30-dashboard

Approval is optional

Merged by Nik | KlampfradlerNik | Klampfradler 5 years ago (Jan 6, 2020 9:27pm UTC)

Merge details

  • Changes merged into master with 227d1a6b.
  • Deleted the source branch.

Pipeline #564 canceled

Pipeline canceled for 227d1a6b on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Tom Teichler added 1 commit

    added 1 commit

    • d0fc5044 - Remove superflous stuff from dashboard.

    Compare with previous version

  • Tom Teichler added 1 commit

    added 1 commit

    Compare with previous version

  • Tom Teichler resolved all threads

    resolved all threads

  • Tom Teichler added 30 commits

    added 30 commits

    Compare with previous version

  • Jonathan Weth added 2 commits

    added 2 commits

    • 0c7d5a4f - Fix way for marking notifications as read
    • 3ad44c4d - Update dashboard template

    Compare with previous version

  • Jonathan Weth added 5 commits

    added 5 commits

    • 3ad44c4d...c27ce08c - 3 commits from branch master
    • ece7161e - Merge branch 'master' into 30-dashboard
    • 5b444ff9 - Update dashboard views to use person model instead of user model

    Compare with previous version

  • Tom Teichler added 1 commit

    added 1 commit

    • 1b484b4b - Fix view if person is not authenticated.

    Compare with previous version

  • Jonathan Weth added 1 commit

    added 1 commit

    • d5b47039 - Add login_required to dashboard in order to show login page if not authenticated

    Compare with previous version

  • Tom Teichler added 18 commits

    added 18 commits

    • d5b47039...4b045281 - 15 commits from branch master
    • 224420bd - Merge branch 'master' into 30-dashboard
    • 1741b6cf - Merge branch '30-dashboard' of edugit.org:AlekSIS/AlekSIS into 30-dashboard
    • b8617090 - Merge branch 'master' into 30-dashboard

    Compare with previous version

  • Tom Teichler unmarked as a Work In Progress

    unmarked as a Work In Progress

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