Connor Turland
670dd5d874
added user feedback, and moved the edge actually hiding into the if statement where it should be
2015-01-29 22:23:24 -05:00
Connor Turland
a048c87356
mapper who doesn't own a topic or synapse should not be able to delete it.
2015-01-28 22:35:03 -05:00
Connor Turland
c61de991af
re-added buildpack file for heroku
2015-01-28 21:49:58 -05:00
Connor Turland
463a25f0a4
re-added procfile for heroku
2015-01-28 21:48:18 -05:00
Connor Turland
5a31c91597
Merge branch 'master' of github.com:metamaps/metamaps_gen002 into prevent.scrolling
2015-01-28 21:39:33 -05:00
Connor Turland
5d9305fb11
adding preventDefault will keep the page from doing weird scrolling on mac, or when the map is embedded
2015-01-28 21:38:44 -05:00
Connor Turland
dbfc0e4f4d
Merge pull request #380 from metamaps/bug-labelsDisappearing
...
when a topic was deleted, renderEdgeArrows was trying to call on a topic...
2015-01-28 21:35:20 -05:00
Connor Turland
d2e9d87037
when a topic was deleted, renderEdgeArrows was trying to call on a topic that was no longer existent to draw synapse direction, breaking the graph render
2015-01-28 21:04:00 -05:00
Connor Turland
40cebf572c
Merge pull request #378 from metamaps/embedly
...
updated embedly library, and data-card-chrome was now causing a breaking change
2015-01-28 19:33:54 -05:00
Connor Turland
bb99583622
updated embedly library, and data-card-chrome was now causing a breaking change
2015-01-28 19:19:07 -05:00
Connor Turland
07e0aac7fd
Update README.md
2015-01-22 23:02:11 -05:00
Connor Turland
36e84d61fd
Update UbuntuInstallation.md
2015-01-22 22:59:11 -05:00
Connor Turland
bf7b25f7de
Update README.md
2015-01-22 22:56:36 -05:00
Connor Turland
89e31d14b2
Delete codeguide.txt
2015-01-22 22:43:31 -05:00
Connor Turland
ebfe8257bd
Delete .buildpacks
2015-01-22 22:43:04 -05:00
Connor Turland
f7d537ed64
Delete Procfile
2015-01-22 22:42:52 -05:00
Connor Turland
84e9eb385c
Delete LiveSiteUpdatesNotes.txt
2015-01-22 22:42:29 -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
