Devin Howard
|
588b62b942
|
fix problem with mappings and forking maps
|
2015-10-23 22:07:44 +08:00 |
|
Devin Howard
|
eb7ba35e14
|
Merge pull request #411 from metamaps/rails4
Upgrade to rails 4?
|
2015-10-23 21:09:49 +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
|
310222aef9
|
factories for synapse, topic, user
|
2015-10-19 15:23:49 +08:00 |
|
Devin Howard
|
e3a4207827
|
random_string helper function
|
2015-10-19 15:23:07 +08:00 |
|
Devin Howard
|
d913f50cf9
|
remove views specs and non-applicable routing specs
|
2015-10-12 17:19:16 +08:00 |
|
Devin Howard
|
25117cf0e6
|
add rspec scaffold tests and a test db environment
|
2015-10-12 11:45:59 +08:00 |
|
Devin Howard
|
16c47d75d4
|
delete test directory, add spec directory
|
2015-10-12 11:26:48 +08:00 |
|
Devin Howard
|
0d2ddbd9b6
|
add rspec to Gemfile
|
2015-10-12 11:24:30 +08:00 |
|
Devin Howard
|
053f035d31
|
move fixtures to seeds.rb
|
2015-10-12 11:22:55 +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
|
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 |
|