Commit graph

235 commits

Author SHA1 Message Date
Connor Turland 96cee3cf21 Merge branch 'master' into thevalueweb 2015-02-06 17:44:10 -05:00
Connor Turland aec2a97704 fixed the alignment of the tutorial video links 2015-02-01 11:56:54 -05:00
Connor Turland 1b5ac1dafa merged develop into thevalueweb 2014-12-03 08:26:11 -05:00
Connor Turland eece1446f2 added tutorial 2014-12-02 13:32:36 -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 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 0e3393e1b5 fixed metacode select lists to be flexible to metacodes 2014-11-27 18:10:17 -05: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 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
Connor Turland 36aeead2aa homepage updates. updated the 'last updated' text. fixed map cards 2014-11-26 14:49:01 -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 54bb3d2c3d updated the 404 page. fixed merge conflicts. removed generation code 2014-11-23 22:58:30 -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 38c3ba419c Merge branch 'develop' into tvw 2014-11-11 07:51:22 -05:00
Connor Turland 5175028ec1 added image for 'center topic' and 'get siblings' 2014-11-11 07:51:02 -05:00
Connor Turland 70cf1426d7 fixed merges from develop 2014-11-11 07:05:31 -05:00
Connor Turland 8d3de3867f enabled pulling in siblings through right click menus in topic view 2014-11-11 06:48:21 -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 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 54584fb064 Merge branch 'develop' into tvw 2014-10-27 18:24:50 -04:00
Connor Turland 12e65c638b changes for reset password form 2014-10-27 18:24:30 -04:00
Connor Turland 96ed2bcd64 Merge branch 'develop' into tvw 2014-10-27 13:26:42 -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 8e55d32146 Merge branch 'develop' into tvw 2014-10-24 12:11:24 -04:00
Connor Turland cbf71ca2da four little styling bugs 2014-10-24 12:10:56 -04:00
Connor Turland 75c286ecc6 merged develop fixes 2014-10-24 11:31:39 -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
Connor Turland a8fb22ee95 fix for allowing sign ups, and for about lightbox overflow 2014-10-23 20:31:57 -04:00
Connor Turland 2d0793c083 fixed broken lightbox content 2014-10-23 20:16:04 -04:00
Connor Turland e61a32ebaa removed typekit for mooo.com, fixed topright_sprite 2014-10-22 21:26:37 -04:00
poietic 3a8e0c08a6 changed order of "delete, remove, hide from map" 2014-10-22 21:06:42 -04:00
Connor Turland 13937ae51d merged conflicts coming from develop branch 2014-10-22 11:52:31 -04:00