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 |
|
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 |
|
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 |
|