57 Commits

Author	SHA1	Message	Date
Lars Hvam	5f7d851de5	Merging, close #275 (#282) ... * refactor most regarding commit and staging * use gitgraph 1.2.3 * move db gui to new include * allow specifying branch * move target branch to stage object * git, get rid of reference to repo * merge now working #275 cleanup	2016-07-07 13:23:28 +02:00
Lars Hvam	af74a24b6d	calculate merged tree #275 (#277) ... * merge #275, scaffolding * refactoring few gui pages top class element moved to page_super * syle FORM dropdown * find common ancestor * calculate merged tree #275	2016-07-06 16:08:00 +02:00
larshp	b286a6c62e	branch overview: compress graph ... plus cleanup a few code inspector warnings	2016-07-06 08:13:50 +00:00
Lars Hvam	638306fc2d	Branch overview, close #272 (#276) ... * few bits * branches now shows todo: show merges * parse merge commits * show merge commits * lint: reduce line length	2016-07-05 17:03:13 +02:00
larshp	928ffc0882	refactoring in the git classes, #272	2016-07-04 14:37:12 +00:00
larshp	e6742d3ad6	ignore character string warnings	2016-07-04 13:13:57 +00:00
larshp	5c2cac3211	moving to includes ... whoa this is a lot of work	2016-07-02 11:26:42 +00:00