Commit graph

875 commits

Author SHA1 Message Date
Devin Howard
67d4a2aa34 sandi metz function simplification 2015-12-03 16:57:30 -05:00
Devin Howard
520fe095bd fix #465, metacode sort problem 2015-12-03 16:57:29 -05:00
Connor Turland
87389a88ed current_user can be nil 2015-12-03 16:57:29 -05:00
Devin Howard
75700f06a9 make invite link use REQUEST_URI 2015-12-03 16:57:29 -05:00
Devin Howard
3e03e64845 css fixes for heroku 2015-12-03 16:57:29 -05:00
Devin Howard
f4456d06ef fix devise integration for rails 4 2015-12-03 16:57:29 -05:00
Devin Howard
3674aefb04 remove secrets.yml stuff because it doesn't work with heroku 2015-12-03 16:57:29 -05:00
Devin Howard
ede4e7a509 fix references to Rails.application.secrets 2015-12-03 16:57:28 -05:00
Devin Howard
570fa931b7 use secrets.yml to allow overriding config variables 2015-12-03 16:57:28 -05:00
Connor Turland
d8da2d93fd updated files to use amazon assets 2015-12-03 16:57:28 -05:00
Devin Howard
2cbf1cad7f fix 2015-12-03 16:57:28 -05:00
Devin Howard
4b6e33f983 does this fix missing-map.png? 2015-12-03 16:57:28 -05:00
Devin Howard
204544dc22 metacode asset_path calls 2015-12-03 16:57:28 -05:00
Devin Howard
f0c0dc48d8 add highlight to typeahead 2015-12-03 16:57:28 -05:00
Devin Howard
0b96171aa3 bugfix 2015-12-03 16:57:27 -05:00
Devin Howard
4245703084 see if we can make missing-map.png show up 2015-12-03 16:57:27 -05:00
Devin Howard
89424dcd7f try to fix custom metacode icon path 2015-12-03 16:57:27 -05:00
Devin Howard
f63a242256 whoops again 2015-12-03 16:57:27 -05:00
Devin Howard
47205883a9 whoops 2015-12-03 16:57:27 -05:00
Devin Howard
f4987bffc0 change css files to use asset_data_uri 2015-12-03 16:57:27 -05:00
Devin Howard
684dcd8d33 only run metacode.icon through asset_path if the path doesn't start with http 2015-12-03 16:57:27 -05:00
Devin Howard
bdb5623a02 woot fix metacodes 2015-12-03 16:57:27 -05:00
Devin Howard
d8dffad38a metacodes#index map in asset_path 2015-12-03 16:57:27 -05:00
Devin Howard
96f5e6ac35 add asset_path calls 2015-12-03 16:57:26 -05:00
Devin Howard
29411cf1e5 asset_path 2015-12-03 16:57:26 -05:00
Devin Howard
c782c4d0bb remove binding.pry 2015-12-03 16:57:26 -05:00
Devin Howard
52b37e7ac6 asset_path in css erb files 2015-12-03 16:57:26 -05:00
Devin Howard
4d7f509235 change some css to erb 2015-12-03 16:57:26 -05:00
Devin Howard
b9ac614057 asset_path doesn't work in models 2015-12-03 16:57:26 -05:00
Devin Howard
cef83e1f3d asset_path 2015-12-03 16:57:26 -05:00
Devin Howard
2505ce36a5 syntax 2015-12-03 16:57:25 -05:00
Devin Howard
235aa7a6b3 convert javascript to asset_path syntax 2015-12-03 16:57:25 -05:00
Devin Howard
6e9b0ac9ef rename js files to js.erb files 2015-12-03 16:57:25 -05:00
Devin Howard
566a0a3aa6 brute force prevent nil synapse descriptions 2015-12-03 16:57:25 -05:00
Devin Howard
617fe43f71 fix problem with mappings and forking maps 2015-12-03 16:57:25 -05:00
Devin Howard
1453a3c181 function naming 2015-12-03 16:57:25 -05:00
Devin Howard
840484178b fix mapping problem 2015-12-03 16:57:25 -05:00
Devin Howard
ae16f8f08d fix a few more mappable/topic/synapse things in JS 2015-12-03 16:57:24 -05:00
Devin Howard
3e8c971155 change from category/topic_id/synapse_id to mappable_type/mappable_id 2015-12-03 16:57:24 -05:00
Devin Howard
5dc53543f7 migrate to polymorphic mappings - DB MIGRATION 2015-12-03 16:57:24 -05:00
Devin Howard
a4f910b66d bg color on EXisting synapses heading 2015-12-03 16:57:24 -05:00
Devin Howard
379b37b445 fix typo + debug statements to make existingSynapse autocomplete work 2015-12-03 16:57:24 -05:00
Devin Howard
675bcadda0 deal with https://github.com/twitter/typeahead.js/issues/1195 2015-12-03 16:57:24 -05:00
Devin Howard
a7e512e25a working version of autocomplete that includes the new typeahead.js syntax. So much more complicated than before... 2015-12-03 16:57:24 -05:00
Devin Howard
bd9c275ada upgrade typeahead to 1.10 and new syntax 2015-12-03 16:57:24 -05:00
Devin Howard
4bc03e3d2a code tweaks to searchsynapses 2015-12-03 16:57:24 -05:00
Devin Howard
ff48b2456a Revert "upgrade typeahead to allow new syntax"
This reverts commit 347d77df82.
2015-12-03 16:57:24 -05:00
Devin Howard
8826dfdcf6 upgrade typeahead to allow new syntax 2015-12-03 16:57:24 -05:00
Devin Howard
e5c83a2a0c dependent destroy models for topics/maps/synapses on mappings 2015-12-03 16:57:23 -05:00
Devin Howard
b395bd0b50 replace the obvious spots with asset_path 2015-12-03 16:57:23 -05:00