Commit graph

1281 commits

Author SHA1 Message Date
Devin Howard ed88445c6b update configure.sh 2016-02-05 18:12:00 +08:00
Devin Howard 821966c5db update schema.rb 2016-02-05 18:11:35 +08:00
Devin Howard 9a68a2d3c1 jenkins ruby versioning smarter 2016-02-05 18:02:30 +08:00
Devin Howard a1d2ef70b9 Merge pull request #451 from metamaps/feature/contributing.md.updates
Update CONTRIBUTING.md
2016-02-05 11:35:42 +08:00
Devin Howard 85290d0e70 Update CONTRIBUTING.md 2016-02-05 11:33:33 +08:00
Devin Howard b43804bf80 Merge pull request #421 from metamaps/develop
Upgrade to Rails 4
2016-02-05 11:31:24 +08:00
Devin Howard e73ade0442 tag v2.7 2016-02-05 11:29:05 +08:00
Devin Howard 9a548e261b Merge branch 'master' into develop 2016-02-04 18:10:07 +08:00
poietic c8d6563f45 changed links from old uservoice url.
links to support forum were pointed towards our expired custom domain
from service, renamed them all so that they link up.
2016-01-29 16:00:30 -08:00
Devin Howard 5ec77b44cd add develop branch build status badge 2016-01-26 18:57:32 +08:00
Devin Howard 38f46bd8c4 add jenkins-test.sh script 2016-01-26 17:04:32 +08:00
Devin Howard c9ebfee968 default branch to develop in README.md 2016-01-25 17:19:53 +08:00
Devin Howard 79431f8515 fix user seeds 2016-01-25 11:23:10 +08:00
Devin Howard cbd82b92fe Merge branch 'develop' of https://github.com/metamaps/metamaps_gen002 into develop 2016-01-20 10:19:03 +08:00
Devin Howard 8a8ac92a8f data safety 2016-01-20 10:18:44 +08:00
Devin Howard 0e7690f2af fix metacode asset path update db migration 2016-01-20 10:18:22 +08:00
Devin Howard 31f5d464f1 S3_BUCKET_NAME in .example-env 2016-01-19 22:14:35 +08:00
Devin Howard 3aea952e40 Merge branch 'develop' of https://github.com/metamaps/metamaps_gen002 into develop 2016-01-19 14:27:33 +08:00
Devin Howard 14a292331b two tweaks to help production deploy 2016-01-19 14:27:25 +08:00
Devin Howard 1e010c69c2 doc formatting 2016-01-17 10:17:02 +08:00
Devin Howard c2a2fe4997 better readme for realtime server 2016-01-17 10:14:19 +08:00
Connor Turland fe76f340a0 change to the db name causes local dev issues
this should just remain similar to what it used to be
2016-01-09 12:10:33 +13:00
Devin Howard 678ec1bbab Update windows installer docs 2016-01-08 08:21:28 +08:00
mix irving f3400d4654 install dotenv to help managed env vars 2016-01-08 08:21:28 +08:00
Devin Howard 0e7b01296a dotenv.load in application.rb now 2016-01-08 08:19:46 +08:00
Devin Howard 1c0f6f2e2a don't put RAILS_ENV into the .env file - chicken and egg
see https://github.com/bkeepers/dotenv/issues/19 for more info
2016-01-07 18:47:58 +08:00
Devin Howard da03d59d46 comment out uninitialized variables 2016-01-07 18:36:37 +08:00
Devin Howard e21096f00a initializers for .env 2016-01-07 18:34:24 +08:00
Devin Howard c6b0ccdbdb database name configurable in .env 2016-01-07 18:29:15 +08:00
Devin Howard a06a80eb43 Merge pull request #456 from metamaps/feature/rspec-tests
rspec tests
2016-01-07 16:09:40 +08:00
Devin Howard 4be263c223 prominence to rspec command 2016-01-07 16:06:35 +08:00
Devin Howard 4842856358 merge develop into rspec-tests 2016-01-07 16:04:23 +08:00
Devin Howard 4a1e4ef333 refactor user factories to handle codes better 2016-01-07 15:47:45 +08:00
Devin Howard 4469b29ec2 in user model 2016-01-07 15:32:19 +08:00
Devin Howard 61d914caba 80 columns on RspecTesting.md 2016-01-07 15:32:11 +08:00
Devin Howard 8550b68290 Merge branch 'feature/rspec-tests' of https://github.com/metamaps/metamaps_gen002 into feature/rspec-tests 2016-01-07 15:23:25 +08:00
Devin Howard f4b2e34627 Merge pull request #455 from metamaps/feature/dotenv-for-reals
dotenv for reals
2016-01-07 12:10:47 +08:00
Devin Howard 7d7003a1bc get more hard headed about having development values in .example-env 2016-01-06 23:16:34 +08:00
Devin Howard bf21dcc3e6 merge develop into rspec tests 2016-01-06 23:03:34 +08:00
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 062522bfdc remove unnecessary step from windows docs 2016-01-06 11:25:55 +08:00
Devin Howard 75d9339010 make mapping polymorphism migration handle mapping problems 2016-01-06 10:23:01 +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