Commit Graph

314 Commits

Author SHA1 Message Date
Fang
f14d6b0849 Merge branch 'master' of https://github.com/urbit/arvo into remaint-merge-talk 2017-10-31 15:57:12 +01:00
Anton Dyudin
57006281f2 Merge remote-tracking branch 'urbit/maint-20170614' 2017-10-30 17:05:17 -07:00
Fang
feaf859af4 Merge branch 'master' of https://github.com/urbit/arvo into remaint-merge-talk 2017-10-27 12:29:34 +02:00
Anton Dyudin
71550b0bfd Revert "Merge branch 'jaelwomb' into cc-release"
(jael doesn't exist yet)

This reverts commit 13bc8ea59f, reversing
changes made to c232f670be.
2017-10-26 13:59:49 -07:00
Fang
720bc61135 Updated /mar/talk/telegrams 2017-10-24 17:59:27 +02:00
Fang
6c7146f988 Implemented /mar/talk/rumor. 2017-10-24 17:24:04 +02:00
Fang
31cd0593aa Merge branch 'master' of https://github.com/urbit/arvo into remaint-merge-talk 2017-10-24 15:21:15 +02:00
Fang
fddfe88d2b Implemented /mar/talk/prize and all necessary additions to /lib/talk-json.
Requires small change in zuse to compile. Under investigation.
2017-10-24 15:19:41 +02:00
Anton Dyudin
c23db2bcd3 fix &womb-invite and &sole-action 2017-10-20 10:52:31 -07:00
Fang
e990975c39 Some cleanup. /mar/talk/action now fully functional (but untested). 2017-10-20 19:46:02 +02:00
Fang
b6df30e006 /mar/talk/action to json works.
From json currently dig-overs.
2017-10-20 17:42:07 +02:00
Fang
e59b37eafc Merge branch 'master' of https://github.com/urbit/arvo into remaint-merge-talk 2017-10-19 23:59:14 +02:00
Fang
7d4e0512cf Largely complete /lib/talk-json (still missing diffs), /mar/talk/action. 2017-10-19 23:58:18 +02:00
Fang
c14970c228 tmp progress on talk-json lib & marks 2017-10-12 12:30:16 +02:00
C. Guy Yarvin
5c3fd13cc9 Ticketing works. 2017-10-11 17:00:21 -07:00
Fang
5586807f2c Fixed issue with talk command mark. 2017-10-09 12:59:23 +02:00
Fang
bb5150819c Merge branch 'talk-split' into remaint-merge-talk
Uncompiled. Untested.

# Conflicts:
#	app/talk.hoon
#	lib/helm.hoon
#	lib/talk.hoon
#	mar/talk/command.hoon
#	mar/talk/report.hoon
#	mar/talk/telegrams.hoon
#	sur/talk.hoon
2017-10-06 14:46:46 +02:00
C. Guy Yarvin
5a74064080 Merge branch 'remaint' into remaint-merge 2017-10-01 18:50:19 -07:00
Fang
b3eeaff83b Started allowing capitals in web.plan usernames. 2017-08-07 20:42:52 -07:00
Fang
01da92c7cf Updated talk command mark to reflect recent removal of ++statement. 2017-08-02 21:45:29 -07:00
Fang
caac4c8913 Removed ++partner. Everything is now ++circles. 2017-07-10 17:21:58 -07:00
Fang
02502d758e Fixed the talk command mark to be cool with recent changes to the structures. 2017-07-06 19:59:23 -07:00
Fang
4aa069c9f8 Removed bouquet for now. 2017-06-30 18:42:36 -07:00
Fang
563aa0102e Mostly functional federation & delta model. 2017-06-12 15:19:45 -07:00
Keaton Dunsford
457676f947 Add noun.hoon mark to /mar
Fixes an issue where trivial moves to ++poke-noun app arms across ships
wouldn't resolve, and ++coup in those apps would throw away the stack
trace.

See this Fora post:
<http://urbit.org/fora/posts/~2017.5.30..04.45.41..dbd2~/>
2017-05-30 16:55:00 -07:00
Raymond Pasco
7dc270f89f Merge remote-tracking branch 'joemfb/detap' 2017-05-17 05:38:26 -04:00
Fang
84026f9980 Fixed report mark.. again. 2017-04-27 17:05:19 +02:00
Fang
f3533eae4f More renaming of talk structures. 2017-04-26 23:33:25 +02:00
Fang
04997b5c10 Applied renaming of talk structure faces to report and telegrams marks. 2017-04-25 21:32:13 +02:00
Fang
5e02dc7db2 Removed trailing spaces from talk lib and marks files. 2017-04-25 21:21:46 +02:00
Fang
fb58d2f9a6 Renaming of talk structure faces now also applies to its command mark. 2017-04-25 18:38:05 +02:00
Fang
6e7d9c58a8 Renaming of talk structure faces now also applied to its report mark. 2017-04-25 15:40:25 +02:00
Fang
85a13cea21 Fully deprecated %design and %publish commands in favor of the new actions. 2017-04-14 13:02:38 +02:00
Fang
e36aed9778 Undid removal of federation functionality to facilitate traditional mailbox behavior.
The default mailbox gets used to contain foreign stories.
2017-04-03 14:42:45 +02:00
Fang
fdc36b3688 Updated the talk report mark to match changes to the structure. 2017-03-30 21:28:36 +02:00
Fang
9b94bbeb33 Removed %house reports, superseded by %tales lowdowns. 2017-03-29 20:17:21 +02:00
Fang
00d8c11178 Removed $glyph case from the talk-report mark. 2017-03-29 16:53:42 +02:00
Raymond Pasco
e10dc26bea Merge remote-tracking branches 'Fang/urbjs-isurl', 'ohaitch/stray-marks', 'eglaysher/fix-help', 'joemfb/prompt-sticky-master', 'joemfb/cork-safe' and 'joemfb/fry-nest' 2017-03-28 07:35:46 -04:00
Joseph Bryan
af767350a8 removes +-tap:by accumulator arg and changes calling convention 2017-03-20 18:56:00 -04:00
Joseph Bryan
ebed890f00 removes +-tap:in accumulator arg and changes calling convention 2017-03-20 18:55:55 -04:00
Keaton Dunsford
f220bf3db6 Add ++ grad %mime to html.hoon mark.
Fixes issue where ford doesn’t know which of two diffed html files to
build.
2017-03-03 03:19:19 -05:00
Raymond Pasco
c06e10e7c2 Merge remote-tracking branches 'joemfb/mar-telegram', 'galenwp/docs-fix', 'galenwp/room-filtering', 'Fang/talk-team' and 'keatondunsford/fix-html-mark' into maint-20160818
handles $mor speech in mar/talk/telegram
tree@258fdf7
simple channel filtering
Prevent unauthorized talk message sending
add `++grad %mime` to html.hoon mark
2017-03-03 03:09:32 -05:00
Keaton Dunsford
fca48b1005 Add ++ grad %mime to html.hoon mark.
Fixes issue where ford doesn’t know which of two diffed html files to
build.
2017-03-01 16:14:33 -08:00
Anton Dyudin
08d1e49c8a fix up remaining marks 2017-02-14 11:11:52 -08:00
Raymond Pasco
bab93e7ac2 Merge remote-tracking branch 'ohAitch/zuseflat-pretty'
Complete the restructuring of zuse. Add old-zuse compatibility layer.
2017-02-13 22:19:03 -05:00
Anton Dyudin
53eef4cd8d marks mostly functional 2017-02-13 16:02:25 -08:00
Joseph Bryan
1ce28cd073 handles $mor speech in mar/talk/telegram 2017-01-27 13:59:56 -05:00
Raymond Pasco
fd6d28ccc0 Remove blank lines at EOF 2016-12-15 22:52:53 -08:00
Raymond Pasco
bbc4d2c0ee Repository cleanup
mostly trailing whitespace removal
no new kernel because only changes there are whitespace removal
2016-12-15 22:36:45 -08:00
Raymond Pasco
cc5c386e5c Merge branch 'back-with-license', remote-tracking branches 'ohaitch/unlink-misvale', 'frodwith/wyt', 'ohaitch/ford-platform-dependencies', 'ohaitch/fix-rss', 'Fang/talk-who-fix' and 'Fang/talk-showtime' into maint-20160818
Backport of LICENSE.txt
Hack around a broken mark-subscription edge case
Hint +-wyt:in
Add /===/mar and /===/arvo to %core req dependents
Change .rss-xml to use correct urls, metadata
Fix talk's parsing of ;who
Talk setting: message timestamps
2016-12-12 16:40:36 -08:00