Connor Turland
|
3c9d722945
|
accept or reject video offers
|
2015-12-11 17:29:17 -05:00 |
|
Connor Turland
|
089528c46d
|
great progress
|
2015-12-11 14:23:41 -05:00 |
|
Devin Howard
|
b037c84f15
|
fix small error in user model
need to use the parent's generation to calculate generation!
|
2015-12-07 11:44:08 +08:00 |
|
Connor Turland
|
2929547736
|
position the chat box, and remove the old junto panel
|
2015-12-03 17:15:15 -05:00 |
|
Connor Turland
|
75554d58bf
|
temp
|
2015-12-03 17:15:15 -05:00 |
|
Devin Howard
|
519342a468
|
fix filter bug
|
2015-12-03 16:58:21 -05:00 |
|
Devin Howard
|
31fceab45d
|
search box css fixes
|
2015-12-03 16:58:21 -05:00 |
|
Devin Howard
|
47a7e161ee
|
fix error with mapper search rendering
|
2015-12-03 16:58:21 -05:00 |
|
Devin Howard
|
7336c262e3
|
fix up user model json output function
|
2015-12-03 16:58:21 -05:00 |
|
Devin Howard
|
48ea29b13e
|
refactor search css into scss for clearer organization, plus do some fixes to the typeahead css
|
2015-12-03 16:58:20 -05:00 |
|
Devin Howard
|
38662fcda8
|
split search css out into its own file
|
2015-12-03 16:58:20 -05:00 |
|
Devin Howard
|
7db75b8d6d
|
more fixes
|
2015-12-03 16:57:30 -05:00 |
|
Devin Howard
|
43624caf88
|
get autocomplete working again with new typeahead.js, but not the CSS
|
2015-12-03 16:57:30 -05:00 |
|
Devin Howard
|
4139c2c84a
|
syntax error
|
2015-12-03 16:57:30 -05:00 |
|
Connor Turland
|
53d7ccab56
|
fix cannot set readonly property highlight
|
2015-12-03 16:57:30 -05:00 |
|
Connor Turland
|
5b0e7ffcde
|
switching metacode sets was being caught by Metamaps.Router.intercept
|
2015-12-03 16:57:30 -05:00 |
|
Connor Turland
|
5f14601c74
|
styling of the vertical tab selectors needed improvement
|
2015-12-03 16:57:30 -05:00 |
|
Connor Turland
|
1b60927641
|
had to update because jquery ui version changed
|
2015-12-03 16:57:30 -05:00 |
|
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 |
|
Devin Howard
|
2369c9ce5e
|
select metacodes with one query instead of n queries, move logic to application_helper
|
2015-12-03 16:57:23 -05:00 |
|
Devin Howard
|
7c28070978
|
fix other controllers needing create/update changed for rails 4
|
2015-12-03 16:57:23 -05:00 |
|
Devin Howard
|
919fc0a60f
|
fiddle with topic and mapping controllers so they work again
|
2015-12-03 16:57:23 -05:00 |
|
Devin Howard
|
e34b5bd2ad
|
fix best in place deprecation warnings in map info box
|
2015-12-03 16:57:22 -05:00 |
|
Devin Howard
|
7877e5bdbc
|
delete_if threw errors, so convert things to arrays for it
|
2015-12-03 16:57:22 -05:00 |
|
Devin Howard
|
7d738b7abf
|
fix map/mapping associations that I broke
|
2015-12-03 16:57:22 -05:00 |
|
Devin Howard
|
e9cb8561fa
|
add required params to all controllers
|
2015-12-03 16:57:22 -05:00 |
|
Devin Howard
|
32311e3610
|
fix has_many relationships in map & mapping models for rails 4
|
2015-12-03 16:57:22 -05:00 |
|
Devin Howard
|
8bf2eb31f3
|
remove old jquery-ui file
|
2015-12-03 16:57:22 -05:00 |
|
Devin Howard
|
371851cb89
|
remove attr_accessible
|
2015-12-03 16:57:22 -05:00 |
|
Devin Howard
|
8425e72101
|
fix filter bug
|
2015-11-30 10:01:33 +08:00 |
|
Devin Howard
|
8505d26182
|
search box css fixes
|
2015-11-28 23:03:48 +08:00 |
|
Devin Howard
|
6b6ad1b660
|
fix error with mapper search rendering
|
2015-11-28 22:07:57 +08:00 |
|
Devin Howard
|
3aaf501b03
|
fix up user model json output function
|
2015-11-28 21:51:28 +08:00 |
|
Devin Howard
|
9afc8bc7c4
|
refactor search css into scss for clearer organization, plus do some fixes to the typeahead css
|
2015-11-28 21:40:09 +08:00 |
|
Devin Howard
|
98e11c0a7d
|
split search css out into its own file
|
2015-11-28 20:17:14 +08:00 |
|
Devin Howard
|
1f82238362
|
more fixes
|
2015-11-08 23:14:53 +08:00 |
|
Devin Howard
|
7136f46ec3
|
get autocomplete working again with new typeahead.js, but not the CSS
|
2015-11-08 22:53:34 +08:00 |
|
Devin Howard
|
fe0d38ec67
|
syntax error
|
2015-11-07 01:34:08 +08:00 |
|
Connor Turland
|
53de063bfc
|
fix cannot set readonly property highlight
|
2015-11-07 01:33:18 +08:00 |
|
Connor Turland
|
03ab04050d
|
switching metacode sets was being caught by Metamaps.Router.intercept
|
2015-11-07 01:33:18 +08:00 |
|
Connor Turland
|
3216106660
|
styling of the vertical tab selectors needed improvement
|
2015-11-07 01:33:18 +08:00 |
|
Connor Turland
|
e29ab4bca3
|
had to update because jquery ui version changed
|
2015-11-07 01:33:18 +08:00 |
|
Devin Howard
|
fa017a8559
|
sandi metz function simplification
|
2015-11-06 17:08:42 +08:00 |
|
Devin Howard
|
7ec7f9f892
|
fix #465, metacode sort problem
|
2015-11-04 17:22:46 +08:00 |
|
Connor Turland
|
86c467b2f1
|
current_user can be nil
|
2015-11-04 00:14:14 -05:00 |
|
Devin Howard
|
660ee52292
|
make invite link use REQUEST_URI
|
2015-11-03 22:22:53 +08:00 |
|
Devin Howard
|
8b456f5a31
|
css fixes for heroku
|
2015-11-03 21:10:05 +08:00 |
|
Devin Howard
|
62ae38e70d
|
fix devise integration for rails 4
|
2015-11-03 20:56:50 +08:00 |
|
Devin Howard
|
6487202e6f
|
remove secrets.yml stuff because it doesn't work with heroku
|
2015-10-30 14:30:24 +08:00 |
|
Devin Howard
|
e2a8e0331d
|
fix references to Rails.application.secrets
|
2015-10-30 14:18:50 +08:00 |
|
Devin Howard
|
8e1ae0a1fc
|
use secrets.yml to allow overriding config variables
|
2015-10-29 16:23:41 +08:00 |
|