Connor Turland
d1680c1895
disable permanent deletion of topics and synapses, except...
...
when the topic or synapse no longer appears on any maps, and this can currently only be performed over the api
2016-12-14 14:17:55 -05:00
Devin Howard
ce2d462578
fix bugs on develop branch
2016-11-09 20:44:00 -05:00
Devin Howard
5851d57eef
Merge branch 'master' into develop
2016-11-09 09:29:30 -05:00
Connor Turland
d1f75c8c24
oops! don't change rt server port
2016-11-08 19:45:51 +00:00
Connor Turland
83b58d43d5
only remove user once they've left all maps
2016-11-08 19:42:48 +00:00
Devin Howard
a176cdf231
eslint frontend folder ( #923 )
2016-11-07 15:25:08 -05:00
Connor Turland
cbcdd912c9
Comments were for non-redux scenario
2016-10-22 11:04:14 -04:00
Connor Turland
1d13da4ab5
Update README.md
2016-10-22 10:59:43 -04:00
Connor Turland
abb997c75c
some quick fixes for realtime server after devins refactor
2016-10-21 18:04:18 -04:00
Connor Turland
fb427a11f0
[WIP] keep client fresh with junto info globally ( #791 )
...
* push state to client
* junto status is live on map cards XD
* little fixes
* eslint stuff
* remove object rest spread
* i think this makes realtime work without needing babel-node
2016-10-21 09:29:04 -04:00
Connor Turland
139837e997
restructure realtime server for clarity ( #780 )
...
* restructure realtime server for clarity
* better indenting on signal.js
* don't need it because socketioconnection is being imported now
2016-10-18 20:29:21 -04:00
Connor Turland
d004e98ada
holy insanity realtime refactor ( #779 )
...
* all the refactoring
* make it all work
2016-10-18 12:34:19 -04:00
Connor Turland
fe0da255dd
[WIP] display whether a map is live on every map card ( #775 )
...
* tidy up
* checkwhethertosave was no longer correct
2016-10-17 22:27:15 -04:00
Devin Howard
0a109895f7
merge realtime/package.json into top level package.json
2016-09-22 17:00:36 +08:00
Connor Turland
bd5c88fb0b
display initial state of call to new mapper
2016-03-01 12:25:38 +13:00
Connor Turland
d82288c9f2
fixed up call ending/starting events
2016-02-17 13:27:22 +13:00
Devin Howard
8202fb38f3
Merge branch 'develop' into feature/realtime.video
2016-02-05 16:27:43 +08:00
Devin Howard
f2cbde50ca
dos2unix on the whole repo
2016-02-05 11:43:15 +08:00
Connor Turland
4557b8e305
merge develop
2016-01-22 14:59:09 +13:00
Devin Howard
c2a2fe4997
better readme for realtime server
2016-01-17 10:14:19 +08:00
Connor Turland
a905094d4d
inviting, joining, and leaving conversations
2015-12-14 02:28:13 -05:00
Connor Turland
8b090be0b3
convert to something more 'call' style
2015-12-12 19:00:51 -05:00
Connor Turland
5f1ef5f5c8
remove extra code
2015-12-11 18:10:38 -05:00
Connor Turland
3c9d722945
accept or reject video offers
2015-12-11 17:29:17 -05:00
Connor Turland
089528c46d
great progress
2015-12-11 14:23:41 -05:00
Connor Turland
75554d58bf
temp
2015-12-03 17:15:15 -05:00
Connor Turland
f3569d17aa
more commented code removed from realtime
2015-01-22 21:45:52 -05:00
Connor Turland
bf08b562c2
removed all the extra stuff
2015-01-22 21:41:41 -05:00
Connor Turland
f58db49bc1
realtime
2014-10-27 12:03:55 -04:00
Connor Turland
a7328526a8
got profile picture uploading working, as well as profile picture removing, as well as password changing
2014-10-21 20:31:59 -04:00
Connor Turland
73b767df80
corrected realtime package file
2014-10-18 11:33:48 -04:00
Connor Turland
764c1f5ff4
removed node_modules from git
2014-10-18 09:22:17 -04:00
Bashar Jabbour
5b7f23a409
updated tracking code for google analytics
2014-10-01 20:57:25 -04:00
Bashar Jabbour
427fa99a0c
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002
2014-10-01 15:15:43 -04:00
Connor Turland
86e78919b3
initial code for realtime, got new topic, new synapse, and topic drag working
2014-09-30 16:55:25 -04:00
Bashar Jabbour
bc59c282a7
fixed the google analytics tracking code
2014-09-30 15:34:35 -04:00
Shai Mor
f49f45e856
about, invite, getInvolved
2014-09-10 18:12:21 -04:00
Connor Turland
d2760b8688
change in embedly
2014-09-09 18:17:39 -04:00
Connor Turland
eedd3736cf
realtime and filter box styling
2014-09-03 19:05:25 -04:00
Connor Turland
0a3f83ade9
added realtime box
2014-06-11 16:47:46 -04:00
Connor Turland
8760cf0280
added new images and made realtime send more relevant messages including one when someone turns on realtime
2014-06-09 16:37:09 -04:00
Connor Turland
cac3a7c93b
focus on topic creator after selecting metacode set
2014-06-04 16:24:13 -04:00
Connor Turland
a46d097da9
ability to switch metacode sets from mapping page
2014-06-04 15:24:16 -04:00
Raymon Johnstone
2a59d67d79
removed extra files
2014-05-17 16:10:44 -04:00
Connor Turland
7b3311cb05
changed realtime folder
2014-02-10 02:03:06 -05:00
Connor Turland
f657a61327
added all the code for realtime mapping using websockets. fixed some minor bugs like the label glitches, dragBox to deselect as well as select, shift click for synapses working again, panning won't deselect all your selected nodes and edges, nor hide the showcard, but a single click will hide the open card
2013-04-26 00:07:29 -04:00