202 commits

Author	SHA1	Message	Date
Max Sikström	7a06cfd0c7	Cleanup + fixed a typo ... A typo (TagsCollection vs. TagCollection) made levels crash when loading. There where still lot of stuff left for handling master branch in the visTag code, because visTag is a modified version of the visBranch-object. Therefore, clean up asome unused code Signed-off-by: Max Sikström <msikstrom@op5.com>	2013-10-08 20:48:05 +02:00
Max Sikström	74342e2028	Git Tag: Initial support for tagging ... Branching in git even more useful if using tags. Simulate relase branches, maintenance branches and so on is therefore really useful in this tool. Now, rudimentary tagging is implemented, where tags can be attached to the commits, and referenced by for exmapmle git checkout Signed-off-by: Max Sikström <msikstrom@op5.com>	2013-10-08 19:12:48 +02:00
Peter Cottle	a7a07e9f92	new remote branch level	2013-10-07 12:42:04 -07:00
Peter Cottle	bfd8483d90	Issue #129 pushing to different remote branches	2013-10-07 11:29:08 -07:00
Peter Cottle	7034eb76fa	Issue #131 awesomely now respect remote tracking branch info for git pull	2013-10-06 23:52:33 -07:00
Peter Cottle	79d65e739a	Issue #130 -- slightly odd rebase animation fixed	2013-10-06 22:48:04 -07:00
Peter Cottle	73660f7126	Issue #130 -- hangs after pull uncaught result	2013-10-06 22:34:51 -07:00
Peter Cottle	9fa8c1383d	yay got multiple remotes fetching working	2013-10-06 18:09:38 -07:00
Peter Cottle	a16204fea3	rebuild for content on lesson 1	2013-10-06 17:17:26 -07:00
Peter Cottle	00a843754e	rebuild for fb page post	2013-10-06 17:02:12 -07:00
Peter Cottle	33e5060ac7	better highlighting with keyboard events for level dropdown view	2013-10-06 11:49:18 -07:00
Peter Cottle	9e24c2dfa2	Issue #109 Elaborate more on relative refs number 2 level	2013-10-06 11:41:32 -07:00
Peter Cottle	b19a1e2bc5	Issue #127 Ridiculously silly typo	2013-10-06 11:29:59 -07:00
Peter Cottle	2f9437cbb2	Issue #126 remove usage of upstream and downstream	2013-09-27 20:39:32 -07:00
Peter Cottle	cfea67ecce	fixes remote branch grabbing	2013-09-09 12:15:46 -07:00
Peter Cottle	6291baf665	refreshing prod since glone si broken there	2013-09-09 11:42:57 -07:00
Peter Cottle	7cec1bcaab	now multi origin fetch works	2013-09-01 11:55:28 -07:00
Peter Cottle	d6c89f913f	Issue #123	2013-08-22 19:49:44 -07:00
Peter Cottle	fc502bcdaf	rebuild for Issue #121 Pull #121	2013-08-05 20:43:10 -07:00
Peter Cottle	bf132f8f09	mercurial test coverage	2013-08-04 13:27:33 -07:00
Peter Cottle	fbb0da00f4	new delays	2013-08-02 23:56:29 -07:00
Peter Cottle	9e88510dc7	rename branches for hackathon demo	2013-08-01 13:04:41 -07:00
Peter Cottle	e7709223c3	before prototype forum	2013-08-01 12:19:58 -07:00
Peter Cottle	3246649cb6	now with hgdemo2	2013-08-01 11:21:25 -07:00
Peter Cottle	173ccad92d	hgdemo	2013-08-01 10:49:20 -07:00
Peter Cottle	8e128020d7	hg demo starting	2013-08-01 10:43:27 -07:00
Peter Cottle	24b4fcd1cd	importTreeNow command	2013-08-01 10:00:37 -07:00
Peter Cottle	8b66edc878	awesome have rebase done	2013-08-01 00:20:28 -07:00
Peter Cottle	86cbb19a28	fixed bad option parsing	2013-07-31 22:30:02 -07:00
Peter Cottle	37a9fccec0	wip	2013-07-31 16:54:06 -07:00
Peter Cottle	0f1c9c4e7a	[Hackathon] Hg mode initial	2013-07-31 13:44:13 -07:00
Peter Cottle	52c6579fae	dont count for golf	2013-07-31 09:52:20 -07:00
Peter Cottle	8acfe45874	ALL DONE with: commit, status, export, log, bookmark, update, backout, histedit, pull, ammend, summary	2013-07-31 09:43:55 -07:00
Peter Cottle	a033173281	WIP have half of hg commands mapped	2013-07-31 09:22:11 -07:00
Peter Cottle	51e1cc2b77	rebuild for ?demo	2013-07-31 07:15:50 -07:00
Siddharth Agarwal	3c1887f1d0	add a vcs level to the shortcut map	2013-07-30 23:50:23 -07:00
Siddharth Agarwal	acf9c3c657	add the first hg command	2013-07-30 21:30:47 -07:00
Siddharth Agarwal	ecbe9cb19a	Move commands/index.js to git/commands.js	2013-07-30 21:04:50 -07:00
Peter Cottle	977c2877e4	rebuild for rename	2013-07-28 20:40:19 -07:00
Peter Cottle	15c2224d56	TWO new levels, cherry-pick intro and rebase -i intro, and rebuild for Issue #120	2013-07-28 20:38:04 -07:00
Peter Cottle	d4d7fb21c7	BOOM two new awesome levels before rebase 9000	2013-07-28 18:19:15 -07:00
Peter Cottle	0aadae766f	big refactor looking a lot better now	2013-07-28 12:12:00 -07:00
Peter Cottle	e422bdb181	big commands refactor in prep for hackathon	2013-07-27 23:49:27 -07:00
Peter Cottle	5ec8a2916f	big command factoring	2013-07-27 22:46:46 -07:00
Peter Cottle	af3d440874	facebook page link and logging	2013-07-27 15:05:23 -07:00
Peter Cottle	740a94ccf6	fixed vis for remote git demonstration views	2013-07-27 14:51:04 -07:00
Peter Cottle	6804403d66	make rmote levels conditional	2013-07-25 09:33:40 -07:00
Peter Cottle	c4ae821cef	AWESOME origin compare within trees and levels, visualizations down, finish animation chain fixed, everything is awesome here. ready fororigin levels	2013-07-24 21:41:53 -07:00
Peter Cottle	7a00bd09f6	rebuild with awesome new test coverage	2013-07-24 12:44:22 -07:00
Peter Cottle	debd5f9fed	one more test	2013-07-24 09:57:21 -07:00