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
|
bb29e0e724
|
fiddle with Gemfile
|
2015-10-01 11:02:03 +08:00 |
|
Devin Howard
|
a8dc64a6fe
|
Merge pull request #415 from metamaps/less-autocomplete
only autocomplete topic/synapse if the user types more than 2 characters
|
2015-10-01 00:08:43 +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
|
c0d29e54bd
|
Merge branch 'rails4' of ssh://github.com/metamaps/metamaps_gen002 into rails4
|
2015-09-28 14:43:16 +08:00 |
|
Devin Howard
|
b9140e9b8d
|
add qa steps file first draft
|
2015-09-28 14:43:09 +08:00 |
|
Devin Howard
|
8f8f40c0e4
|
replace the obvious spots with asset_path
|
2015-09-22 22:27:34 +08:00 |
|
Devin Howard
|
741c584651
|
Merge branch 'develop' into rails4
|
2015-09-20 13:55:21 +08:00 |
|
Devin Howard
|
7841f6c96b
|
Merge pull request #412 from devvmh/dotenv_install
install dotenv to help managed env vars - author attribution to mix mix :)
|
2015-09-20 13:48:16 +08:00 |
|
Connor Turland
|
f5dbfd5d72
|
configuration for production environments like heroku
|
2015-09-19 14:10:43 -04:00 |
|
Connor Turland
|
869fb816e9
|
this enables the vagrant port forwarding
|
2015-09-19 13:16:07 -04:00 |
|
Devin Howard
|
1fbd16ac95
|
fix problem with join route
|
2015-09-19 20:46:10 +08:00 |
|
Devin Howard
|
b2e15c6483
|
cancan => cancancan
|
2015-09-19 20:25:07 +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
|
1aa4d862a1
|
whoo new gems for development. binding.pry is so cool
|
2015-09-19 17:01:27 +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
|
8cf8277573
|
add jquery_ui to gemfile
|
2015-09-10 22:13:10 +08:00 |
|
Devin Howard
|
dc51d0080e
|
remove attr_accessible
|
2015-09-10 22:12:50 +08:00 |
|
Devin Howard
|
f81fdbf8cc
|
secret_token => secret_key_base
|
2015-09-10 22:12:39 +08:00 |
|
Devin Howard
|
7a73f3bc07
|
remove match method from routes.rb
|
2015-09-10 22:06:58 +08:00 |
|
Devin Howard
|
c250f5d395
|
asset precompiling simpler in rails 4
|
2015-09-10 22:03:39 +08:00 |
|
Devin Howard
|
3c0bdff823
|
some config changes for rails 4 found on the Internet
|
2015-09-10 17:43:58 +08:00 |
|
Devin Howard
|
5848af7765
|
update Gemfile for rails 4
|
2015-09-10 17:43:48 +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 |
|
Devin Howard
|
3f5d2bd7f3
|
add gem install bundler to configure.sh
|
2015-05-09 23:22:23 -04:00 |
|
Connor Turland
|
499f6349e6
|
add ability for admin to delete any topics and synapses
|
2015-04-28 18:43:47 -04:00 |
|
mix irving
|
7a1b68960d
|
install dotenv to help managed env vars
|
2015-03-09 08:50:24 +13:00 |
|
Connor Turland
|
9ce81df9f9
|
Merge pull request #406 from s01us/extract_mail_env
extract email settings into ENV ✂️
|
2015-03-07 15:01:53 -05:00 |
|
mix irving
|
c17cc39880
|
extract email settings into ENV ✂️ fixes #405
|
2015-03-04 11:30:23 +13:00 |
|
Connor Turland
|
8816031b20
|
Merge pull request #404 from s01us/add_ruby_version
add .ruby-version for rbenv support
|
2015-03-03 09:33:59 -05:00 |
|
mix irving
|
4d311cb371
|
add .reuby-version for rbenv support
|
2015-03-03 23:15:44 +13:00 |
|
Connor Turland
|
253ceb4b48
|
added imagemagick to vagrantfile
|
2015-02-19 19:03:22 -05: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 |
|