Devin Howard
|
57a8b654ba
|
smoother 'added by me' filtering
|
2016-02-05 21:25:20 +08:00 |
|
|
Devin Howard
|
3fe93be987
|
Merge branch 'master' into develop
|
2016-02-05 20:21:31 +08:00 |
|
|
Devin Howard
|
48ec4a024e
|
mark 2.7.1
|
2016-02-05 20:12:05 +08:00 |
|
|
Devin Howard
|
6b9aa52224
|
well, the loading icon mostly works now too
|
2016-02-05 20:09:00 +08:00 |
|
|
Devin Howard
|
5f90843da2
|
gross, but it works. checkboxes in search results work
|
2016-02-05 20:02:57 +08:00 |
|
|
Devin Howard
|
c427e7fd7e
|
mess with typeahead(val) calls. looks like the header is being destroyed during suggestion rendering, need a variable
|
2016-02-05 19:54:38 +08:00 |
|
|
Devin Howard
|
353872001f
|
vertical align no results
|
2016-02-05 19:21:09 +08:00 |
|
|
Devin Howard
|
aabdaaf21b
|
nicer icon positioning
|
2016-02-05 19:19:16 +08:00 |
|
|
Devin Howard
|
f1f56f9286
|
centre topic icons if there are results
|
2016-02-05 19:11:19 +08:00 |
|
|
Devin Howard
|
461b62628d
|
fix minimizing search results
|
2016-02-05 19:06:57 +08:00 |
|
|
Devin Howard
|
3405bf5942
|
fix the problem where it always closes on you
|
2016-02-05 18:56:16 +08:00 |
|
|
Devin Howard
|
a05fe70eda
|
topic headers on resultnoresults
|
2016-02-05 18:35:45 +08:00 |
|
|
Devin Howard
|
b3d321c7e9
|
topic icon <--
|
2016-02-05 18:27:26 +08:00 |
|
|
Devin Howard
|
8202fb38f3
|
Merge branch 'develop' into feature/realtime.video
|
2016-02-05 16:27:43 +08:00 |
|
|
Devin Howard
|
f2cbde50ca
|
dos2unix on the whole repo
|
2016-02-05 11:43:15 +08:00 |
|
|
Devin Howard
|
3e28831595
|
Merge branch 'develop' into feature/realtime.video
|
2016-02-05 11:38:19 +08:00 |
|
|
Devin Howard
|
c80efac7de
|
tag v2.8
|
2016-02-05 11:37:33 +08:00 |
|
|
Devin Howard
|
e73ade0442
|
tag v2.7
|
2016-02-05 11:29:05 +08:00 |
|
poietic
|
c8d6563f45
|
changed links from old uservoice url.
links to support forum were pointed towards our expired custom domain
from service, renamed them all so that they link up.
|
2016-01-29 16:00:30 -08:00 |
|
Connor Turland
|
8e07c10ecc
|
make sure the chat pane is closed for opening the next map
|
2016-01-26 15:29:32 +13:00 |
|
|
Connor Turland
|
1fa84e0d29
|
chat only displays on maps
|
2016-01-26 14:46:26 +13:00 |
|
|
Connor Turland
|
74d372b942
|
fix the scrolling in the chat messages box
|
2016-01-22 16:49:50 +13:00 |
|
|
Connor Turland
|
4557b8e305
|
merge develop
|
2016-01-22 14:59:09 +13:00 |
|
|
Devin Howard
|
14a292331b
|
two tweaks to help production deploy
|
2016-01-19 14:27:25 +08:00 |
|
|
Connor Turland
|
11fc7a01f3
|
fixes the issue where video feeds go black after first call
|
2016-01-09 16:11:28 +13:00 |
|
|
Devin Howard
|
4842856358
|
merge develop into rspec-tests
|
2016-01-07 16:04:23 +08:00 |
|
|
Devin Howard
|
4469b29ec2
|
in user model
|
2016-01-07 15:32:19 +08:00 |
|
|
Devin Howard
|
bf21dcc3e6
|
merge develop into rspec tests
|
2016-01-06 23:03:34 +08:00 |
|
|
Devin Howard
|
3cdab531a6
|
move more config into .example-env
|
2016-01-06 22:57:01 +08:00 |
|
|
Devin Howard
|
844a52fc52
|
Merge pull request #450 from metamaps/feature/fix-searchbox
fix searchbox
|
2015-12-24 15:44:12 +08:00 |
|
|
Devin Howard
|
40561c629a
|
fix handleResultClick on search box
|
2015-12-24 15:42:51 +08:00 |
|
|
Devin Howard
|
a45d0f7791
|
fix search box on authenticated homepage
|
2015-12-24 15:19:03 +08:00 |
|
|
Connor Turland
|
6db91ea703
|
broken funnnnnction
|
2015-12-23 11:34:52 +08:00 |
|
|
Connor Turland
|
26bc04262a
|
broken funnnnnction
|
2015-12-22 22:28:03 -05:00 |
|
|
Connor Turland
|
5ad1504494
|
handle socketio reconnect situation
|
2015-12-22 18:05:13 -05:00 |
|
|
Connor Turland
|
64283850e3
|
add junto spinner for call in progress
|
2015-12-22 17:46:19 -05:00 |
|
|
Connor Turland
|
dfc94b4079
|
fix up styling on chat text input
|
2015-12-22 16:34:30 -05:00 |
|
|
Connor Turland
|
49dd2f2e92
|
merge develop
|
2015-12-22 13:16:03 -05:00 |
|
|
Connor Turland
|
8d85f8d308
|
videos positioning decently. chats loading more smoothly
|
2015-12-22 12:43:50 -05:00 |
|
|
Devin Howard
|
8394e0ce86
|
re-add regular uservoice code
|
2015-12-22 07:13:26 +08:00 |
|
|
Devin Howard
|
c58b2c805e
|
syntax error
|
2015-12-21 21:38:02 +08:00 |
|
|
Devin Howard
|
d96e991de3
|
don't use // for heroku either
|
2015-12-21 21:29:15 +08:00 |
|
|
Devin Howard
|
6e10b4c508
|
make use of realtime.metamaps.cc server
|
2015-12-21 21:28:18 +08:00 |
|
|
Devin Howard
|
603b9dc52e
|
remove uservoice code
|
2015-12-21 10:16:51 +08:00 |
|
|
Devin Howard
|
9a7ef25afc
|
Merge branch 'develop' into feature/https-preparation
|
2015-12-20 22:28:43 +08:00 |
|
|
Devin Howard
|
888edae6f6
|
finish remove asset_path_icon whoops
|
2015-12-20 22:28:05 +08:00 |
|
|
Devin Howard
|
c79a5f0072
|
Merge branch 'develop' into feature/https-preparation
|
2015-12-20 22:24:47 +08:00 |
|
|
Devin Howard
|
96ec672779
|
Merge branch 'develop' into feature/rspec-tests
|
2015-12-20 22:24:39 +08:00 |
|
|
Devin Howard
|
df485002b1
|
remove redundant asset_path_icon function
|
2015-12-20 22:22:01 +08:00 |
|
|
Devin Howard
|
d33f4bffb1
|
typekit https
|
2015-12-20 20:19:24 +08:00 |
|
|
Devin Howard
|
e2bf1d5eb1
|
try to make metamaps more tls friendly
|
2015-12-20 18:36:57 +08:00 |
|
|
Devin Howard
|
c4be57e525
|
topic and synapse validate permission
|
2015-12-18 09:25:54 +08:00 |
|
|
Devin Howard
|
006acac6b5
|
remove redundant authorize_to_view function
|
2015-12-17 23:20:19 +08:00 |
|
|
Devin Howard
|
d5f66487b7
|
update map spec - add authorize_to_delete. TODO: add other map authorize specs
|
2015-12-17 09:44:48 +08:00 |
|
|
Devin Howard
|
9e4a7b821f
|
cleanup topic model a bit
|
2015-12-17 09:34:49 +08:00 |
|
|
Devin Howard
|
696bac17e6
|
map spec
|
2015-12-17 09:16:02 +08:00 |
|
|
Devin Howard
|
2525a6fb65
|
add permission service, refactor map model a bit, add validations
|
2015-12-17 09:10:52 +08:00 |
|
|
Devin Howard
|
bfd4e4f228
|
add permission service, add validations to map.rb
|
2015-12-17 09:03:51 +08:00 |
|
|
Devin Howard
|
4dbff85443
|
default value if no request.env in application controller passes the rspec test woot. Only 80 more tests to implement
|
2015-12-16 22:36:12 +08:00 |
|
|
Devin Howard
|
ae1117338a
|
set up devise authentication more srsly. Still doesn't pass the test though haha
|
2015-12-16 22:16:02 +08:00 |
|
|
Devin Howard
|
be3924aa54
|
setup bare minimum devise authentication in tests
|
2015-12-16 21:32:50 +08:00 |
|
|
Devin Howard
|
6148f55e1c
|
handle nil unsafe_uri in app conttroller function
|
2015-12-16 21:05:18 +08:00 |
|
|
Devin Howard
|
b2aa2074a7
|
update generation calcuation code, incl. fix user signup bug
|
2015-12-15 12:33:22 +08:00 |
|
|
Connor Turland
|
a905094d4d
|
inviting, joining, and leaving conversations
|
2015-12-14 02:28:13 -05:00 |
|
|
Connor Turland
|
8b090be0b3
|
convert to something more 'call' style
|
2015-12-12 19:00:51 -05:00 |
|
|
Connor Turland
|
be2997d7e4
|
fix bad tooltip placement
|
2015-12-12 11:31:54 -05:00 |
|
|
Connor Turland
|
eec7dcb9c3
|
make the messages box fill up all available space
|
2015-12-11 19:18:53 -05:00 |
|
|
Connor Turland
|
56e3fc753a
|
use asset_path for link to sound files
|
2015-12-11 19:15:18 -05:00 |
|
|
Connor Turland
|
20aa78208e
|
rename junto to erb file
|
2015-12-11 18:49:22 -05:00 |
|
|
Connor Turland
|
6c7ba76937
|
update to https for sockets
|
2015-12-11 18:45:51 -05:00 |
|
|
Connor Turland
|
5f1ef5f5c8
|
remove extra code
|
2015-12-11 18:10:38 -05:00 |
|
|
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 |
|
|
Connor Turland
|
6e79b58e16
|
updated files to use amazon assets
|
2015-10-27 21:46:07 -07:00 |
|
|
Devin Howard
|
eea2bf30df
|
fix
|
2015-10-27 18:16:35 +08:00 |
|
|
Devin Howard
|
43c851e6b4
|
does this fix missing-map.png?
|
2015-10-26 21:12:18 +08:00 |
|
|
Devin Howard
|
5ce460e967
|
metacode asset_path calls
|
2015-10-26 21:04:07 +08:00 |
|
|
Devin Howard
|
9916975e2e
|
add highlight to typeahead
|
2015-10-26 21:01:13 +08:00 |
|
|
Devin Howard
|
fb848b29d5
|
bugfix
|
2015-10-26 20:41:37 +08:00 |
|
|
Devin Howard
|
9d6372c7b9
|
see if we can make missing-map.png show up
|
2015-10-26 20:16:49 +08:00 |
|
|
Devin Howard
|
b0327da649
|
try to fix custom metacode icon path
|
2015-10-26 18:28:25 +08:00 |
|
|
Devin Howard
|
20f4497064
|
whoops again
|
2015-10-26 12:39:40 +08:00 |
|
|
Devin Howard
|
06d06f8f55
|
whoops
|
2015-10-26 12:27:22 +08:00 |
|
|
Devin Howard
|
6c27623b80
|
change css files to use asset_data_uri
|
2015-10-26 12:22:40 +08:00 |
|
|
Devin Howard
|
6b8686c4e2
|
only run metacode.icon through asset_path if the path doesn't start with http
|
2015-10-26 12:12:07 +08:00 |
|
|
Devin Howard
|
6d4481979f
|
woot fix metacodes
|
2015-10-26 11:53:54 +08:00 |
|
|
Devin Howard
|
0dbb37eaa4
|
metacodes#index map in asset_path
|
2015-10-25 17:14:56 +08:00 |
|
|
Devin Howard
|
fcd866c05e
|
add asset_path calls
|
2015-10-25 16:50:07 +08:00 |
|
|
Devin Howard
|
da98a53a3e
|
asset_path
|
2015-10-23 23:56:29 +08:00 |
|
|
Devin Howard
|
b00784731b
|
remove binding.pry
|
2015-10-23 23:42:21 +08:00 |
|
|
Devin Howard
|
46dd54a1d7
|
asset_path in css erb files
|
2015-10-23 23:34:18 +08:00 |
|
|
Devin Howard
|
1670235172
|
change some css to erb
|
2015-10-23 23:19:25 +08:00 |
|
|
Devin Howard
|
837abbe9ee
|
asset_path doesn't work in models
|
2015-10-23 23:09:14 +08:00 |
|
|
Devin Howard
|
d539846c61
|
asset_path
|
2015-10-23 23:06:24 +08:00 |
|
|
Devin Howard
|
2e51c3c118
|
syntax
|
2015-10-23 23:01:02 +08:00 |
|
|
Devin Howard
|
b070bb9e46
|
convert javascript to asset_path syntax
|
2015-10-23 22:56:09 +08:00 |
|
|
Devin Howard
|
ad47275f72
|
rename js files to js.erb files
|
2015-10-23 22:51:16 +08:00 |
|
|
Devin Howard
|
96871cadab
|
brute force prevent nil synapse descriptions
|
2015-10-23 22:17:08 +08:00 |
|
|
Devin Howard
|
588b62b942
|
fix problem with mappings and forking maps
|
2015-10-23 22:07:44 +08:00 |
|
|
Devin Howard
|
63db41698e
|
function naming
|
2015-10-23 21:04:16 +08:00 |
|
|
Devin Howard
|
ddfb3aa98f
|
fix mapping problem
|
2015-10-23 21:03:49 +08:00 |
|
|
Devin Howard
|
85b3012cd9
|
fix a few more mappable/topic/synapse things in JS
|
2015-10-02 18:54:17 +08:00 |
|
|
Devin Howard
|
6d1e382d5c
|
change from category/topic_id/synapse_id to mappable_type/mappable_id
|
2015-10-02 16:32:16 +08:00 |
|
|
Devin Howard
|
69f4b8c645
|
migrate to polymorphic mappings - DB MIGRATION
|
2015-10-02 16:22:16 +08:00 |
|
|
Devin Howard
|
c80569a449
|
bg color on EXisting synapses heading
|
2015-10-02 15:53:06 +08:00 |
|
|
Devin Howard
|
120edfc278
|
fix typo + debug statements to make existingSynapse autocomplete work
|
2015-10-02 15:46:48 +08:00 |
|
|
Devin Howard
|
80b2b1876a
|
deal with https://github.com/twitter/typeahead.js/issues/1195
|
2015-10-02 14:39:17 +08:00 |
|
|
Devin Howard
|
a51777b0ba
|
working version of autocomplete that includes the new typeahead.js syntax. So much more complicated than before...
|
2015-10-02 13:36:51 +08:00 |
|
|
Devin Howard
|
14eeb0cbe6
|
upgrade typeahead to 1.10 and new syntax
|
2015-10-01 14:55:26 +08:00 |
|
|
Devin Howard
|
d895bca1a4
|
code tweaks to searchsynapses
|
2015-10-01 12:33:38 +08:00 |
|
|
Devin Howard
|
b3b065e623
|
Revert "upgrade typeahead to allow new syntax"
This reverts commit 347d77df82.
|
2015-10-01 11:34:19 +08:00 |
|
|
Devin Howard
|
347d77df82
|
upgrade typeahead to allow new syntax
|
2015-10-01 11:14:25 +08:00 |
|
|
Devin Howard
|
b0efe6aea8
|
Merge branch 'develop' into rails4
|
2015-10-01 11:05:27 +08:00 |
|
|
Devin Howard
|
9e43cc2e96
|
dependent destroy models for topics/maps/synapses on mappings
|
2015-10-01 11:02:39 +08:00 |
|
|
Devin Howard
|
a9b034637b
|
only autocomplete topic/synapse if the user types more than 2 characters
|
2015-09-30 13:55:23 +08:00 |
|
|
Devin Howard
|
8f8f40c0e4
|
replace the obvious spots with asset_path
|
2015-09-22 22:27:34 +08:00 |
|
|
Devin Howard
|
086acb09af
|
select metacodes with one query instead of n queries, move logic to application_helper
|
2015-09-19 20:17:56 +08:00 |
|
|
Devin Howard
|
62035ed015
|
fix other controllers needing create/update changed for rails 4
|
2015-09-19 20:05:36 +08:00 |
|
|
Devin Howard
|
e14001061c
|
fiddle with topic and mapping controllers so they work again
|
2015-09-19 20:01:44 +08:00 |
|
|
Devin Howard
|
31015295f8
|
fix best in place deprecation warnings in map info box
|
2015-09-19 17:11:48 +08:00 |
|
|
Devin Howard
|
6692c28965
|
delete_if threw errors, so convert things to arrays for it
|
2015-09-19 17:08:12 +08:00 |
|
|
Devin Howard
|
2f9b09db86
|
fix map/mapping associations that I broke
|
2015-09-19 16:48:24 +08:00 |
|
|
Devin Howard
|
c361349c20
|
add required params to all controllers
|
2015-09-19 16:26:34 +08:00 |
|
|
Devin Howard
|
a31a92b321
|
Merge branch 'develop' into rails4
|
2015-09-15 20:37:47 +08:00 |
|
|
Devin Howard
|
a8cef723a2
|
fix has_many relationships in map & mapping models for rails 4
|
2015-09-10 22:48:35 +08:00 |
|
|
Devin Howard
|
d67d098b2a
|
remove old jquery-ui file
|
2015-09-10 22:40:45 +08:00 |
|
|
Devin Howard
|
dc51d0080e
|
remove attr_accessible
|
2015-09-10 22:12:50 +08:00 |
|
|
Connor Turland
|
6767771d7d
|
dont show the embedly share links
|
2015-08-03 14:12:47 -04:00 |
|
|
Connor Turland
|
5cd4db66c6
|
needed to update embedly
|
2015-08-03 14:02:30 -04:00 |
|
|
Connor Turland
|
499f6349e6
|
add ability for admin to delete any topics and synapses
|
2015-04-28 18:43:47 -04:00 |
|
|
Connor Turland
|
fb8c006be1
|
fixed small alignment bug on tooltips in firefox
|
2015-02-01 12:29:16 -05:00 |
|
|
Connor Turland
|
aec2a97704
|
fixed the alignment of the tutorial video links
|
2015-02-01 11:56:54 -05:00 |
|
|
Connor Turland
|
9ed0d412df
|
.width() returned wrong result in firefox, causing the map to load with off dimensions
|
2015-02-01 11:50:22 -05:00 |
|
|
Connor Turland
|
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
|
2015-01-31 12:39:48 -05:00 |
|
|
Connor Turland
|
4d7695a767
|
this will clear up any remaining issues with urls ending up wrong
|
2015-01-30 21:08:37 -05:00 |
|
|
Connor Turland
|
4ca12c70ab
|
explore maps lists were rendering bajillions too many times causing everything to go slow. timeouts weren't canceling. very wow
|
2015-01-30 20:49:30 -05:00 |
|
|
Connor Turland
|
5cf75f3ea2
|
prevented map from loading before all metacode images were loaded
|
2015-01-30 00:09:45 -05:00 |
|
|
Connor Turland
|
670dd5d874
|
added user feedback, and moved the edge actually hiding into the if statement where it should be
|
2015-01-29 22:23:24 -05:00 |
|
|
Connor Turland
|
a048c87356
|
mapper who doesn't own a topic or synapse should not be able to delete it.
|
2015-01-28 22:35:03 -05:00 |
|
|
Connor Turland
|
5a31c91597
|
Merge branch 'master' of github.com:metamaps/metamaps_gen002 into prevent.scrolling
|
2015-01-28 21:39:33 -05:00 |
|
|
Connor Turland
|
5d9305fb11
|
adding preventDefault will keep the page from doing weird scrolling on mac, or when the map is embedded
|
2015-01-28 21:38:44 -05:00 |
|
|
Connor Turland
|
dbfc0e4f4d
|
Merge pull request #380 from metamaps/bug-labelsDisappearing
when a topic was deleted, renderEdgeArrows was trying to call on a topic...
|
2015-01-28 21:35:20 -05:00 |
|
|
Connor Turland
|
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
|
2015-01-28 21:04:00 -05:00 |
|
|
Connor Turland
|
bb99583622
|
updated embedly library, and data-card-chrome was now causing a breaking change
|
2015-01-28 19:19:07 -05:00 |
|
|
Connor Turland
|
0f526d1696
|
Merge pull request #376 from metamaps/bug-removeNodes
maps were crashing when topics were removed
|
2015-01-22 21:52:06 -05:00 |
|
|
Connor Turland
|
1b9dd6dc14
|
fix z-index for firefox
|
2015-01-22 21:42:45 -05:00 |
|
|
Connor Turland
|
595ff893f3
|
removed console logs
|
2015-01-22 21:42:21 -05:00 |
|
|
Connor Turland
|
263eef52ce
|
maps were crashing when topics were removed (if those topics included the 'root node'. this was caused by a setTimeout interfering with synchronicity of events
|
2015-01-11 13:30:05 -05:00 |
|
|
Connor Turland
|
48cab05d7c
|
Merge branch 'develop' of github.com:metamaps/metamaps_gen002 into develop
|
2014-12-02 13:32:48 -05:00 |
|
|
Connor Turland
|
eece1446f2
|
added tutorial
|
2014-12-02 13:32:36 -05:00 |
|
|
poietic
|
8a8123c3c2
|
copy changes to homepage
|
2014-11-30 16:55:48 -08:00 |
|
|
poietic
|
9b415e4e6d
|
fixed partners & supporters
|
2014-11-30 12:09:49 -08:00 |
|