19 Commits

Author	SHA1	Message	Date
Galen Wolfe-Pauly	4968247461	fixes some tree overlay and scrolling bugs, the talk code execution bug and scroll offset bug. ... talk@9f08e47a21 tree@cdb90fcc72	2016-02-23 22:32:30 -08:00
Galen Wolfe-Pauly	fba886bee9	talk and tree update ... tree@f4edc664bf talk@044615bcd6	2016-02-22 18:04:51 -05:00
Anton Dyudin	81297bc162	Merge branch 'hoon-151' into tree-comments ... Merge hoon 151	2016-02-10 19:43:53 -08:00
Anton Dyudin	2c4c1c767b	update tree to use datadeps ... https://github.com/urbit/tree@a3a2bc1	2016-02-09 21:43:05 -08:00
Galen Wolfe-Pauly	b71d945168	tree@3e59dc683a ... talk@8d6967e238	2016-02-06 16:42:31 -08:00
Galen Wolfe-Pauly	37a566021e	Odds and ends: login / out, dojo details. ... tree@ced2501277	2016-02-04 19:56:11 -08:00
Galen Wolfe-Pauly	ac0ee5f3f0	in-between tree commits	2016-02-04 17:38:14 -08:00
Galen Wolfe-Pauly	2a95c443ed	Merge branch 'factor' of github.com:ohAitch/urbit into factor ... Conflicts: urb/zod/web/tree/main.js (had a newer main.js) talk@26b0befe86 tree@621235bf52	2016-02-04 16:16:18 -08:00
Galen Wolfe-Pauly	d15cf9d5f7	working on hp	2016-02-04 16:00:23 -08:00
Anton Dyudin	e77bda234e	add comments to tree ... https://github.com/urbit/tree/tree/0a9c5a0	2016-02-03 17:53:38 -08:00
Galen Wolfe-Pauly	e872cc507c	mobile	2016-02-03 10:23:49 -08:00
Galen Wolfe-Pauly	4415296a69	ok working layers	2016-02-01 21:46:38 -08:00
Galen Wolfe-Pauly	e9032c460b	talking	2016-02-01 16:00:45 -08:00
Galen Wolfe-Pauly	8f714ad02d	semi-working	2016-01-29 19:02:03 -08:00
Galen Wolfe-Pauly	94a3bc7e84	manual merge	2016-01-29 18:54:28 -08:00
Galen Wolfe-Pauly	5e91f7edaf	everything ready to be cleaned.	2016-01-29 18:29:57 -08:00
Anton Dyudin	011f7c0b48	Merge branch 'factor' into ford-ren - XX unresolved js	2016-01-29 17:35:38 -08:00
Anton Dyudin	6fc3c8e5c9	pre-merge: mv urb/zod/urb/zod/{lib,web/lib}/{js,css}	2016-01-29 15:52:28 -08:00
Anton Dyudin	be672cf4e7	pre-merge: mv web/lib/{**.(js|css),\1/}, web/*/{(js|css)/main.\1,main.\1}	2016-01-29 15:50:34 -08:00