Devin Howard
44e8b8d581
Merge branch 'master' into thevalueweb
2015-06-03 18:14:05 -04:00
Devin Howard
3f5d2bd7f3
add gem install bundler to configure.sh
2015-05-09 23:22:23 -04:00
Connor Turland
499f6349e6
add ability for admin to delete any topics and synapses
2015-04-28 18:43:47 -04:00
Connor Turland
9ce81df9f9
Merge pull request #406 from s01us/extract_mail_env
...
extract email settings into ENV ✂️
2015-03-07 15:01:53 -05:00
mix irving
c17cc39880
extract email settings into ENV ✂️ fixes #405
2015-03-04 11:30:23 +13:00
Connor Turland
8816031b20
Merge pull request #404 from s01us/add_ruby_version
...
add .ruby-version for rbenv support
2015-03-03 09:33:59 -05:00
mix irving
4d311cb371
add .reuby-version for rbenv support
2015-03-03 23:15:44 +13:00
Connor Turland
253ceb4b48
added imagemagick to vagrantfile
2015-02-19 19:03:22 -05:00
Connor Turland
96cee3cf21
Merge branch 'master' into thevalueweb
2015-02-06 17:44:10 -05: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
9ed0d412df
.width() returned wrong result in firefox, causing the map to load with off dimensions
2015-02-01 11:50:22 -05:00
Connor Turland
531f09c6d3
active lists are sorting right. explore url breaking doesn't happen. explore maps pages do nicer infinite scrolling, properly loading only 20 at a time
2015-01-31 12:39:48 -05:00
Connor Turland
4d7695a767
this will clear up any remaining issues with urls ending up wrong
2015-01-30 21:08:37 -05:00
Connor Turland
4ca12c70ab
explore maps lists were rendering bajillions too many times causing everything to go slow. timeouts weren't canceling. very wow
2015-01-30 20:49:30 -05:00
Connor Turland
5cf75f3ea2
prevented map from loading before all metacode images were loaded
2015-01-30 00:09:45 -05:00
Connor Turland
84e03d5475
Merge pull request #381 from metamaps/dont.delete
...
mapper who wasn't creator of a topic or synapse should not be able to delete it
2015-01-29 22:25:21 -05:00
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
cc66a851bd
Merge pull request #382 from gitter-badger/gitter-badge
...
Add a Gitter chat badge to README.md
2015-01-29 17:59:23 -05:00
The Gitter Badger
4857a02e45
Added Gitter badge
2015-01-29 20:35:48 +00: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
d069cecc9b
fixed unfound merge conflict
2014-12-03 09:00:05 -05:00
Connor Turland
a83c3e4b85
removed any more references to mapper generation
2014-12-03 08:48:58 -05:00
Connor Turland
f094fd29f7
cleaned up unwanted stuff from metamapscc for tvw
2014-12-03 08:39:12 -05:00
