glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
827 commits 40 branches 27 tags 58 MiB
Commit graph

462 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
b70681ea6e updated the 404 page 2014-10-01 23:21:05 -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
Connor Turland
999dae34ea switched add link section on topic card to be without upload file for now 2014-10-01 16:44:11 -04:00
Connor Turland
8ef56735bf switch metacode set styling complete 2014-10-01 16:23:59 -04:00
Connor Turland
a382e0c35d account page image border radius, fixed filters not working on first click issue 2014-10-01 14:07:48 -04:00
Connor Turland
031f97ba42 search results styling 2014-10-01 13:18:24 -04:00
Shai Mor
db719abf0f merge with develop 2014-10-01 09:57:40 -04:00
Shai Mor
57fb6a15c4 start on search results styling, pulled in external js libraries and css 2014-10-01 09:54:56 -04:00
Connor Turland
eccc433627 fixed realtime bug where couldn't populate filters because it was missing a new mapper model that just added something 2014-09-30 18:13:49 -04:00
Connor Turland
81f31ea10e heroku 2014-09-30 16:59:19 -04:00
Connor Turland
86e78919b3 initial code for realtime, got new topic, new synapse, and topic drag working 2014-09-30 16:55:25 -04:00