Commit graph

  • 3c9d722945 accept or reject video offers Connor Turland 2015-12-11 17:29:17 -0500
  • 089528c46d great progress Connor Turland 2015-12-11 14:23:41 -0500
  • 1597665be5 merge develop with rails4 stuff Devin Howard 2015-12-07 13:58:42 +0800
  • b037c84f15 fix small error in user model Devin Howard 2015-12-07 11:44:08 +0800
  • 2929547736 position the chat box, and remove the old junto panel Connor Turland 2015-10-29 18:34:05 -0700
  • b958c6ff89 removed precompiled assets Connor Turland 2015-10-27 22:03:16 -0700
  • 75554d58bf temp Connor Turland 2015-09-19 12:02:05 -0400
  • fa67ec0444 update Gemfile for rails 4 Devin Howard 2015-09-10 17:43:48 +0800
  • 519342a468 fix filter bug Devin Howard 2015-11-30 10:01:33 +0800
  • 31fceab45d search box css fixes Devin Howard 2015-11-28 22:50:32 +0800
  • 47a7e161ee fix error with mapper search rendering Devin Howard 2015-11-28 22:07:57 +0800
  • 7336c262e3 fix up user model json output function Devin Howard 2015-11-28 21:51:28 +0800
  • 48ea29b13e refactor search css into scss for clearer organization, plus do some fixes to the typeahead css Devin Howard 2015-11-28 20:39:11 +0800
  • 38662fcda8 split search css out into its own file Devin Howard 2015-11-28 20:17:14 +0800
  • d3814708a9 gc tuning Devin Howard 2015-11-25 11:59:56 +0800
  • 9575a62e67 add .ruby-gemset file - you may need to reinstall gems if using rvm Devin Howard 2015-11-23 18:08:27 +0800
  • cde6eaa564 Update windows installer docs Devin Howard 2015-11-20 14:34:05 +0800
  • 7db75b8d6d more fixes Devin Howard 2015-11-08 23:14:53 +0800
  • 43624caf88 get autocomplete working again with new typeahead.js, but not the CSS Devin Howard 2015-11-08 22:53:34 +0800
  • 4139c2c84a syntax error Devin Howard 2015-11-07 01:34:08 +0800
  • 53d7ccab56 fix cannot set readonly property highlight Connor Turland 2015-11-04 19:50:32 -0500
  • 5b0e7ffcde switching metacode sets was being caught by Metamaps.Router.intercept Connor Turland 2015-11-04 18:10:20 -0500
  • 5f14601c74 styling of the vertical tab selectors needed improvement Connor Turland 2015-11-04 18:09:44 -0500
  • 1b60927641 had to update because jquery ui version changed Connor Turland 2015-11-04 18:09:12 -0500
  • dcbe24bb7e getting uploads working Connor Turland 2015-11-04 17:52:58 -0500
  • 67d4a2aa34 sandi metz function simplification Devin Howard 2015-11-06 17:08:42 +0800
  • 520fe095bd fix #465, metacode sort problem Devin Howard 2015-11-04 17:22:46 +0800
  • 87389a88ed current_user can be nil Connor Turland 2015-11-04 00:14:14 -0500
  • f8814c060f reorganize documentation Devin Howard 2015-11-04 11:41:04 +0800
  • 1874c67a66 reorganize metamaps-qa-steps a bit Devin Howard 2015-11-04 11:40:52 +0800
  • 75700f06a9 make invite link use REQUEST_URI Devin Howard 2015-11-03 22:22:53 +0800
  • 3e03e64845 css fixes for heroku Devin Howard 2015-11-03 21:02:54 +0800
  • f4456d06ef fix devise integration for rails 4 Devin Howard 2015-11-03 20:56:50 +0800
  • dfaadc691e update WindowsInstallation.md Devin Howard 2015-11-03 19:10:21 +0800
  • 20e698f69d devise locale text Devin Howard 2015-11-02 00:07:52 +0800
  • 506f93e144 Gemfile.lock Devin Howard 2015-11-02 00:06:12 +0800
  • 6df2f22080 update devise.rb with new changes Devin Howard 2015-11-02 00:05:57 +0800
  • 3674aefb04 remove secrets.yml stuff because it doesn't work with heroku Devin Howard 2015-10-30 14:30:24 +0800
  • 10b58399a7 ok put ruby back in Gemfile' Devin Howard 2015-10-30 14:21:47 +0800
  • ede4e7a509 fix references to Rails.application.secrets Devin Howard 2015-10-30 14:18:50 +0800
  • 570fa931b7 use secrets.yml to allow overriding config variables Devin Howard 2015-10-29 16:23:41 +0800
  • dd02129b0d remove ruby from Gemfile in favour of .ruby-version Devin Howard 2015-10-29 16:18:06 +0800
  • d99ed6b627 migrate metacodes that started with /assets/icons to use amazonaws urls. Remove last migration I made Devin Howard 2015-10-28 14:24:52 +0800
  • d8da2d93fd updated files to use amazon assets Connor Turland 2015-10-27 21:44:38 -0700
  • 8e427ea8f2 add secrets.yml.default Devin Howard 2015-10-27 18:17:04 +0800
  • 2cbf1cad7f fix Devin Howard 2015-10-27 18:16:35 +0800
  • 4b6e33f983 does this fix missing-map.png? Devin Howard 2015-10-26 21:12:18 +0800
  • 204544dc22 metacode asset_path calls Devin Howard 2015-10-26 21:04:07 +0800
  • f0c0dc48d8 add highlight to typeahead Devin Howard 2015-10-26 21:01:13 +0800
  • 0b96171aa3 bugfix Devin Howard 2015-10-26 20:41:37 +0800
  • 4245703084 see if we can make missing-map.png show up Devin Howard 2015-10-26 20:16:49 +0800
  • 89424dcd7f try to fix custom metacode icon path Devin Howard 2015-10-26 18:28:25 +0800
  • f63a242256 whoops again Devin Howard 2015-10-26 12:39:40 +0800
  • 47205883a9 whoops Devin Howard 2015-10-26 12:24:17 +0800
  • f4987bffc0 change css files to use asset_data_uri Devin Howard 2015-10-26 12:22:40 +0800
  • 684dcd8d33 only run metacode.icon through asset_path if the path doesn't start with http Devin Howard 2015-10-26 12:12:07 +0800
  • bdb5623a02 woot fix metacodes Devin Howard 2015-10-26 11:53:54 +0800
  • 60898fadb2 binding_of_caller gem for devel debug Devin Howard 2015-10-26 11:53:50 +0800
  • d8dffad38a metacodes#index map in asset_path Devin Howard 2015-10-25 17:14:56 +0800
  • a972074306 environment assets config Devin Howard 2015-10-25 17:09:57 +0800
  • bd60f68cfe try to compile but not compress assets Devin Howard 2015-10-25 16:51:47 +0800
  • 96f5e6ac35 add asset_path calls Devin Howard 2015-10-25 16:50:07 +0800
  • d3080906b1 add db migration to remove asset paths from metacodes Devin Howard 2015-10-25 16:37:13 +0800
  • 29411cf1e5 asset_path Devin Howard 2015-10-23 23:56:29 +0800
  • c782c4d0bb remove binding.pry Devin Howard 2015-10-23 23:42:21 +0800
  • 52b37e7ac6 asset_path in css erb files Devin Howard 2015-10-23 23:34:18 +0800
  • 6a21b84a23 resume ignoring public/assets Devin Howard 2015-10-23 23:23:23 +0800
  • d52caac1d6 add indexes to schema Devin Howard 2015-10-23 23:22:54 +0800
  • 4d7f509235 change some css to erb Devin Howard 2015-10-23 23:19:25 +0800
  • b9ac614057 asset_path doesn't work in models Devin Howard 2015-10-23 23:09:14 +0800
  • cef83e1f3d asset_path Devin Howard 2015-10-23 23:06:24 +0800
  • 2505ce36a5 syntax Devin Howard 2015-10-23 23:01:02 +0800
  • 235aa7a6b3 convert javascript to asset_path syntax Devin Howard 2015-10-23 22:56:09 +0800
  • 6e9b0ac9ef rename js files to js.erb files Devin Howard 2015-10-23 22:51:16 +0800
  • 3f5404b043 add missing indexes for speed Devin Howard 2015-10-23 22:38:42 +0800
  • 53d77a0e5b fix migration for heroku Devin Howard 2015-10-23 22:32:09 +0800
  • 5b882b1332 pry byebug Devin Howard 2015-10-23 22:27:33 +0800
  • 566a0a3aa6 brute force prevent nil synapse descriptions Devin Howard 2015-10-23 22:10:45 +0800
  • 617fe43f71 fix problem with mappings and forking maps Devin Howard 2015-10-23 22:07:44 +0800
  • 1453a3c181 function naming Devin Howard 2015-10-23 21:04:16 +0800
  • 840484178b fix mapping problem Devin Howard 2015-10-23 21:03:49 +0800
  • ae16f8f08d fix a few more mappable/topic/synapse things in JS Devin Howard 2015-10-02 17:39:53 +0800
  • 3e8c971155 change from category/topic_id/synapse_id to mappable_type/mappable_id Devin Howard 2015-10-02 16:28:45 +0800
  • 5dc53543f7 migrate to polymorphic mappings - DB MIGRATION Devin Howard 2015-10-02 16:04:30 +0800
  • a4f910b66d bg color on EXisting synapses heading Devin Howard 2015-10-02 15:53:06 +0800
  • 379b37b445 fix typo + debug statements to make existingSynapse autocomplete work Devin Howard 2015-10-02 15:46:48 +0800
  • 675bcadda0 deal with https://github.com/twitter/typeahead.js/issues/1195 Devin Howard 2015-10-02 14:39:17 +0800
  • a7e512e25a 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
  • bd9c275ada upgrade typeahead to 1.10 and new syntax Devin Howard 2015-10-01 14:55:26 +0800
  • 4bc03e3d2a code tweaks to searchsynapses Devin Howard 2015-10-01 12:33:38 +0800
  • ff48b2456a Revert "upgrade typeahead to allow new syntax" Devin Howard 2015-10-01 11:34:19 +0800
  • 8826dfdcf6 upgrade typeahead to allow new syntax Devin Howard 2015-10-01 11:14:25 +0800
  • e5c83a2a0c dependent destroy models for topics/maps/synapses on mappings Devin Howard 2015-10-01 11:02:39 +0800
  • 0a63b5e79a fiddle with Gemfile Devin Howard 2015-10-01 11:02:03 +0800
  • b743476115 add qa steps file first draft Devin Howard 2015-09-28 14:43:09 +0800
  • b395bd0b50 replace the obvious spots with asset_path Devin Howard 2015-09-22 22:27:34 +0800
  • 1a01d3b568 configuration for production environments like heroku Connor Turland 2015-09-19 13:25:30 -0400
  • 8b7ec73f48 this enables the vagrant port forwarding Connor Turland 2015-09-19 13:16:07 -0400
  • 50d9866939 fix problem with join route Devin Howard 2015-09-19 20:46:10 +0800
  • 95e1806500 cancan => cancancan Devin Howard 2015-09-19 20:25:07 +0800