Commit Graph

102 Commits

Author SHA1 Message Date
Philip C Monk
b793d72121 Merge remote-tracking branches 'ray/fixlore', 'my/loremark', 'my/fancy-autoreload' and 'my/fixmerge' 2016-01-13 16:22:51 -05:00
Philip C Monk
d369819b1d default case correctly in |merge
also, get rid of extra ~& in kiln
2016-01-13 15:11:25 -05:00
Philip C Monk
c48f26ce7d autoreload sanely 2016-01-12 16:20:57 -05:00
Raymond Pasco
cde64c834d Merge remote-tracking branch 'philipcmonk/cy-without-hash'
Conflicts:
	urb/urbit.pill

Clay arcana (%cy to faster %cz)
2016-01-11 10:57:30 -05:00
Philip C Monk
9725cf492a forgot a urb/zod/lib/kiln.hoony -> urb/zod/lib/kiln.hoonz 2016-01-09 18:41:05 -05:00
Philip C Monk
0bbae7e679 split %cy hash out into %cz 2016-01-07 18:54:42 -05:00
Philip C Monk
368d07de77 add |track and case option for |merge 2016-01-06 17:16:26 -05:00
Raymond Pasco
d559feaab0 Merge remote-tracking branches 'ohaitch/fix-spur-print', 'ohaitch/gall-mass-and-kiln-mv', 'ohaitch/wt-nonnoun-mark', 'ohaitch/write-in-kiln', 'dhaffey/prompt-refresh' and 'ohaitch/no-mdy'
Fix dojo backwards path bug
Fix |mass on moons, |mv on everyone (fixes #634)
Print marks in dojo unless they're %noun
write as hood facility rather than own app
Refreshing of prompt line
Down with .mdy, whatever that is
2015-12-08 15:07:18 -05:00
Anton Dyudin
a7f20a3323 moved :write into hood 2015-12-07 17:46:18 -08:00
Anton Dyudin
6c0d8ec6bf fix #634 gall |mass, kiln |mv 2015-12-07 14:20:11 -08:00
Anton Dyudin
254bddcc48 twiddle marks, factor out frontmatter parser: close #605 2015-12-01 19:46:16 -08:00
Anton Dyudin
e82003ec38 added :ask ship request collator, |ask easter egg 2015-11-25 14:42:47 -08:00
C. Guy Yarvin
a15a243e04 URL printing; doc and usability fixes. 2015-11-20 18:10:45 -05:00
Dan Haffey
d6d460cd49 Improve history search behavior.
Cursor movement and kill/yank operations now break out of search mode
(with the buffer set to the current item). ^G now clears the buffer
when terminating the search (without touching the kill buffer).
2015-11-16 18:18:42 -05:00
Dan Haffey
ca08029644 Fix history search stepping back on every key. 2015-11-16 18:18:42 -05:00
Anton Dyudin
5cb7c8d67a tweak md html reparsing: closes #290 2015-11-09 14:32:49 -08:00
Galen Wolfe-Pauly
57e9286479 friendly login page 2015-11-06 18:11:09 -08:00
Philip C Monk
13dac01439 Merge branch 'fordreload' into pending 2015-11-04 18:44:39 -05:00
Anton Dyudin
cd345e5869 exponential backoff tweaks 2015-11-02 15:31:48 -08:00
Anton Dyudin
c3047cbf3e fix json printing performance 2015-10-29 16:04:56 -07:00
Anton Dyudin
6104efc894 better |unlink 2015-10-22 15:45:48 -07:00
Anton Dyudin
859bce32c9 fix drum cursor handling, refactor chat newline splitter 2015-10-22 13:23:44 -07:00
Anton Dyudin
f856ad51b4 Merge branch 'test' of https://github.com/galenwp/urbit into pittyp 2015-10-20 16:28:18 -07:00
Anton Dyudin
b5679d31ed fixed empty spur 2015-10-20 14:31:09 -07:00
C. Guy Yarvin
6e81afc7df Unlink; minor docs changes. 2015-10-20 13:48:11 -07:00
C. Guy Yarvin
9d40d206e3 Merge cgyarvin fixes into test. 2015-10-17 13:01:38 -07:00
Anton Dyudin
39108ab80e Merge branch 'nobreach' into test 2015-10-15 15:49:09 -07:00
C. Guy Yarvin
f979e96d10 Doc fixes and changes to match. 2015-10-09 18:31:07 -07:00
Anton Dyudin
f6b234d4d5 pull upstream hoon.js 2015-10-08 15:23:03 -07:00
C. Guy Yarvin
81a660d49b Merge branch 'test' of https://github.com/urbit/urbit into karpi 2015-10-07 16:24:11 -07:00
C. Guy Yarvin
4e51134436 Remove # prompt. 2015-10-07 15:42:19 -07:00
Anton Dyudin
d53508e230 moved sole-back to sole-action %clr 2015-10-07 11:59:01 -07:00
Anton Dyudin
ac7be8c217 Merge branch 'master' of https://github.com/urbit/urbit into moretalk 2015-10-05 14:26:14 -07:00
Anton Dyudin
5f652f6b93 addeed %sole-back start-of-line backspace, handled in sole and talk 2015-10-02 11:40:20 -07:00
Galen Wolfe-Pauly
0cc523538a based css 2015-09-29 14:29:38 -07:00
Philip C Monk
6d8cf6dbc9 repetitive reloading 2015-09-25 20:23:06 -04:00
Philip C Monk
417dda3aaf Merge remote-tracking branches 'anton/nobreach' and 'my/clayhammer' into test
Conflicts:
	urb/urbit.pill
2015-09-21 14:58:10 -04:00
Philip C Monk
646fa7cf14 :+merge -> |merge 2015-09-17 19:20:07 -04:00
Philip C Monk
081da0eee4 Merge remote-tracking branch 'my/pending' into test
Conflicts:
	urb/urbit.pill
2015-09-17 14:51:01 -04:00
Philip C Monk
4550b6a97b Merge remote-tracking branches 'anton/nobreach' and 'galen/test' into pending 2015-09-17 14:36:41 -04:00
Philip C Monk
a84fb403f6 turn off autoload with |autoload 2015-09-16 19:40:53 -04:00
Philip C Monk
aaa9022a48 autoreload and autoreset 2015-09-16 18:39:11 -04:00
Anton Dyudin
610cf1b95f clean up pre-ford-refactor shims 2015-09-16 13:57:24 -07:00
Anton Dyudin
3b99a6083e more compact rend-work-duty 2015-09-16 13:47:26 -07:00
Galen Wolfe-Pauly
642b8da58e not sure how that got reverted 2015-09-16 12:04:51 -07:00
Philip C Monk
3bfe641b1c added |cancel 2015-09-15 20:24:44 -04:00
Philip C Monk
eb78b250fa Merge branch 'pending' into test 2015-09-11 20:47:43 -04:00
Philip C Monk
a4634d96f1 Merge remote-tracking branch 'anton/nobreach' into pending 2015-09-11 20:39:24 -04:00
Anton Dyudin
81eeb6714e fix url grab 2015-09-11 17:07:50 -07:00
Philip C Monk
f60edac580 Merge branch 'pending' into test 2015-09-11 17:19:16 -04:00