glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Commit graph

  • 6af8a13c6f Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop Connor Turland 2014-10-22 21:09:08 -04:00
  • 3a8e0c08a6 changed order of "delete, remove, hide from map" poietic 2014-10-22 21:06:42 -04:00
  • fdfa720849 fixed ga code, and updated topright_sprite image with one that doesn't have littl glitches Connor Turland 2014-10-22 21:04:28 -04:00
  • 875f37c480 changed order of "delete, remove, hide from map" poietic 2014-10-22 20:48:01 -04:00
  • dfabb35daa Merge branch 'thevalueweb' of github.com:Connoropolous/metamaps_gen002 into tvw Connor Turland 2014-10-22 19:55:09 -04:00
  • c0751b8121 added metamap image Connor Turland 2014-10-22 19:54:47 -04:00
  • 89b6305be8 updated bitcoin widget with correct wallet info poietic 2014-10-22 17:07:41 -04:00
  • 74e5f7072e added metamap metacode poietic 2014-10-22 16:04:24 -04:00
  • 929bd65576 Update metacodes.yml Connor Turland 2014-10-22 14:06:51 -04:00
  • f680aa0f9e Merge branch 'thevalueweb' of github.com:Connoropolous/metamaps_gen002 into tvw Connor Turland 2014-10-22 13:41:33 -04:00
  • 3d973dc7f3 styled homepage, made sure password forgot, and password reset pages were accessible when logged out, updated metacode images Connor Turland 2014-10-22 13:41:06 -04:00
  • 2b87e8731b changed to TVW metacodes + hex codes + urls poietic 2014-10-22 13:05:39 -04:00
  • 13937ae51d merged conflicts coming from develop branch Connor Turland 2014-10-22 11:52:31 -04:00
  • 49c0af3add Merge pull request #371 from Connoropolous/wip-MouseStuff Connor Turland 2014-10-22 11:34:51 -04:00
  • 7e6092070a Update JIT.js Robert Best 2014-10-22 09:41:21 -04:00
  • ba2888420e Update Metamaps.JIT.js Robert Best 2014-10-22 09:39:14 -04:00
  • a7328526a8 got profile picture uploading working, as well as profile picture removing, as well as password changing Connor Turland 2014-10-21 20:31:59 -04:00
  • d6740385ac Merge branch 'develop' into tvw Connor Turland 2014-10-20 13:48:03 -04:00
  • 369779387d removed phantomjssetup doc Connor Turland 2014-10-20 13:47:30 -04:00
  • 968da71860 removed phantomjssetup doc Connor Turland 2014-10-20 13:44:59 -04:00
  • c03960025e Update UbuntuInstallation.md Connor Turland 2014-10-20 13:40:31 -04:00
  • 86e16d0a9c Update UbuntuInstallation.md Connor Turland 2014-10-20 13:39:33 -04:00
  • 46c9e47b7f Update UbuntuInstallation.md Connor Turland 2014-10-20 13:33:07 -04:00
  • 22ef16fb9a switched out old metacode images, switched in TVW images Connor Turland 2014-10-20 12:56:13 -04:00
  • 551c46e24e Merge branch 'thevalueweb' of https://github.com/Connoropolous/metamaps_gen002 into tvw Connor Turland 2014-10-20 12:33:16 -04:00
  • f0d8f2766b remove request invite from the sign up form Connor Turland 2014-10-18 20:32:19 -04:00
  • 4db8dd90a2 Changed a bunch of mouse functionality mappings. LeftDrag+CTRL+SHIFT to zoom to box (Or rightDrag + CTRL). The rest of left dragging is for selection Raymon Johnstone 2014-10-18 20:28:16 -04:00
  • 2db27ff15b fixed homepage redirect loop? Connor Turland 2014-10-18 19:43:54 -04:00
  • 37455abfe9 removed lightboxes, password protected Connor Turland 2014-10-18 19:26:34 -04:00
  • 6840d69747 lightboxes and stylesheet changes Raymon Johnstone 2014-10-18 13:56:45 -04:00
  • b4f4aefed0 switch ruby version Connor Turland 2014-10-18 13:02:31 -04:00
  • 25980b6c38 switched ruby version Connor Turland 2014-10-18 13:01:15 -04:00
  • 1f7df00d3c setup google analytics and production urls Connor Turland 2014-10-18 12:46:45 -04:00
  • a96a0852db Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 Connor Turland 2014-10-18 11:34:18 -04:00
  • 73b767df80 corrected realtime package file Connor Turland 2014-10-18 11:33:48 -04:00
  • a56532af0f Update WindowsInstallation.md Connor Turland 2014-10-18 09:29:00 -04:00
  • 764c1f5ff4 removed node_modules from git Connor Turland 2014-10-18 09:22:17 -04:00
  • 7dc2f66d96 Update .gitignore Connor Turland 2014-10-18 09:15:08 -04:00
  • 52e3162a37 Update WindowsInstallation.md Connor Turland 2014-10-18 08:52:36 -04:00
  • fbfe695998 adding topics to map from search results happens in a spiral Connor Turland 2014-10-16 23:54:26 -04:00
  • 1cceaceb06 cannow handle multiple metacodes with same names Connor Turland 2014-10-16 21:03:11 -04:00
  • 0449e28177 right click menus position nicely Connor Turland 2014-10-15 19:32:15 -04:00
  • 79daaf705b made metacode selecct for topic card always accessible, for when you move the card near the right or bottom of screen Connor Turland 2014-10-15 18:25:31 -04:00
  • e43b7fca87 one small fix for hiding 'share map' on map info box viewing a private map Connor Turland 2014-10-14 23:58:05 -04:00
  • d9c01db056 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into phantom Connor Turland 2014-10-14 23:45:39 -04:00
  • bbbbe57c1b new library Raymon Johnstone 2014-10-14 23:43:25 -04:00
  • 86bd12ca09 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into phantom Connor Turland 2014-10-14 23:20:46 -04:00
  • c37c846fbd ensured map info box action buttons only show at proper times. enabled deletion of maps Connor Turland 2014-10-14 23:20:40 -04:00
  • a9414c29d2 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop Raymon Johnstone 2014-10-14 23:20:20 -04:00
  • 3c7db77395 backing up bitcoin Raymon Johnstone 2014-10-14 23:19:58 -04:00
  • bfc8c796c7 border radius for map card images Connor Turland 2014-10-14 17:00:17 -04:00
  • 0ebb02bc0b Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into phantom Connor Turland 2014-10-14 16:34:26 -04:00
  • f9f147304f styling for map info box mostly complete Connor Turland 2014-10-14 16:34:09 -04:00
  • 0e5e814065 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop Raymon Johnstone 2014-10-13 23:21:53 -04:00
  • 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 Raymon Johnstone 2014-10-13 23:18:25 -04:00
  • 51221ee3f7 improvements to map info card, as well as small changes to the permission changers in the topic and synapse cards Connor Turland 2014-10-13 19:27:30 -04:00
  • e17cfb4f12 border radius for map created prompt Connor Turland 2014-10-11 23:08:31 -04:00
  • cd4474a0f0 created map prompt Connor Turland 2014-10-11 22:49:44 -04:00
  • fcdc6d57b2 setup for automatic config for urls Connor Turland 2014-10-10 21:24:31 -04:00
  • 550e89daef progress Connor Turland 2014-10-08 03:47:45 -04:00
  • 7e182b8beb figured out phantom? Connor Turland 2014-10-08 03:24:08 -04:00
  • c90721ad5c nothing Connor Turland 2014-10-08 02:34:17 -04:00
  • a93fc83bc8 multi buildpack Connor Turland 2014-10-08 02:31:25 -04:00
  • 51cb54a6e0 no change" Connor Turland 2014-10-08 02:21:32 -04:00
  • bac631ba73 config sidekiq Connor Turland 2014-10-08 01:42:16 -04:00
  • 19987594d6 ruby 2.1.2 Connor Turland 2014-10-08 01:22:02 -04:00
  • 47132f3e60 ruby 2.1 Connor Turland 2014-10-08 01:21:02 -04:00
  • 841e6fb3ab update phantom settings Connor Turland 2014-10-08 00:47:17 -04:00
  • cde771e007 got map screenshot working decent Connor Turland 2014-10-08 00:07:54 -04:00
  • 4f94f44a1f Merge branch 'wip-phantomjs' of https://github.com/Connoropolous/metamaps_gen002 into phantom Connor Turland 2014-10-07 21:30:42 -04:00
  • 84d926149c removed barometer.js Connor Turland 2014-10-07 21:30:25 -04:00
  • 68e1a8042a Added animationDone event to Metamaps.JIT.js, tried to hook into it from phantomjs, failed Devin Howard 2014-10-07 20:25:45 -04:00
  • cf01e711dd merge with devin Connor Turland 2014-10-07 19:19:24 -04:00
  • db3a4b66ad fixed issue that others might end up having with sso_key Connor Turland 2014-10-07 19:14:25 -04:00
  • 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 Devin Howard 2014-10-07 19:11:55 -04:00
  • c5601686c2 actually commented sidekiq route Devin Howard 2014-10-07 19:01:41 -04:00
  • f7f17a2908 added sidekiq gem and a route to /sidekiq (commented) for devel Devin Howard 2014-10-07 19:00:55 -04:00
  • a8d173ff1d made http protocol for uservoice redirect consistent Connor Turland 2014-10-07 18:49:14 -04:00
  • 9a250d0034 got redirect for single sign on with uservoice working Connor Turland 2014-10-07 18:38:33 -04:00
  • d4c481aac0 internet explorer get browser links open in new tabs Connor Turland 2014-10-07 17:57:12 -04:00
  • e756b29baa Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new Connor Turland 2014-10-07 17:46:34 -04:00
  • 629a6a4172 fixed sign in redirects Connor Turland 2014-10-07 17:46:09 -04:00
  • c8bda1bdf1 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 Bashar Jabbour 2014-10-07 16:14:14 -04:00
  • 8a70d209d1 fixed the links in noIE lightbox Bashar Jabbour 2014-10-07 16:14:00 -04:00
  • 9ba6daec90 further fixed uservoice to identify user Connor Turland 2014-10-07 15:39:11 -04:00
  • 6eec187eee Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new Connor Turland 2014-10-07 15:19:30 -04:00
  • b5068b6bc4 finalized uservoice config Connor Turland 2014-10-07 15:19:10 -04:00
  • e3c677fa5b Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 Bashar Jabbour 2014-10-07 14:47:18 -04:00
  • e405cc5a5d updated the noIE lightbox Bashar Jabbour 2014-10-07 14:47:06 -04:00
  • fbdef0108e Merge commit 'stash' into develop Raymon Johnstone 2014-10-07 12:39:43 -04:00
  • 388b1f6a5c WIP on develop: d30417f fixed right click on topic menu, fixed synapse color when opening for synapse card, removed mCustomScrollbar Raymon Johnstone 2014-10-07 12:39:14 -04:00
  • 3cb5c4ce3a index on develop: d30417f fixed right click on topic menu, fixed synapse color when opening for synapse card, removed mCustomScrollbar Raymon Johnstone 2014-10-07 12:39:14 -04:00
  • 897260017a Update CONTRIBUTING.md Robert Best 2014-10-05 23:05:44 -04:00
  • f591baf4c9 ability to switch between multiple synapses between two topics Connor Turland 2014-10-05 18:39:07 -04:00
  • ecc2ee9fea fixes #347. changes ctrl-r for remove from map to ctrl-m Connor Turland 2014-10-05 14:27:16 -04:00
  • 5c05c6bb83 404 page updates, synapse card 90% Connor Turland 2014-10-05 13:58:05 -04:00
  • ad2d79a7ea Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new Connor Turland 2014-10-05 09:44:28 -04:00
  • 4a721a6256 Merge pull request #370 from Connoropolous/wip-kbShortcuts Connor Turland 2014-10-05 09:44:02 -04:00
  • ef39443eb0 Relocated keyboard shortcut code to Metamaps.Listeners.... Then added CTRL+ R , +H, and +D shortcuts for remove, hide and delete Robert Best 2014-10-05 01:03:54 -04:00
  • 509e9dd6f0 heroku Connor Turland 2014-10-04 00:17:00 -04:00