Connor Turland
449c2084bb
make maps go under explore bar
2016-08-11 17:26:11 -04:00
Connor Turland
a3f1d51bc6
make the toast work
2016-08-10 18:06:28 +00:00
Connor Turland
f71d552504
Merge branch 'develop' into paring.down
2016-08-10 17:09:37 +00:00
Devin Howard
9cedf69432
fetch siblings & center topic keyboard shortcuts - fixes #466 ( #588 )
...
* fetch siblings & center topic keyboard shortcuts - fixes #466
* add keyboard shortcut labels
* update keyboard shortcuts to Ctrl+E, Ctrl+R, and Ctrl+T, and update docs
* zoom extents back to Ctrl+E and use e.preventDefault
2016-08-08 21:46:05 +08:00
Connor Turland
ede1dfb91c
made the header more generic to serve other functions
2016-08-04 13:58:59 -04:00
Connor Turland
30e9a27663
almost rid of famous completely
2016-08-04 13:58:06 -04:00
Connor Turland
aed423214f
started using react instead of famous
2016-08-04 13:57:35 -04:00
Connor Turland
293e68da05
remove old stuff
2016-08-04 13:56:39 -04:00
Connor Turland
8c51108a0c
enable shared private and public maps ( #530 )
...
* enable shared private and public maps
* change the list
* yeehaw add collaborators
* I believe this fixes the error connor brought up
* when topic or synapse is no longer on a map, don't defer
* needs to be before?
* just do it in the controller
* make recommendation they sign in and retry
* better email
* config for mailer previews
* improve wording
* shouldn't have included that
* switch to green
* don't execute if there's no map
* wasn't including the right people in some circumstances
* Finish breaking out JS files (#551 )
* metamaps.Realtime refactor
* Metamaps.Util
* Metamaps.Visualize
* Metamaps.SynapseCard
* Metamaps.TopicCard
* Metamaps.Create.js
* Remove erb extension from Metamaps.Map.js
* Metmaps.Account and Metamaps.GlobalUI remove extension
* Metamaps.JIT no more erb extension
* move Backbone.init; standard-format on Metamaps.js.erb
* factor out canvas support check function
* some llittle template bugs
* remove featured from signed in explore maps bar
* don't let it overflow off the page
2016-04-24 11:50:35 -04:00
Connor Turland
8a6d434fc3
Junto Sounds
...
* awesome news sounnndzzzz
* prevent double sound
* bug fixes and chat sounds on by default
2016-04-04 10:50:02 -04:00
Connor Turland
14dfe3c926
styling for doorkeeper and api functional
2016-03-24 17:16:27 -07:00
Connor Turland
617dec72b9
hide sound option. green 'in call' dot. tooltip
2016-03-21 13:08:34 -07:00
Connor Turland
bd5c88fb0b
display initial state of call to new mapper
2016-03-01 12:25:38 +13:00
Connor Turland
c6fea78054
merge develop
2016-02-29 13:58:47 +13:00
Devin Howard
ac1d4f70b6
show old image on metacode edit form; tweak css of admin area
2016-02-26 14:06:37 +08:00
Connor Turland
f9b23499dc
styling. add self to participants
2016-02-26 12:43:27 +13:00
Connor Turland
d82288c9f2
fixed up call ending/starting events
2016-02-17 13:27:22 +13:00
Connor Turland
e29b683b38
new junto images
2016-02-09 09:14:33 +13:00
Devin Howard
786eeae72a
Merge branch 'develop' into feature/realtime.video
2016-02-06 12:56:23 +08:00
Devin Howard
798035107f
Merge branch 'master' into develop
2016-02-06 10:11:55 +08:00
Devin Howard
67da49c1be
max height on search results so they scroll
2016-02-05 22:13:23 +08:00
Devin Howard
3fe93be987
Merge branch 'master' into develop
2016-02-05 20:21:31 +08:00
Devin Howard
353872001f
vertical align no results
2016-02-05 19:21:09 +08:00
Devin Howard
aabdaaf21b
nicer icon positioning
2016-02-05 19:19:16 +08:00
Devin Howard
f1f56f9286
centre topic icons if there are results
2016-02-05 19:11:19 +08:00
Devin Howard
3405bf5942
fix the problem where it always closes on you
2016-02-05 18:56:16 +08:00
Devin Howard
b3d321c7e9
topic icon <--
2016-02-05 18:27:26 +08: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
a45d0f7791
fix search box on authenticated homepage
2015-12-24 15:19:03 +08:00
Connor Turland
5ad1504494
handle socketio reconnect situation
2015-12-22 18:05:13 -05:00
Connor Turland
dfc94b4079
fix up styling on chat text input
2015-12-22 16:34:30 -05:00
Connor Turland
8d85f8d308
videos positioning decently. chats loading more smoothly
2015-12-22 12:43:50 -05: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
be2997d7e4
fix bad tooltip placement
2015-12-12 11:31:54 -05:00
Connor Turland
eec7dcb9c3
make the messages box fill up all available space
2015-12-11 19:18:53 -05:00
Connor Turland
20aa78208e
rename junto to erb file
2015-12-11 18:49:22 -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
2929547736
position the chat box, and remove the old junto panel
2015-12-03 17:15:15 -05:00
Connor Turland
75554d58bf
temp
2015-12-03 17:15:15 -05:00
Devin Howard
31fceab45d
search box css fixes
2015-12-03 16:58:21 -05:00
Devin Howard
48ea29b13e
refactor search css into scss for clearer organization, plus do some fixes to the typeahead css
2015-12-03 16:58:20 -05:00
Devin Howard
38662fcda8
split search css out into its own file
2015-12-03 16:58:20 -05:00
Connor Turland
5f14601c74
styling of the vertical tab selectors needed improvement
2015-12-03 16:57:30 -05:00
Devin Howard
3e03e64845
css fixes for heroku
2015-12-03 16:57:29 -05:00
Devin Howard
47205883a9
whoops
2015-12-03 16:57:27 -05:00
Devin Howard
f4987bffc0
change css files to use asset_data_uri
2015-12-03 16:57:27 -05:00
