4241 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Anton Dyudin	6e092b11dc	deleted: urb/zod/tree-gen/heads/json.hook	2015-11-09 15:39:19 -08:00
Anton Dyudin	5cb7c8d67a	tweak md html reparsing: closes #290	2015-11-09 14:32:49 -08:00
Anton Dyudin	ae2c98029f	inline extra elements	2015-11-09 12:33:20 -08:00
Anton Dyudin	7c0dcdb3a9	regularize body meta-based extra elements	2015-11-09 12:05:30 -08:00
Philip C Monk	e108f44b86	Merge remote-tracking branch 'galen/login-page' into pending ... added pill	2015-11-09 14:11:33 -05:00
Anton Dyudin	2e96965039	sign up link to id	2015-11-09 11:08:08 -08:00
Risto Saarelma	b8e87746ba	Change docs calling runes 'hoons'	2015-11-07 22:24:22 +02:00
Risto Saarelma	c81ee53427	Typo fix? Unify zey/zay to zay	2015-11-07 21:14:45 +02:00
Risto Saarelma	4cbd0b55a2	Typo fix	2015-11-07 20:50:54 +02:00
Galen Wolfe-Pauly	57e9286479	friendly login page	2015-11-06 18:11:09 -08:00
Philip C Monk	64b8c3f15a	Merge branch 'continuity-docs' into pending	2015-11-06 18:27:30 -05:00
Philip C Monk	d99c82ba77	continuity breach instructions	2015-11-06 18:26:39 -05:00
Philip C Monk	25c64cc4c7	more doc	2015-11-06 17:43:59 -05:00
Philip C Monk	d0c6b3fa63	some clay docs	2015-11-06 17:43:48 -05:00
Philip C Monk	2ddd828cca	bump protocol to 7	2015-11-06 17:41:43 -05:00
Philip C Monk	f7b364a2a6	Merge remote-tracking branches 'curtis/trivial', 'anton/talk-commands' and 'ray/talk-noob' into pending	2015-11-06 15:46:19 -05:00
Raymond Pasco	6a5d44aaf1	Add and document the ability to unset nicknames. ... Special bonus commit!	2015-11-06 03:03:53 -05:00
Raymond Pasco	96278a7f53	Implement ;set noob to display nicknames when on	2015-11-06 02:09:50 -05:00
Raymond Pasco	0ee6175869	Implement and document ;set and ;unset interface	2015-11-06 01:15:18 -05:00
Raymond Pasco	9832e554ca	Bump house to house-5 to contain frontend settings	2015-11-06 00:39:20 -05:00
Anton Dyudin	38000f519d	aaactually fix #507: upon channel join, only display last ~d1 of messages in it	2015-11-05 21:09:51 -08:00
Anton Dyudin	471b93271a	705 xif: fix of #705 reverted by partyv request, proper solution being rethinked	2015-11-05 20:56:46 -08:00
Raymond Pasco	123e9a3b73	Stub in ;set/;unset commands	2015-11-05 23:46:29 -05:00
Anton Dyudin	e993ff088f	fix #507 zlightly better, storing the messages but just not displaying them	2015-11-05 16:18:03 -08:00
Anton Dyudin	4f3f06b7ad	allegedly fix #526	2015-11-05 16:07:26 -08:00
Anton Dyudin	ea6da1a537	fix #507 under protest	2015-11-05 16:03:52 -08:00
Anton Dyudin	bc5aca4ad4	fix #523	2015-11-05 16:02:54 -08:00
Anton Dyudin	ccbfbaa162	allow multiple glyph targets, disallow unbound	2015-11-05 15:58:35 -08:00
Anton Dyudin	a1487c1aee	fix #525 lack of ;leave	2015-11-05 14:52:07 -08:00
C. Guy Yarvin	98f0e65971	A bunch of minor doc/message fixes.	2015-11-05 13:26:23 -08:00
Philip C Monk	2a4d4d3e8c	Merge remote-tracking branch 'curtis/trivial' into pending	2015-11-04 18:58:34 -05:00
C. Guy Yarvin	211c764898	Edit to simplify.	2015-11-04 15:52:26 -08:00
Philip C Monk	13dac01439	Merge branch 'fordreload' into pending	2015-11-04 18:44:39 -05:00
Philip C Monk	c8bd8446e6	Merge remote-tracking branch 'galen/spam' into pending	2015-11-04 18:36:22 -05:00
Galen Wolfe-Pauly	49911d68ea	ok ok	2015-11-04 15:29:38 -08:00
Galen Wolfe-Pauly	73b35829b0	good spam	2015-11-04 15:25:02 -08:00
Galen Wolfe-Pauly	0d1ab95aa3	takeout	2015-11-04 15:23:04 -08:00
Philip C Monk	c5adc39372	Merge remote-tracking branch 'galen/spam' into pending	2015-11-04 17:40:06 -05:00
Galen Wolfe-Pauly	d8298d0f18	Merge branch 'master' of github.com:urbit/urbit into spam	2015-11-04 14:28:22 -08:00
Galen Wolfe-Pauly	f323fc9190	nav fix and spam	2015-11-04 14:27:57 -08:00
Philip C Monk	7b10fd3f47	Merge branch 'kidsort-fixed', remote-tracking branches 'wilderr/master', 'anton/talk-offline' and 'curtis/trivial' into pending ... kidsort-fixed is a fixed version of galen/kidsort. fixes #516	2015-11-04 13:46:13 -05:00
Galen Wolfe-Pauly	3149dce765	date sort kids	2015-11-04 13:44:07 -05:00
C. Guy Yarvin	953e2ec334	More small edits.	2015-11-04 10:33:16 -08:00
cgyarvin	ed88c8a4e0	Merge pull request #517 from rsaarelm/master ... Fix typo in tutorial	2015-11-04 10:32:52 -08:00
Risto Saarelma	cb8b8650a6	Fix typo in tutorial	2015-11-04 20:15:00 +02:00
Galen Wolfe-Pauly	b726b5a263	date sort kids	2015-11-03 16:26:20 -08:00
vere	db7d11e637	Merge remote-tracking branch 'curtis/trivial'	2015-11-03 23:51:46 +00:00
C. Guy Yarvin	fdc35df99f	A trivial update.	2015-11-03 15:49:58 -08:00
Galen Wolfe-Pauly	adea97c3a5	Merge branch 'master' of github.com:urbit/urbit into newdoc	2015-11-03 14:03:35 -08:00
vere	fb420d8402	Merge branch 'master' of https://github.com/urbit/urbit	2015-11-03 22:02:06 +00:00