Skip to content
Snippets Groups Projects

Repository graph

You can move around the graph by using the arrow keys.
Select Git revision
  • CheHao
  • Eldar
  • hai
  • isaac
  • master default protected
  • mpriymak
  • master-before-merging-with-hai
  • master-before-merging-with-isaac
  • rmi-working-before-merging-with-isaac
  • all-code-merged-by-hai-v1
10 results
Created with Raphaël 2.2.027Feb25Oct24232221201915Add LICENSEmastermasterAdd README.mdFinal merge from master (2)haihaimodified ChatScreen UIremove unnecessary printoutsFinal merge from masterImplemented isaacs fix to import a current state of the whiteboard to any new connected userCleaned out the printstacktraces from the client and GUI classes.Added exception handling for the case where the server is shutdown while there are clients connected. The clients will be kicked out after being notified via an error dialogue.Master merged with hai's codeMaster merged with hai's codeKick out bug fixedmaster-before-m…master-before-merging-with-haiadded blinksFixed merging bugsMerging isaac's code with master, conflicts solvedADD: kickout and new admin pop-upJoin Approval and pop-upsisaacisaacFixed freeline pressed codeFixed codeMerge branch 'CheHao' of https://gitlab.eng.unimelb.edu.au/1050369/comp90015-dsass2-infinitymonkeys-remaster into CheHaoCheHaoCheHaoMerged with master (Eldar code)fix dot drawing issueMerge branch 'master' of https://gitlab.eng.unimelb.edu.au/1050369/comp90015-dsass2-infinitymonkeys-remastermaster-before-m…master-before-merging-with-isaacChanged the join method to send over a reference of the ClientUpdate InterfaceChanged the join method to send over a reference of the ClientUpdate InterfaceMerge branch 'hai' into 'master'Client:Restrict username to <= 15 characters.Merge branch 'hai' into 'master'fixed dragging line strokeMerge branch 'hai' into 'master'fixed GUI layoutMerge branch 'master' of https://gitlab.eng.unimelb.edu.au/1050369/comp90015-dsass2-infinitymonkeys-remasterno messageMerge branch 'hai' into 'master'fixed notifyUserDrawing exceptionPop-ups bug fixed and exitbutton updatedMerge branch 'hai' into 'master'MergedMerge branch 'hai' into 'master'