Nathan Sobo
fa6ea01bfc
Restore assignment of @project ivar in TextBuffer
...
Because TextBuffers need a reference to `project` during deserialization,
and because the project global deserializes text buffers while it itself
is being deserialized (which happens before the global is actually
assigned), we have to pass a project reference into TextBuffer. This is
really annoying and makes me want to store the references to open buffers
elsewhere. But for now it's the only way to break the circularity.
2013-08-14 10:49:48 -06:00
Corey Johnson & Nathan Sobo
3c166edd26
Start switch to Telepath for undo/redo
...
Also, TextBuffer spec passes!
2013-08-13 17:34:31 -07:00
Corey Johnson & Nathan Sobo
2d46a98ea2
Update telepath
2013-08-13 17:14:10 -07:00
Kevin Sawicki
2597837ba7
Use ~/.atom/storage instead of ~/.atom/.storage
...
The serialization format is changing for telepath and this allows a clean
upgrade and the dotted directory does not seem needed since it is already
behind one dotted directory (.atom).
2013-08-09 10:38:57 -07:00
Nathan Sobo
0f14dd9420
Disable pane-splitting spec for now
...
We'll get it working once this branch gets merged to master.
2013-08-08 11:01:01 -06:00
Kevin Sawicki
c22bbf98b8
Remove unused redis dependency
2013-07-28 19:22:45 -07:00
Kevin Sawicki
555611aa1f
Prepend new participant views instead of appending
2013-07-27 13:45:21 -07:00
Nathan Sobo
579cfb4a4a
Disable audio for self-streams
2013-07-27 13:53:10 -06:00
Kevin Sawicki
9753a63227
Trigger connected event for local media connection to self
...
Also upgrade atom-collaboration-server
2013-07-27 11:56:04 -07:00
Kevin Sawicki
292815c014
Add participant view for self
...
This will show your own camera video and which color you appear
as to other session participants.
2013-07-27 11:38:16 -07:00
Kevin Sawicki
b38a6f2235
Request avatars to be 420px
2013-07-27 11:10:58 -07:00
Kevin Sawicki
0b6f38118e
Add back setting avatar background image to avatar url
2013-07-27 11:02:44 -07:00
Kevin Sawicki
50932bc9e2
Remove unused require
2013-07-27 10:42:25 -07:00
Kevin Sawicki
99ff064072
💄 remove unneeded units
2013-07-27 10:40:50 -07:00
Kevin Sawicki
51899e602c
💄 remove trailing whitespace
2013-07-27 10:40:15 -07:00
Kevin Sawicki
bca15a7589
Show avatar until video becomes available
2013-07-27 10:39:24 -07:00
Kevin Sawicki
c723dd5406
Exclude remote markers from TextBuffer.serialize()
2013-07-27 10:31:11 -07:00
Kevin Sawicki
891f032def
Unfocus collaboration spec
2013-07-27 10:06:04 -07:00
Nathan Sobo
433435743e
Log some collaboration events until we're more stable
2013-07-27 09:48:01 -06:00
Ben Ogle
2a010cb00a
volume 100%; remove remove link
2013-07-26 17:41:15 -07:00
Ben Ogle
d13cc7d96f
Merge branch 'summit' of github.com:github/atom into summit
2013-07-26 17:32:07 -07:00
Kevin Sawicki & Matt Colyer
624ca77173
Wrap webkitGetUserMedia in nextTick for reliability
2013-07-26 17:24:37 -07:00
Ben Ogle
ac8c95d9a6
Fix padding on connections count
2013-07-26 17:16:47 -07:00
Ben Ogle
492fc46fb8
Add avatar when video hidden
2013-07-26 17:08:52 -07:00
Ben Ogle
86d1990894
Add fontello icons.
...
Remove this when we have octicons for audio and video
2013-07-26 16:54:35 -07:00
Kevin Sawicki & Nathan Sobo
121ee10f5a
Call atom.getWindowState() instead of accessing property directly
2013-07-26 16:17:32 -07:00
Kevin Sawicki & Nathan Sobo
c1e6aeece8
Store live reference to root view state in window state instead of clone
2013-07-26 16:17:32 -07:00
Ben Ogle
450caa124a
add another color
2013-07-26 16:12:34 -07:00
Ben Ogle
85e90f2c09
Add ParticipantViewContainer
...
makes the stacking of participant views waaay better
2013-07-26 16:10:04 -07:00
Ben Ogle
c6293afc3b
Add index to participant view to stack multiple vids
2013-07-26 15:39:03 -07:00
Ben Ogle
87183f52ad
comment out the avatar thing
2013-07-26 15:39:03 -07:00
Ben Ogle
c49e092082
toggle classes added to participant view
2013-07-26 15:39:03 -07:00
Ben Ogle
100110430a
Add toggle states and colors to toggle vid and audio buttons
2013-07-26 15:39:03 -07:00
Kevin Sawicki & Nathan Sobo
9d2756a8ae
Rename audio/video configuration keys
2013-07-26 15:28:23 -07:00
Kevin Sawicki & Nathan Sobo
163015517e
Create media connection for each other participant
2013-07-26 15:06:16 -07:00
Ben Ogle
5b267f4a3f
cursor has site color
2013-07-26 14:44:32 -07:00
Ben Ogle
e07f92c4ee
Pick colors for the cursors and volume bars
2013-07-26 14:32:36 -07:00
Ben Ogle
a7b496f8c1
add site-id class to selection-view
2013-07-26 14:10:11 -07:00
Ben Ogle
f562a84bb5
add TODO for the crappy siteId hash usage
2013-07-26 14:01:18 -07:00
Ben Ogle
e84065fd9d
Better use of participant object
2013-07-26 14:00:53 -07:00
Ben Ogle
c6737caae6
add test for clientId -> siteId map
2013-07-26 13:50:02 -07:00
Ben Ogle
a0b7b4dd96
use clientIdToSiteId in participant view
2013-07-26 13:50:02 -07:00
Ben Ogle
4fe90900cc
add clientIdToSiteId to session's document
2013-07-26 13:48:24 -07:00
Matt Colyer
e088daa15b
Copy the session id when hosting via the statusbar
2013-07-26 13:43:25 -07:00
Matt Colyer
cc9902958e
Remove unused github avatar initialization
2013-07-26 13:30:40 -07:00
Matt Colyer
b87b4c1089
Reduce size of video stream
2013-07-26 12:22:33 -07:00
Kevin Sawicki & Nathan Sobo
c2ec172617
Upgrade telepath to avoid marker update corner case
2013-07-26 13:04:42 -06:00
Kevin Sawicki & Nathan Sobo
a60320df3a
Add Participant class
2013-07-26 12:25:20 -06:00
Kevin Sawicki & Nathan Sobo
32f75040de
Spec 💄 – Move spies to beforeEach and s/host/leader/g
2013-07-26 11:48:42 -06:00
probablycorey
c7321a795b
Use WsChannel to handle media webrtc handshake
2013-07-26 08:54:07 -07:00