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
Devin Howard
29411cf1e5
asset_path
2015-12-03 16:57:26 -05:00
Devin Howard
52b37e7ac6
asset_path in css erb files
2015-12-03 16:57:26 -05:00
Devin Howard
4d7f509235
change some css to erb
2015-12-03 16:57:26 -05:00
Devin Howard
a4f910b66d
bg color on EXisting synapses heading
2015-12-03 16:57:24 -05:00
Devin Howard
675bcadda0
deal with https://github.com/twitter/typeahead.js/issues/1195
2015-12-03 16:57:24 -05:00
Devin Howard
8505d26182
search box css fixes
2015-11-28 23:03:48 +08:00
Devin Howard
9afc8bc7c4
refactor search css into scss for clearer organization, plus do some fixes to the typeahead css
2015-11-28 21:40:09 +08:00
Devin Howard
98e11c0a7d
split search css out into its own file
2015-11-28 20:17:14 +08:00
Connor Turland
3216106660
styling of the vertical tab selectors needed improvement
2015-11-07 01:33:18 +08:00
Devin Howard
8b456f5a31
css fixes for heroku
2015-11-03 21:10:05 +08:00
Devin Howard
06d06f8f55
whoops
2015-10-26 12:27:22 +08:00
Devin Howard
6c27623b80
change css files to use asset_data_uri
2015-10-26 12:22:40 +08:00
Devin Howard
da98a53a3e
asset_path
2015-10-23 23:56:29 +08:00
Devin Howard
46dd54a1d7
asset_path in css erb files
2015-10-23 23:34:18 +08:00
Devin Howard
1670235172
change some css to erb
2015-10-23 23:19:25 +08:00
Devin Howard
c80569a449
bg color on EXisting synapses heading
2015-10-02 15:53:06 +08:00
Devin Howard
80b2b1876a
deal with https://github.com/twitter/typeahead.js/issues/1195
2015-10-02 14:39:17 +08:00
Connor Turland
6767771d7d
dont show the embedly share links
2015-08-03 14:12:47 -04:00
Connor Turland
fb8c006be1
fixed small alignment bug on tooltips in firefox
2015-02-01 12:29:16 -05:00
Connor Turland
aec2a97704
fixed the alignment of the tutorial video links
2015-02-01 11:56:54 -05:00
Connor Turland
1b9dd6dc14
fix z-index for firefox
2015-01-22 21:42:45 -05:00
Connor Turland
48cab05d7c
Merge branch 'develop' of github.com:metamaps/metamaps_gen002 into develop
2014-12-02 13:32:48 -05:00
Connor Turland
eece1446f2
added tutorial
2014-12-02 13:32:36 -05:00
poietic
8a8123c3c2
copy changes to homepage
2014-11-30 16:55:48 -08:00
Connor Turland
7548c1953f
Merge branch 'develop' of github.com:metamaps/metamaps_gen002 into develop
2014-11-30 13:52:32 -05:00
Connor Turland
ce7bec98ed
fixed wrong notify message bug. fixed firefox z-index issue. moved fork on github link and pointed to new metamaps repo
2014-11-30 13:47:41 -05:00
Bashar Jabbour
2aacd545ec
solved text bolding issue on mac
2014-11-29 17:27:33 -05:00
Bashar Jabbour
ce3ab9903a
make map contributor list dropdown into links to profiles
2014-11-29 15:56:38 -05:00
Connor Turland
f938ffade3
homepage changes
2014-11-29 12:25:11 -05:00
Connor Turland
0f0db1662e
one semicolon
2014-11-29 11:34:20 -05:00
Connor Turland
e3bf41b133
Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop
2014-11-29 11:26:55 -05:00
Connor Turland
da087a4c72
css for lightbox links
2014-11-29 11:26:47 -05:00
poietic
6ae98169e0
box shadow for lightboxes
2014-11-29 08:20:17 -08:00
Connor Turland
f02aa53637
fixed feedback tab, added support us button
2014-11-29 11:17:11 -05:00
Connor Turland
9f65fffe5f
showed help button on logged in home page
2014-11-29 10:24:57 -05:00
Connor Turland
870b4e2829
hid elements from homepage
2014-11-27 21:45:04 -05:00
Connor Turland
da6a7aadfb
fixed synapse creation. replaced homepage bg image
2014-11-27 21:32:04 -05:00
Connor Turland
0e3393e1b5
fixed metacode select lists to be flexible to metacodes
2014-11-27 18:10:17 -05:00
Connor Turland
caa80c067b
links to maps go through without refresh from topic card.
2014-11-27 17:27:22 -05:00
Bashar Jabbour
a284889593
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002
2014-11-27 15:02:58 -05:00
Bashar Jabbour
78743fbba5
updated the tooltip of maps topic appears in
2014-11-27 15:02:44 -05:00
poietic
47b5e9c288
fixed search alignment & drop shadow
2014-11-27 11:56:45 -08:00
Connor Turland
7cc6fb6c2d
added right click keyboard shortcuts and spacer/border
2014-11-27 11:21:25 -05:00
Connor Turland
f6fdd72cf8
fixed sign in form to use correct size for anonymous user image
2014-11-26 16:49:56 -05:00
Connor Turland
2829005d4e
Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop
2014-11-26 16:37:50 -05:00
Connor Turland
377138c483
fixed up search results some. colophon links open in new tab. updated homepage bg image. fixed topic carousel dimensions
2014-11-26 16:37:13 -05:00
Bashar Jabbour
363ca365c1
added tooltip to see topics synapses
2014-11-26 15:23:32 -05:00
Connor Turland
ab53e996d4
Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop
2014-11-26 14:49:16 -05:00
Connor Turland
36aeead2aa
homepage updates. updated the 'last updated' text. fixed map cards
2014-11-26 14:49:01 -05:00
Bashar Jabbour
814a804dd8
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002
2014-11-26 14:44:42 -05:00
Bashar Jabbour
085bf78b0e
added tooltip for maps that topic appears in
2014-11-26 14:44:31 -05:00
Connor Turland
a003e203af
big home change revisions. not 100% complete
2014-11-26 12:58:20 -05:00
Connor Turland
dbf4152a81
updated map delete sprite
2014-11-26 10:51:05 -05:00
Connor Turland
d08774d8bc
changed user image settings. added mapper profile page
2014-11-25 15:06:30 -05:00
Connor Turland
e9114a309f
fixed up map info box issues, finished up search tooltips
2014-11-23 22:28:29 -05:00
Bashar Jabbour
b077dd6010
added tooltip in search results for map
2014-11-22 23:05:31 -05:00
Bashar Jabbour
13118d0ea9
fixed firefox synapse card styling
2014-11-22 20:49:59 -05:00
Bashar Jabbour
5725007e78
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002
2014-11-22 19:35:15 -05:00
Bashar Jabbour
23510f2f87
added user image stack for map search results and associated tooltip
2014-11-22 19:35:03 -05:00
Connor Turland
0ebc3dbc37
filter and realtime button active states. zoomExtents excludes filtered topics
2014-11-21 15:45:44 -05:00
Connor Turland
e9a39f9838
made map contributors toggle visibility on click
2014-11-20 22:50:47 -05:00
Connor Turland
a20f6b760f
finished up map info box in terms of dynamically switching pages to other maps. styled other tips.
2014-11-19 22:42:14 -05:00
Bashar Jabbour
0d709cecac
updated the map contributors tooltip to match pseudo css
2014-11-18 23:24:43 -05:00
Bashar Jabbour
c4de02a958
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002
2014-11-18 14:50:17 -05:00
Bashar Jabbour
818042aeae
added tooltip of map contributors in mapinfo lightbox
2014-11-18 14:48:50 -05:00
Connor Turland
fe5d682fc2
finished synapse autocomplete styling
2014-11-16 15:17:32 -05:00
Connor Turland
23d5527adc
lots of little fixes
2014-11-15 17:43:24 -05:00
Connor Turland
4e8dabba36
removed worker from heroku deploy. styled lightboxes. made form for new user able to populate with code
2014-11-14 20:21:16 -05:00
Connor Turland
ac40c0af48
touched up tooltips
2014-11-14 08:21:09 -05:00
Bashar Jabbour
79c5b88547
contributor tooltip styling
2014-11-13 15:41:24 -05:00
Bashar Jabbour
78455c6a35
Added capture screenshot tooltip
2014-11-12 13:40:00 -05:00
Bashar Jabbour
02d49c166a
upated tooltips
2014-11-12 13:36:41 -05:00
Metamaps
842313bb07
updated the tooltips
2014-11-12 13:31:15 -05:00
Connor Turland
5175028ec1
added image for 'center topic' and 'get siblings'
2014-11-11 07:51:02 -05:00
Connor Turland
8d3de3867f
enabled pulling in siblings through right click menus in topic view
2014-11-11 06:48:21 -05:00
Connor Turland
9b0304c403
added filtering back to topic view
2014-11-11 02:23:39 -05:00
Connor Turland
4adf0081b8
Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop
2014-11-09 22:10:21 -05:00
Connor Turland
44923eb660
added new map screenshot capture method
2014-11-09 22:10:13 -05:00
poietic
4437270a6b
misc css tweaks
2014-11-08 21:52:46 -08:00
Connor Turland
0b7702062f
added little link icon next to metacode to indicate a link within a topic
2014-11-05 11:01:18 -05:00
Connor Turland
6a052f9ea1
added loading icon to account page while image uploads
2014-11-03 21:59:15 -05:00
Connor Turland
4646bf9668
client side image crop for profile pics
2014-11-03 21:26:08 -05:00
Connor Turland
6ecdd1076e
topic card description overflow improvement, handle invalid links in topic card
2014-11-03 17:48:02 -05:00
Connor Turland
ee1ca7853f
removed embed. fixed switch metacode set lightbox overflow. disabled topic creation and topic deletion from public maps by non-owner
2014-11-03 08:46:22 -05:00
Connor Turland
2a9a27c6c5
stops user from creating map with empty name, or topic with empty name. sets max length on topic name. allows enter key to create map
2014-11-02 16:04:53 -05:00
Connor Turland
12e65c638b
changes for reset password form
2014-10-27 18:24:30 -04:00
Connor Turland
acfd55a258
add authorize to delete to controller, fix private map message, fix new map css issue
2014-10-27 13:26:24 -04:00
Connor Turland
f58db49bc1
realtime
2014-10-27 12:03:55 -04:00
Connor Turland
cbf71ca2da
four little styling bugs
2014-10-24 12:10:56 -04:00
Connor Turland
1aaecd0a8f
improved sign up error display, fixed styling for firefox, fixed page stuck on loading spinner bug
2014-10-24 11:30:26 -04:00
poietic
3a8e0c08a6
changed order of "delete, remove, hide from map"
2014-10-22 21:06:42 -04:00
Connor Turland
49c0af3add
Merge pull request #371 from Connoropolous/wip-MouseStuff
...
Changes to Mouse Functionality
2014-10-22 11:34:51 -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
Raymon Johnstone
6840d69747
lightboxes and stylesheet changes
2014-10-18 13:56:45 -04:00
Connor Turland
fbfe695998
adding topics to map from search results happens in a spiral
2014-10-16 23:54:26 -04:00
Connor Turland
1cceaceb06
cannow handle multiple metacodes with same names
2014-10-16 21:03:11 -04:00
Connor Turland
0449e28177
right click menus position nicely
2014-10-15 19:32:15 -04:00
Connor Turland
79daaf705b
made metacode selecct for topic card always accessible, for when you move the card near the right or bottom of screen
2014-10-15 18:25:31 -04:00
Connor Turland
c37c846fbd
ensured map info box action buttons only show at proper times. enabled deletion of maps
2014-10-14 23:20:40 -04:00
Connor Turland
bfc8c796c7
border radius for map card images
2014-10-14 17:00:17 -04:00
Connor Turland
f9f147304f
styling for map info box mostly complete
2014-10-14 16:34:09 -04:00
Connor Turland
51221ee3f7
improvements to map info card, as well as small changes to the permission changers in the topic and synapse cards
2014-10-13 19:27:30 -04:00
Connor Turland
e17cfb4f12
border radius for map created prompt
2014-10-11 23:08:31 -04:00
Connor Turland
cd4474a0f0
created map prompt
2014-10-11 22:49:44 -04:00
Connor Turland
6eec187eee
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new
2014-10-07 15:19:30 -04:00
