Connor Turland
4f94f44a1f
Merge branch 'wip-phantomjs' of https://github.com/Connoropolous/metamaps_gen002 into phantom
2014-10-07 21:30:42 -04:00
Connor Turland
84d926149c
removed barometer.js
2014-10-07 21:30:25 -04:00
Devin Howard
68e1a8042a
Added animationDone event to Metamaps.JIT.js, tried to hook into it from phantomjs, failed
...
still have debugging stuff in this commit. it's currently rendering the image so I can check output
It doesn't seem to be responding to the event, and it's stopped hiding the UI elements around the edge
2014-10-07 20:25:45 -04:00
Connor Turland
cf01e711dd
merge with devin
2014-10-07 19:19:24 -04:00
Connor Turland
db3a4b66ad
fixed issue that others might end up having with sso_key
2014-10-07 19:14:25 -04:00
Devin Howard
c6c05085ad
Added phantomjs script to save an image - this doesn't totally work yet, it has a error with famous
...
Added worker process to call the phantomjs script in app/workers
Added hook in models/map.rb to call the worker
Added calls to map.touch in mappings_controller.rb so it would get triggered correctly - I'm not sure how this will proceed moving forward
2014-10-07 19:11:55 -04:00
Devin Howard
c5601686c2
actually commented sidekiq route
2014-10-07 19:01:41 -04:00
Devin Howard
f7f17a2908
added sidekiq gem and a route to /sidekiq (commented) for devel
2014-10-07 19:00:55 -04:00
Connor Turland
a8d173ff1d
made http protocol for uservoice redirect consistent
2014-10-07 18:49:14 -04:00
Connor Turland
9a250d0034
got redirect for single sign on with uservoice working
2014-10-07 18:38:33 -04:00
Connor Turland
d4c481aac0
internet explorer get browser links open in new tabs
2014-10-07 17:57:12 -04:00
Connor Turland
e756b29baa
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new
2014-10-07 17:46:34 -04:00
Connor Turland
629a6a4172
fixed sign in redirects
2014-10-07 17:46:09 -04:00
Bashar Jabbour
c8bda1bdf1
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002
2014-10-07 16:14:14 -04:00
Bashar Jabbour
8a70d209d1
fixed the links in noIE lightbox
2014-10-07 16:14:00 -04:00
Connor Turland
9ba6daec90
further fixed uservoice to identify user
2014-10-07 15:39:11 -04:00
Connor Turland
6eec187eee
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new
2014-10-07 15:19:30 -04:00
Connor Turland
b5068b6bc4
finalized uservoice config
2014-10-07 15:19:10 -04:00
Bashar Jabbour
e3c677fa5b
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002
2014-10-07 14:47:18 -04:00
Bashar Jabbour
e405cc5a5d
updated the noIE lightbox
2014-10-07 14:47:06 -04:00
Raymon Johnstone
fbdef0108e
Merge commit 'stash' into develop
2014-10-07 12:39:43 -04:00
Raymon Johnstone
388b1f6a5c
WIP on develop: d30417f fixed right click on topic menu, fixed synapse color when opening for synapse card, removed mCustomScrollbar
2014-10-07 12:39:14 -04:00
Raymon Johnstone
3cb5c4ce3a
index on develop: d30417f fixed right click on topic menu, fixed synapse color when opening for synapse card, removed mCustomScrollbar
2014-10-07 12:39:14 -04:00
Robert Best
897260017a
Update CONTRIBUTING.md
...
removed the famo.us mentions, and added a NOTE, on something that seems wrong.
2014-10-05 23:05:44 -04:00
Connor Turland
f591baf4c9
ability to switch between multiple synapses between two topics
2014-10-05 18:39:07 -04:00
Connor Turland
ecc2ee9fea
fixes #347 . changes ctrl-r for remove from map to ctrl-m
2014-10-05 14:27:16 -04:00
Connor Turland
5c05c6bb83
404 page updates, synapse card 90%
2014-10-05 13:58:05 -04:00
Connor Turland
ad2d79a7ea
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new
2014-10-05 09:44:28 -04:00
Connor Turland
4a721a6256
Merge pull request #370 from Connoropolous/wip-kbShortcuts
...
New keyboard shortcuts
2014-10-05 09:44:02 -04:00
Robert Best
ef39443eb0
Relocated keyboard shortcut code to Metamaps.Listeners.... Then added CTRL+ R , +H, and +D shortcuts for remove, hide and delete
2014-10-05 01:03:54 -04:00
Connor Turland
509e9dd6f0
heroku
2014-10-04 00:17:00 -04:00
Connor Turland
d30417f958
fixed right click on topic menu, fixed synapse color when opening for synapse card, removed mCustomScrollbar
2014-10-04 00:15:47 -04:00
Connor Turland
fae7f9996d
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new
2014-10-03 11:26:49 -04:00
Bashar Jabbour
cad8af2c1f
updated the cheatsheet
2014-10-02 22:33:28 -04:00
Bashar Jabbour
499298613b
updated metacodes.yml and deleted metacode_backgrounds.css
2014-10-02 17:07:09 -04:00
Bashar Jabbour
6785a61fd0
updated 404 page
2014-10-02 15:55:51 -04:00
Connor Turland
10e5228488
finalized cheatsheet move help button back into the corner
2014-10-01 23:41:39 -04:00
Bashar Jabbour
80221f1dd4
small updates to colophone
2014-10-01 23:25:49 -04:00
Bashar Jabbour
b70681ea6e
updated the 404 page
2014-10-01 23:21:05 -04:00
Shai Mor
1a4330ec19
metamaps support resources links
2014-10-01 22:55:59 -04:00
Bashar Jabbour
5b7f23a409
updated tracking code for google analytics
2014-10-01 20:57:25 -04:00
Bashar Jabbour
179cee8456
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002
2014-10-01 20:43:23 -04:00
Bashar Jabbour
8caabb6ce1
update the colophone page
2014-10-01 20:43:11 -04:00
Connor Turland
9169293323
small fix for minimizing search results
2014-10-01 20:00:03 -04:00
Connor Turland
eb57e555e9
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new
2014-10-01 19:52:14 -04:00
Connor Turland
b6700f77f8
synapse fixes
2014-10-01 19:52:08 -04:00
Shai Mor
ff4a64665e
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop
2014-10-01 18:09:15 -04:00
Shai Mor
4ba9a26c2b
style sidebar search mapper stats
2014-10-01 18:07:05 -04:00
Connor Turland
a1925b3573
heroku
2014-10-01 17:20:02 -04:00
Connor Turland
b577f4fd19
improved z-indexes
2014-10-01 17:15:35 -04:00
