Devin Howard
|
3cdab531a6
|
move more config into .example-env
|
2016-01-06 22:57:01 +08:00 |
|
|
Devin Howard
|
70f5a5db11
|
centralize config in .env file, which includes remaving database.yml.default and overriding that file's local changes in favour of env variables. In future, all instance config can go in .env
|
2016-01-06 22:36:29 +08:00 |
|
|
Devin Howard
|
21aba2fe5e
|
more modular database.yml.default
|
2015-12-24 16:36:58 +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 |
|
|
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
|
914ff46bb9
|
syntax error in development.rb
|
2015-12-21 11:40:30 +08:00 |
|
|
Devin Howard
|
61c03e2736
|
Merge pull request #448 from metamaps/feature/https-preparation
https preparation
|
2015-12-21 10:18:46 +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
|
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
|
f35d4d51a9
|
s3 over https by default
|
2015-12-20 20:19:09 +08:00 |
|
|
Devin Howard
|
e2bf1d5eb1
|
try to make metamaps more tls friendly
|
2015-12-20 18:36:57 +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 |
|
|
Connor Turland
|
3b89a2a13f
|
Merge pull request #440 from metamaps/feature/fix.fork.filter.bug
fix filter bug
|
2015-11-30 11:10:57 -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
|
45e09a27bd
|
gc tuning
|
2015-11-25 11:59:56 +08:00 |
|
|
Devin Howard
|
d3d0c97e7e
|
add .ruby-gemset file - you may need to reinstall gems if using rvm
|
2015-11-23 18:22:34 +08:00 |
|
|
Devin Howard
|
94412b21d2
|
merge documentation changes
|
2015-11-23 09:54:36 +08:00 |
|
|
Devin Howard
|
f58412b715
|
Update windows installer docs
|
2015-11-20 14:34:05 +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 |
|
|
Connor Turland
|
1bbaa47b80
|
getting uploads working
followed what it said to do here: http://stackoverflow.com/questions/28374401/nameerror-uninitialized-constant-paperclipstorages3aws
|
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
|
3eff850336
|
reorganize documentation
|
2015-11-04 11:41:04 +08:00 |
|
|
Devin Howard
|
6f8c18cd46
|
reorganize metamaps-qa-steps a bit
|
2015-11-04 11:40:52 +08: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 |
|