Skip to content
Snippets Groups Projects

Repository graph

You can move around the graph by using the arrow keys.
Select Git revision
  • dev
  • master default protected
2 results
Created with Raphaël 2.2.018Jul151312111098764130Jun292726252423222120191817161514121110853Merge branch 'dev' into 'master'mastermasterlegal notesscriptorium logodevdevMerge branch 'dev' of https://gitlab.informatik.uni-halle.de/anfny/pen-and-paper-manager-web-app into devlegal notestyposMerge branch 'delete_icons_bug' into 'master'kill enemy -> delete his iconMerge branch 'dev' into 'master'Merge remote-tracking branch 'origin/dev' into devMerge branch 'objecticon-deletion-fix' into 'dev'Merge branch 'dev' into 'objecticon-deletion-fix'hover effect for CharacterIcons back in app; no more opening of newIcon Modal when deleting ObjectIcons; CharacterIcons now get properly deleted after deleting their Character in the FighterTool-Tab and their IDs will be correct afterwards, too!add favicon and browser tab titletranslationMerge branch 'dev' into 'master'trash icon for heroMerge branch 'dev' into 'master'small fixescleanupMerge branch 'style' into 'dev'small tweaksMerge remote-tracking branch 'origin/style' into stylemerge and refactorfixed Style BugsMerge branch 'map/style' into styleStyled Dropdownbutton + delete Button as Iconstyled Tabslast style changesmerge overall stylemap paging styledAuto stash before merge of "style" and "origin/style"Merge remote-tracking branch 'origin/style' into styleTabs in addCharacter ModalMerge remote-tracking branch 'origin/style' into stylefixed Enemy IconMerge branch 'dev' into stylefixed Enemy IconMerge remote-tracking branch 'origin/style' into stylecentered Enemy