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 |
|
poietic
|
44e98e00a7
|
fixed metacode file name
|
2014-11-30 11:57:06 -08:00 |
|
poietic
|
6a08d7e86f
|
supported by
|
2014-11-30 11:53:44 -08:00 |
|
Connor Turland
|
bcf7edb880
|
changed other references to connoropolous/metamaps_gen002 to metamaps/metamaps_gen002
|
2014-11-30 14:27:20 -05:00 |
|
Connor Turland
|
f62efa0d68
|
fixed terms of service link for live site
|
2014-11-30 14:06:59 -05:00 |
|
Connor Turland
|
7548c1953f
|
Merge branch 'develop' of github.com:metamaps/metamaps_gen002 into develop
|
2014-11-30 13:52:32 -05:00 |
|
Connor Turland
|
ce7bec98ed
|
fixed wrong notify message bug. fixed firefox z-index issue. moved fork on github link and pointed to new metamaps repo
|
2014-11-30 13:47:41 -05:00 |
|
poietic
|
2b7d70dfe8
|
changed metacodes
|
2014-11-29 21:12:07 -08:00 |
|
Bashar Jabbour
|
2aacd545ec
|
solved text bolding issue on mac
|
2014-11-29 17:27:33 -05:00 |
|
Bashar Jabbour
|
b883d03b4e
|
make synapse card mapper icon link to mapper profile
|
2014-11-29 16:36:57 -05:00 |
|
Bashar Jabbour
|
12dd2f32b4
|
fixed conflict
|
2014-11-29 16:28:42 -05:00 |
|
Bashar Jabbour
|
0e3486ddc5
|
make topic card mapper icon link to mapper profile
|
2014-11-29 16:27:43 -05:00 |
|
Connor Turland
|
411efa9692
|
Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop
|
2014-11-29 16:06:04 -05:00 |
|
Connor Turland
|
694d36b6a6
|
ctrl+click doesn't zoom awkwardly
|
2014-11-29 16:05:56 -05:00 |
|
Bashar Jabbour
|
10dedaa169
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002
|
2014-11-29 15:57:42 -05:00 |
|
Bashar Jabbour
|
ce3ab9903a
|
make map contributor list dropdown into links to profiles
|
2014-11-29 15:56:38 -05:00 |
|
Devin Howard
|
8b146fccab
|
Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002
|
2014-11-29 15:53:53 -05:00 |
|
Devin Howard
|
739eba71bb
|
only one router setTimeout function at a time - make it erase old functions if new one
|
2014-11-29 15:51:31 -05:00 |
|
Connor Turland
|
93227f0e2f
|
fixed synapse selection and removal of multiple topics bugs
|
2014-11-29 15:36:03 -05:00 |
|