Commit graph

  • 310222aef9 factories for synapse, topic, user Devin Howard 2015-10-19 15:23:49 +0800
  • e3a4207827 random_string helper function Devin Howard 2015-10-19 15:23:07 +0800
  • d913f50cf9 remove views specs and non-applicable routing specs Devin Howard 2015-10-12 17:19:16 +0800
  • 25117cf0e6 add rspec scaffold tests and a test db environment Devin Howard 2015-10-12 11:37:44 +0800
  • 16c47d75d4 delete test directory, add spec directory Devin Howard 2015-10-12 11:26:48 +0800
  • 0d2ddbd9b6 add rspec to Gemfile Devin Howard 2015-10-12 11:24:30 +0800
  • 053f035d31 move fixtures to seeds.rb Devin Howard 2015-10-12 11:22:55 +0800
  • 85b3012cd9 fix a few more mappable/topic/synapse things in JS Devin Howard 2015-10-02 17:39:53 +0800
  • 6d1e382d5c change from category/topic_id/synapse_id to mappable_type/mappable_id Devin Howard 2015-10-02 16:28:45 +0800
  • 69f4b8c645 migrate to polymorphic mappings - DB MIGRATION Devin Howard 2015-10-02 16:04:30 +0800
  • c80569a449 bg color on EXisting synapses heading Devin Howard 2015-10-02 15:53:06 +0800
  • 120edfc278 fix typo + debug statements to make existingSynapse autocomplete work Devin Howard 2015-10-02 15:46:48 +0800
  • 80b2b1876a deal with https://github.com/twitter/typeahead.js/issues/1195 Devin Howard 2015-10-02 14:39:17 +0800
  • e1d4dafa5e Merge branch 'instance/synbioleap' of https://github.com/metamaps/metamaps_gen002 into instance/synbioleap instance/synbioleap leap 2015-10-02 01:47:21 -0400
  • 7350b9bb9a add to metacode_sets fixtures Devin Howard 2015-10-02 13:43:50 +0800
  • a51777b0ba working version of autocomplete that includes the new typeahead.js syntax. So much more complicated than before... Devin Howard 2015-10-02 13:36:51 +0800
  • 14eeb0cbe6 upgrade typeahead to 1.10 and new syntax Devin Howard 2015-10-01 14:55:26 +0800
  • d895bca1a4 code tweaks to searchsynapses Devin Howard 2015-10-01 12:33:38 +0800
  • b3b065e623 Revert "upgrade typeahead to allow new syntax" Devin Howard 2015-10-01 11:34:19 +0800
  • 347d77df82 upgrade typeahead to allow new syntax Devin Howard 2015-10-01 11:14:25 +0800
  • b0efe6aea8 Merge branch 'develop' into rails4 Devin Howard 2015-10-01 11:05:27 +0800
  • 9e43cc2e96 dependent destroy models for topics/maps/synapses on mappings Devin Howard 2015-10-01 11:02:39 +0800
  • bb29e0e724 fiddle with Gemfile Devin Howard 2015-10-01 11:02:03 +0800
  • 5c903bbab5 Merge 0a5b62871c into c0d29e54bd Connor Turland 2015-10-01 02:34:26 +0000
  • 0a5b62871c first 2 slack events Connor Turland 2015-09-30 22:30:53 -0400
  • 485c0f6d2a Merge 11f673f7c5 into a8dc64a6fe Connor Turland 2015-09-30 16:16:08 +0000
  • a8dc64a6fe Merge pull request #415 from metamaps/less-autocomplete Devin Howard 2015-10-01 00:08:43 +0800
  • 19e675617e Merge a9b034637b into 6767771d7d Devin Howard 2015-09-30 05:57:24 +0000
  • a9b034637b only autocomplete topic/synapse if the user types more than 2 characters Devin Howard 2015-09-30 13:55:23 +0800
  • c0d29e54bd Merge branch 'rails4' of ssh://github.com/metamaps/metamaps_gen002 into rails4 Devin Howard 2015-09-28 14:43:16 +0800
  • b9140e9b8d add qa steps file first draft Devin Howard 2015-09-28 14:43:09 +0800
  • 8f8f40c0e4 replace the obvious spots with asset_path Devin Howard 2015-09-22 22:27:34 +0800
  • 741c584651 Merge branch 'develop' into rails4 Devin Howard 2015-09-20 13:55:21 +0800
  • 7841f6c96b Merge pull request #412 from devvmh/dotenv_install Devin Howard 2015-09-20 13:48:16 +0800
  • f5dbfd5d72 configuration for production environments like heroku Connor Turland 2015-09-19 13:25:30 -0400
  • 869fb816e9 this enables the vagrant port forwarding Connor Turland 2015-09-19 13:16:07 -0400
  • 1fbd16ac95 fix problem with join route Devin Howard 2015-09-19 20:46:10 +0800
  • b2e15c6483 cancan => cancancan Devin Howard 2015-09-19 20:25:07 +0800
  • 1ebbdb2e97 Merge 7a1b68960d into 6767771d7d mix irving 2015-09-19 12:23:07 +0000
  • 086acb09af select metacodes with one query instead of n queries, move logic to application_helper Devin Howard 2015-09-19 20:17:56 +0800
  • 62035ed015 fix other controllers needing create/update changed for rails 4 Devin Howard 2015-09-19 20:05:36 +0800
  • e14001061c fiddle with topic and mapping controllers so they work again Devin Howard 2015-09-19 20:01:44 +0800
  • 31015295f8 fix best in place deprecation warnings in map info box Devin Howard 2015-09-19 17:11:48 +0800
  • 6692c28965 delete_if threw errors, so convert things to arrays for it Devin Howard 2015-09-19 17:08:12 +0800
  • 1aa4d862a1 whoo new gems for development. binding.pry is so cool Devin Howard 2015-09-19 17:01:27 +0800
  • 2f9b09db86 fix map/mapping associations that I broke Devin Howard 2015-09-19 16:48:24 +0800
  • c361349c20 add required params to all controllers Devin Howard 2015-09-19 16:26:34 +0800
  • a31a92b321 Merge branch 'develop' into rails4 Devin Howard 2015-09-15 20:37:47 +0800
  • a8cef723a2 fix has_many relationships in map & mapping models for rails 4 Devin Howard 2015-09-10 22:48:35 +0800
  • d67d098b2a remove old jquery-ui file Devin Howard 2015-09-10 22:40:45 +0800
  • 8cf8277573 add jquery_ui to gemfile Devin Howard 2015-09-10 22:13:10 +0800
  • dc51d0080e remove attr_accessible Devin Howard 2015-09-10 22:12:50 +0800
  • f81fdbf8cc secret_token => secret_key_base Devin Howard 2015-09-10 22:12:39 +0800
  • 7a73f3bc07 remove match method from routes.rb Devin Howard 2015-09-10 22:06:58 +0800
  • c250f5d395 asset precompiling simpler in rails 4 Devin Howard 2015-09-10 22:03:39 +0800
  • 3c0bdff823 some config changes for rails 4 found on the Internet Devin Howard 2015-09-10 17:43:58 +0800
  • 5848af7765 update Gemfile for rails 4 Devin Howard 2015-09-10 17:43:48 +0800
  • 526fc6064c Merge d925e89d00 into 6767771d7d mix irving 2015-08-05 15:47:07 +0000
  • 6767771d7d dont show the embedly share links Connor Turland 2015-08-03 14:11:58 -0400
  • 5cd4db66c6 needed to update embedly Connor Turland 2015-08-03 14:02:30 -0400
  • 73b3c499cf added metacodes poietic 2015-06-13 23:29:46 -0700
  • 5c2129e219 LEAP branding, content & aesthetic tweaks poietic 2015-06-09 12:38:27 -0700
  • 44e8b8d581 Merge branch 'master' into thevalueweb Devin Howard 2015-06-03 18:14:05 -0400
  • 3f5d2bd7f3 add gem install bundler to configure.sh Devin Howard 2015-05-09 23:22:23 -0400
  • 499f6349e6 add ability for admin to delete any topics and synapses v2.6 Connor Turland 2015-04-28 18:43:47 -0400
  • 58c35c50e9 Merge 3473cf3736 into 9ce81df9f9 Devin Howard 2015-04-01 19:48:45 +0000
  • 7a1b68960d install dotenv to help managed env vars mix irving 2015-03-08 20:21:25 +1300
  • d925e89d00 add cancancan mix irving 2015-03-08 20:25:12 +1300
  • 9ce81df9f9 Merge pull request #406 from s01us/extract_mail_env Connor Turland 2015-03-07 15:01:53 -0500
  • c17cc39880 extract email settings into ENV ✂️ fixes #405 mix irving 2015-03-04 11:27:37 +1300
  • 8816031b20 Merge pull request #404 from s01us/add_ruby_version Connor Turland 2015-03-03 09:33:59 -0500
  • 4d311cb371 add .reuby-version for rbenv support mix irving 2015-03-03 23:15:44 +1300
  • 3473cf3736 add desc and link to xls and csv exporters Devin Howard 2015-03-02 17:45:15 -0500
  • 7509216a74 add two functions to demonstrate a simple input-from-Excel. Open an Excel document, create two columns, put name in the first column and metacode in the second, and then populate it with names and valid metacodes. Copy-paste the cells (just click, drag, and copy) and paste them into the textarea created by Metamaps.Topic.createCSVInputTextarea. Hit enter and it'll call parseTopicCSVInput and create your topics. Devin Howard 2015-02-28 19:55:45 -0500
  • a525f9d89e change line encoding of models/topic.rb to unix Devin Howard 2015-03-01 20:25:39 -0500
  • 44c8779d89 add synapses to XLS and CSV output Devin Howard 2015-03-01 20:25:23 -0500
  • 657925e0e2 added metacode to the xls and csv views Devin Howard 2015-03-01 13:13:52 -0500
  • b5b13841bc implement CSV and XLS export for map topics Devin Howard 2015-02-28 19:55:45 -0500
  • 253ceb4b48 added imagemagick to vagrantfile Connor Turland 2015-02-19 19:03:22 -0500
  • 11f673f7c5 basic code in place for taking a screenshot of the current view Connor Turland 2015-02-19 18:23:26 -0500
  • 97aca38d53 table is there and page views are being tracked feature/latest.viewed Connor Turland 2015-02-08 20:42:55 -0500
  • 96cee3cf21 Merge branch 'master' into thevalueweb instance/thevalueweb Connor Turland 2015-02-06 17:44:10 -0500
  • fb8c006be1 fixed small alignment bug on tooltips in firefox Connor Turland 2015-02-01 12:29:16 -0500
  • aec2a97704 fixed the alignment of the tutorial video links Connor Turland 2015-02-01 11:56:54 -0500
  • 9ed0d412df .width() returned wrong result in firefox, causing the map to load with off dimensions Connor Turland 2015-02-01 11:50:22 -0500
  • 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 Connor Turland 2015-01-31 12:39:48 -0500
  • 4d7695a767 this will clear up any remaining issues with urls ending up wrong Connor Turland 2015-01-30 21:08:37 -0500
  • 4ca12c70ab explore maps lists were rendering bajillions too many times causing everything to go slow. timeouts weren't canceling. very wow Connor Turland 2015-01-30 20:49:30 -0500
  • 5cf75f3ea2 prevented map from loading before all metacode images were loaded Connor Turland 2015-01-30 00:09:45 -0500
  • 84e03d5475 Merge pull request #381 from metamaps/dont.delete Connor Turland 2015-01-29 22:25:21 -0500
  • 670dd5d874 added user feedback, and moved the edge actually hiding into the if statement where it should be Connor Turland 2015-01-29 22:23:24 -0500
  • cc66a851bd Merge pull request #382 from gitter-badger/gitter-badge Connor Turland 2015-01-29 17:59:23 -0500
  • 4857a02e45 Added Gitter badge The Gitter Badger 2015-01-29 20:35:48 +0000
  • a048c87356 mapper who doesn't own a topic or synapse should not be able to delete it. Connor Turland 2015-01-28 22:35:03 -0500
  • c61de991af re-added buildpack file for heroku Connor Turland 2015-01-28 21:49:58 -0500
  • 463a25f0a4 re-added procfile for heroku Connor Turland 2015-01-28 21:48:18 -0500
  • 5a31c91597 Merge branch 'master' of github.com:metamaps/metamaps_gen002 into prevent.scrolling Connor Turland 2015-01-28 21:39:33 -0500
  • 5d9305fb11 adding preventDefault will keep the page from doing weird scrolling on mac, or when the map is embedded Connor Turland 2015-01-28 21:38:44 -0500
  • dbfc0e4f4d Merge pull request #380 from metamaps/bug-labelsDisappearing Connor Turland 2015-01-28 21:35:20 -0500
  • 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 Connor Turland 2015-01-28 21:04:00 -0500