Skip to content
Snippets Groups Projects
Select Git revision
  • develop protected
  • master default protected
2 results
You can move around the graph by using the arrow keys.
Created with Raphaël 2.2.030Mar29282726252420191713121098528Feb2624212019171614131275327Jan242322212018171513765432127Dec24232120191817161514131211109876542130Nov2928272623222120191715141312118Merge branch 'develop'mastermasterLorem Ipsum is new speĺled correctlydevelopdevelopLink READMEsAdd example CLI usage scenarioAdd example CLI usage scenarioAdd information about the status command to cli/README.md, correct GUI-CLI Protocol.Add information about the status command to cli/README.md, correct GUI-CLI Protocol.Merge branch 'develop' into 'master'Merge branch 'develop' of git.rwth-aachen.de:tobias.wach/ccats into developAdded GUI code documentation and updated GUI ReadmeUpdate README.md, cli/README.md filesUpdate GUI-CLI Protocol.md, Client-Server Protocol.md filesMerge branch 'clean-ssl-quit-networkmain' into 'develop'Merge branch 'cli-more-status-info' into 'develop'US53: CLI adjust output of status command to show username and IP/porttry to quit ssl more cleanly, make network thread die graciously if the tcp connection was closed from the other side and no data was leftMerge branch 'us52-gui-supports-ssl-file' into 'develop'Resolve "US52: GUI supports SSL file"if connection is lost, the GUI now receives a connectionerror jsontimestamp validity now initialised in IoManMerge branch 'cli-readline-issues' into 'develop'Merge branch 'cli-connect-only-when-not-connected' into 'develop'too few args now cause a json output with command field error (as this is a syntactical error), adjust tests, add tests for connectDaemon installation notes improvedRemoved needless TODOsMerge branch 'fix-filereading-cli' into 'develop'Resolve: "CLI file put loads whole file into memory"Merge branch '99-there-are-no-tests-for-executequeue-and-executedequeue' into 'develop'Resolve "There are no tests for executeQueue and executeDequeue"Merge branch '94-commands-getting-lost' into 'develop'Resolve "multiple extendedlist commands cause all following commands to fail"Merge branch 'us51-gui-final-layout-change' into 'develop'Resolve "US51: GUI final layout change"Merge branch '91-extendedlist-head-should-return-4-bytes-if-file-is-smaller-than-32-bytes' into 'develop'Fix progress calculationMerge branch '98-server-cannot-delete-a-user' into 'develop'Fix user deletion hash checkonly lock msgmutex and perform readline manipulation if there actually is something to printMerge branch 'cli-head-output' into 'develop'Correct output texts for cmdman