Commit graph

1019 commits

Author SHA1 Message Date
Connor Turland 3d5ed63534 expose unique metacode urls 2015-01-24 14:34:44 -05:00
Connor Turland f463140931 link to download json for map placed onto map interface 2015-01-24 12:43:35 -05:00
Connor Turland 0f526d1696 Merge pull request #376 from metamaps/bug-removeNodes
maps were crashing when topics were removed
2015-01-22 21:52:06 -05:00
Connor Turland f3569d17aa more commented code removed from realtime 2015-01-22 21:45:52 -05:00
Connor Turland 1b9dd6dc14 fix z-index for firefox 2015-01-22 21:42:45 -05:00
Connor Turland 595ff893f3 removed console logs 2015-01-22 21:42:21 -05:00
Connor Turland bf08b562c2 removed all the extra stuff 2015-01-22 21:41:41 -05:00
Connor Turland b395ecfded Merge branch 'vagrant' 2015-01-22 19:35:33 -05:00
Connor Turland 65e70d8b6d added npm, forever, and start and stop scripts 2015-01-22 19:33:57 -05:00
Gord Tanner 5592c4710a Created a Vagrantfile
Install instructions:

- clone repo
- (ensure you have VirtualBox and Vagrant)
- run configure.sh

This will create a VM, install all the software. Once vm is provisioned
it will then bundle install and configure your database

To start the service you can then run:

vagrant ssh -c 'cd /vagrant; rails s'
2015-01-22 17:53:18 -05:00
Connor Turland 263eef52ce maps were crashing when topics were removed (if those topics included the 'root node'. this was caused by a setTimeout interfering with synchronicity of events 2015-01-11 13:30:05 -05:00
poietic b2fce96974 Update CONTRIBUTING.md 2014-12-26 10:05:36 -08:00
poietic 24bd0a96a8 fixed links to CLA/CAA 2014-12-26 10:04:15 -08: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
poietic 9b415e4e6d fixed partners & supporters 2014-11-30 12:09:49 -08:00
poietic 44e98e00a7 fixed metacode file name 2014-11-30 11:57:06 -08:00
poietic 6a08d7e86f supported by 2014-11-30 11:53:44 -08:00
Connor Turland bcf7edb880 changed other references to connoropolous/metamaps_gen002 to metamaps/metamaps_gen002 2014-11-30 14:27:20 -05:00
Connor Turland f62efa0d68 fixed terms of service link for live site 2014-11-30 14:06:59 -05: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
poietic 2b7d70dfe8 changed metacodes 2014-11-29 21:12:07 -08:00
Bashar Jabbour 2aacd545ec solved text bolding issue on mac 2014-11-29 17:27:33 -05:00
Bashar Jabbour b883d03b4e make synapse card mapper icon link to mapper profile 2014-11-29 16:36:57 -05:00
Bashar Jabbour 12dd2f32b4 fixed conflict 2014-11-29 16:28:42 -05:00
Bashar Jabbour 0e3486ddc5 make topic card mapper icon link to mapper profile 2014-11-29 16:27:43 -05:00
Connor Turland 411efa9692 Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-11-29 16:06:04 -05:00
Connor Turland 694d36b6a6 ctrl+click doesn't zoom awkwardly 2014-11-29 16:05:56 -05:00
Bashar Jabbour 10dedaa169 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-11-29 15:57:42 -05:00
Bashar Jabbour ce3ab9903a make map contributor list dropdown into links to profiles 2014-11-29 15:56:38 -05:00
Devin Howard 8b146fccab Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 2014-11-29 15:53:53 -05:00
Devin Howard 739eba71bb only one router setTimeout function at a time - make it erase old functions if new one 2014-11-29 15:51:31 -05:00
Connor Turland 93227f0e2f fixed synapse selection and removal of multiple topics bugs 2014-11-29 15:36:03 -05:00
Devin Howard fe3d280862 remove console.log from Connor 2014-11-29 15:29:16 -05:00
Devin Howard 5f347bff67 remove console.logs whoops 2014-11-29 15:24:34 -05:00
Devin Howard 453758a9ff use lambda to store currentPage so explore/mine doesn't get rendered incorrectly in url as explore/<mapid> 2014-11-29 15:23:53 -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 f9d3292891 Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-11-29 11:17:33 -05:00
Connor Turland f02aa53637 fixed feedback tab, added support us button 2014-11-29 11:17:11 -05:00
poietic 99b0fa0c68 links in light boxes 2014-11-29 08:06:12 -08:00
Connor Turland 09d8fbacb6 disabled tutorials tab for now 2014-11-29 10:51:27 -05:00
Connor Turland 9f65fffe5f showed help button on logged in home page 2014-11-29 10:24:57 -05:00
Connor Turland 61c6c8c5c1 added empty canvas helper message 2014-11-29 10:18:18 -05:00
Connor Turland cb3db06406 switched home page to active maps instead of my maps 2014-11-29 01:37:06 -05:00