Commit graph

268 commits

Author SHA1 Message Date
Connor Turland c989b321c1 switched filter box to be by who added something to the map, not who created the topic or synapse 2014-08-12 13:22:29 -04:00
Connor Turland e1fb72c2df fixed user model and map models up 2014-08-12 11:09:53 -04:00
Shai Mor 65c8cb2ea7 embed attachments 2014-08-11 21:59:02 -04:00
Shai Mor 3be9dcfd74 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into shai 2014-08-11 18:59:27 -04:00
Connor Turland bbc50d1305 got radial view working 2014-08-11 18:57:34 -04:00
Shai Mor 4541196ffe part way through add links to topic cards 2014-08-11 18:56:03 -04:00
Shai Mor 85bfce0237 part way through add links to topic cards 2014-08-11 18:55:53 -04:00
Connor Turland b596228782 restructuring for famous 2014-08-10 19:35:18 -04:00
Connor Turland 465b95753c reorganize for functional famous operation 2014-08-10 19:24:39 -04:00
Connor Turland 341f9b9bdd home page styling 2014-08-10 19:13:25 -04:00
Shai 6182ba4e14 data validation 2014-08-10 16:52:49 -04:00
Connor Turland 06b35e550d first draft of explore maps working 2014-08-10 13:06:58 -04:00
Connor Turland e9863c0192 merge with Robs changes 2014-08-06 10:14:17 -04:00
Connor Turland e7a445423d work in progress on explore maps pages 2014-08-06 10:09:01 -04:00
Robert Best f75c2c1f8a Added Recenter map, zoom in, zoom out, Zoom to extents and buttons for each. Also, renamed selection function to just SelectWithBox() 2014-08-06 04:22:06 -04:00
Tadasu85 e76d780335 Filter box coding changes, Full implementgit add . 2014-08-04 12:20:16 -04:00
Tadasu85 581ba8b78f Merge remote-tracking branch 'origin/develop' into new 2014-08-02 13:51:54 -04:00
Tadasu85 2b267ea0c6 filterbox progress 2014-08-02 13:49:51 -04:00
Connor Turland 0a29bed856 fixed topics and synapses placing on map issue 2014-08-02 13:48:41 -04:00
Connor Turland e08c702494 introduced the metamaps.router 2014-08-01 22:50:23 -04:00
Connor Turland 3476d0126c got rgraph working again 2014-07-30 21:10:10 -04:00
Connor Turland 9dec959aee more restructuring. reorganizing views files to make more sense, be grouped logically 2014-07-30 01:02:47 -04:00
Connor Turland f817ce772c changed approach to map creation. reorganized code to suit that. 2014-07-29 23:18:43 -04:00
Connor Turland ae8c711d27 major code refactor 2014-07-29 13:34:10 -04:00
Connor Turland de2c7372fd removed extra files 2014-07-27 15:59:02 -04:00
Connor Turland b06f5cae35 huge refactor 75% done 2014-07-27 15:57:35 -04:00
Connor Turland aa5e3d522b set proper socket for heroku 2014-07-07 21:08:14 -04:00
Connor Turland 96197130e1 added rmagick and ruby number for heroku 2014-07-07 21:02:43 -04:00
Connor Turland e5ba207711 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2014-06-15 14:41:11 -04:00
Connor Turland 9027cd6d2e closes #352 size of cheatsheet window, closes #351 remove topic and synapse create from cheatsheet on topic pages, closes #348 enter key creating undesirable line break 2014-06-15 14:39:42 -04:00
poietic a0cdad2138 Update _cheatsheet.html.erb
a couple of small switches
2014-06-15 10:52:38 -04:00
Connor Turland 0982916e10 hid topic view tab which was mistakenly showing 2014-06-14 18:25:37 -04:00
Connor Turland bffda35686 updated cheatsheet to be tabbed 2014-06-14 18:21:54 -04:00
Connor Turland 2bb5c7a6bd added homepage image 2014-06-11 22:38:48 -04:00
Connor Turland 0a3f83ade9 added realtime box 2014-06-11 16:47:46 -04:00
Connor Turland 5dd848abcf fixed scrolling on home page 2014-06-11 10:38:08 -04:00
Connor Turland 140a526226 changed home page card styling 2014-06-11 10:25:33 -04:00
Connor Turland 820096e853 merged raymons changes 2014-06-11 08:42:12 -04:00
Connor Turland 3625a750fd fixed metacode sets page styling issue 2014-06-10 20:22:35 -04:00
Connor Turland c567f07a50 closes #338 ugly text labels. fixes error when trying to load topic page with a metacode set selected 2014-06-10 18:49:06 -04:00
Connor Turland bfa25bc604 sped up scroll bars 2014-06-10 13:34:39 -04:00
Connor Turland b7703e2a0f improved metacode set switcher styling 2014-06-10 13:13:21 -04:00
Connor Turland 35985aecaa fixed styling of many of the user forms 2014-06-10 12:59:19 -04:00
Connor Turland f8a8f119aa for stagin 2014-06-09 16:38:29 -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 2f969bb29e for staging 2014-06-09 13:37:16 -04:00
Connor Turland 31817d31a5 closes #202, closes #301, closes #320, closes #337 2014-06-09 13:36:23 -04:00
Connor Turland 6f0150cca1 switched for production (realtime) 2014-06-08 16:27:16 -04:00
Connor Turland 2820f57a9f added metacode background bar set to match metacode color 2014-06-08 16:26:25 -04:00
Connor Turland f30904d828 fixed lightbox hiding 2014-06-04 16:41:02 -04:00