Connor Turland
79daaf705b
made metacode selecct for topic card always accessible, for when you move the card near the right or bottom of screen
2014-10-15 18:25:31 -04:00
Connor Turland
e43b7fca87
one small fix for hiding 'share map' on map info box viewing a private map
2014-10-14 23:58:05 -04:00
Connor Turland
d9c01db056
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into phantom
2014-10-14 23:45:39 -04:00
Raymon Johnstone
bbbbe57c1b
new library
2014-10-14 23:43:25 -04:00
Connor Turland
86bd12ca09
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into phantom
2014-10-14 23:20:46 -04:00
Connor Turland
c37c846fbd
ensured map info box action buttons only show at proper times. enabled deletion of maps
2014-10-14 23:20:40 -04:00
Raymon Johnstone
a9414c29d2
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop
2014-10-14 23:20:20 -04:00
Raymon Johnstone
3c7db77395
backing up bitcoin
2014-10-14 23:19:58 -04:00
Connor Turland
bfc8c796c7
border radius for map card images
2014-10-14 17:00:17 -04:00
Connor Turland
0ebb02bc0b
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into phantom
2014-10-14 16:34:26 -04:00
Connor Turland
f9f147304f
styling for map info box mostly complete
2014-10-14 16:34:09 -04:00
Raymon Johnstone
0e5e814065
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop
2014-10-13 23:21:53 -04:00
Raymon Johnstone
b1ae75a896
updates to all walkthroughs about the fact that we now use rails 2.1.2 as well as a couple changes to the get involved lightbox
2014-10-13 23:18:25 -04:00
Connor Turland
51221ee3f7
improvements to map info card, as well as small changes to the permission changers in the topic and synapse cards
2014-10-13 19:27:30 -04:00
Connor Turland
e17cfb4f12
border radius for map created prompt
2014-10-11 23:08:31 -04:00
Connor Turland
cd4474a0f0
created map prompt
2014-10-11 22:49:44 -04:00
Connor Turland
fcdc6d57b2
setup for automatic config for urls
2014-10-10 21:24:31 -04:00
Connor Turland
550e89daef
progress
2014-10-08 03:47:45 -04:00
Connor Turland
7e182b8beb
figured out phantom?
2014-10-08 03:24:08 -04:00
Connor Turland
c90721ad5c
nothing
2014-10-08 02:34:17 -04:00
Connor Turland
a93fc83bc8
multi buildpack
2014-10-08 02:31:25 -04:00
Connor Turland
51cb54a6e0
no change"
2014-10-08 02:21:32 -04:00
Connor Turland
bac631ba73
config sidekiq
2014-10-08 01:42:16 -04:00
Connor Turland
19987594d6
ruby 2.1.2
2014-10-08 01:22:02 -04:00
Connor Turland
47132f3e60
ruby 2.1
2014-10-08 01:21:02 -04:00
Connor Turland
841e6fb3ab
update phantom settings
2014-10-08 00:47:17 -04:00
Connor Turland
cde771e007
got map screenshot working decent
2014-10-08 00:07:54 -04:00
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
