Miles Gould
16605b82b6
Merge branch "notifications".
2013-02-22 13:40:58 +00:00
Joseph Caudle
a257c7037c
Upgrade bootstrap by running rails g bootstrap:install
2013-02-21 20:55:58 -05:00
Skud
0bc2ff25fe
Added roles, but haven't yet hooked them up to CanCan
2013-02-19 12:29:22 +11:00
Skud
cc2c63b2eb
added cancan abilities for reading notifications
2013-02-15 23:17:52 +11:00
Skud
b4c6a74caa
Display posts in summary on forum page
...
Also had to tweak timezone config so that "X minutes ago" display
worked. This *may* break tests or who knows what, for devs who are
elsewhere. Let's keep an eye out for that!
2013-02-14 13:35:23 +11:00
gnattery
e10ea7f180
rails g scaffold Forum
2013-02-13 12:55:17 +11:00
Miles Gould
42d9034fc6
rails g scaffold notifications.
2013-02-12 13:17:14 +00:00
Skud
93edede4da
Merged from mistaken branch on G/g
2013-02-08 16:11:38 +11:00
Skud
9b458070e0
Settings form now works (and is prettified)
...
Had to add some Devise crud based on advice on their wiki, otherwise
you couldn't change your settings without changing your password.
Also had to make a hidden field for tos_agreement. I don't really love
it but nobody seems to be able to recommend a better way.
2013-02-06 15:54:43 +11:00
gnattery
3cff543184
rails g scaffold Comment
2013-02-06 14:49:49 +11:00
Skud
3697c28a00
Added more informative error message.
2013-02-01 11:23:54 +11:00
Skud
1503cbddad
Plantings show on members, gardens, and crops pages
...
Created a thumbnail to standardise the display. It's not pretty but it
has the basic info.
2013-01-18 13:40:30 +11:00
Joseph Caudle
fd54fe8ffe
Configure application to have UTC as default timezone
...
This commit sets the default timezone for the app as UTC for both Time
methods and for ActiveRecord. It also removes an unecessary pair of
parentheses attached to a call to `Time.now` which did not match the
style throughout the rest of the project.
[#41633207 ]
2013-01-14 22:17:36 -05:00
Skud
689448f87c
renamed Member.username to login_name
2013-01-13 19:14:46 +11:00
Skud
354c712948
Rearranged routes so that devise worked with "members"
2013-01-13 18:38:38 +11:00
Skud
657ccf7cd8
s/users/members/g -- models and tests for them
2013-01-13 17:24:46 +11:00
Skud
21f0f39bf9
Model and controller spec files pass.
...
Views are another matter (and will explode badly at this point)
2013-01-13 16:12:45 +11:00
Skud
71750889d3
added mandrill smtp settings for staging environment
2013-01-09 23:36:17 +11:00
Skud
0af986021e
Generated scaffold for plantings
2012-12-19 13:30:40 +11:00
Skud
87ef580b78
Oops, missed a bit with the merge.
2012-12-05 21:08:24 +11:00
Skud
59083882d6
Merging in changes from dev to mygarden branch
2012-12-05 21:05:40 +11:00
Skud
760cf03b2c
Fixed tests by getting rid of valid_session
2012-11-26 19:04:43 +11:00
Norman Ancajas
f89815b6b3
added gardens table
2012-11-05 11:45:56 +08:00
tehjaymo
32fa860dbd
Created profile controller, route and view.
...
It's under the /profile route rather than /user to avoid clashes with
autogenerated Devise pages.
2012-10-29 22:24:26 +00:00
Skud
be029541ee
and the database config
2012-10-06 21:52:40 +01:00
Skud
cac912c95f
More tweaks to get staging working
2012-10-06 21:48:59 +01:00
Skud
a1f4fbde02
missed a comma
2012-10-06 21:37:14 +01:00
Skud
58d3f91b9d
Deploy to staging environment
...
as per http://cjohansen.no/en/rails/multi_staging_environment_for_rails_using_capistrano_and_mod_rails
2012-10-06 21:33:08 +01:00
Skud
87146ac1b0
We don't need to restart twice.
2012-10-06 15:23:18 +01:00
Skud
6c4aa94a97
Rearranged the order of deploy tasks.
...
We want to make sure that assets:precompile runs, and that there's a
restart afterwards.
2012-10-06 15:11:39 +01:00
Skud
5fbcf95743
Merge pull request #30 from Skud/fixemailinprod2
...
Fixemailinprod2
2012-10-06 05:50:47 -07:00
Skud
8916b91791
This sends mail correctly on the server, using sendmail.
2012-10-06 13:46:09 +01:00
Skud
4497bb8850
Need to actually call this task
2012-10-06 13:02:07 +01:00
Skud
c5cfef04d9
Keep postgres password out of database.yml, populate it via cap deploy instead.
2012-10-06 12:45:51 +01:00
Miles Gould
7024591269
Include password for production from secret file.
...
We read in the file using ERB. See
http://stackoverflow.com/questions/18290/how-do-you-secure-database-yml
2012-10-03 20:59:22 +01:00
Miles Gould
79a98d6225
Only use Postgres in production.
2012-10-03 20:04:56 +01:00
Skud
7452d7ae39
Switched to postgres instead of sqlite3
2012-10-02 21:44:01 +01:00
Miles Gould
1d9c1b14fc
Generate scaffold for Crops; refactor tests
...
Add link to Crops page from index
Refactored index/application tests to better reflect where things are.
2012-10-02 11:32:56 +01:00
Miles Gould
6454ad09ee
Prevent generators from overriding our CSS.
2012-10-02 11:32:56 +01:00
Skud
f6bc259c68
precompile assets after deploying
2012-09-24 21:17:11 +01:00
Miles Gould
a2fede15e9
Don't connect to the DB when precompiling assets.
...
See
https://devcenter.heroku.com/articles/rails3x-asset-pipeline-cedar#troubleshooting
2012-09-24 21:05:20 +01:00
Skud
43570e5e8e
fixed merge problems in Gemfile
2012-09-16 23:20:19 +01:00
Skud
927dc45147
i think i've got foundation working. maybe.
2012-09-15 11:12:04 +01:00
Skud
bc010f8e41
migrate db after deploying
2012-09-15 10:47:21 +01:00
Skud
8c8c796bc5
deploy now seems to be working
2012-09-15 10:43:17 +01:00
Skud
e2751a488c
using cape to run rake tasks on dev server
2012-09-15 10:22:51 +01:00
Skud
4fa0eda475
go back to deploying this branch (not dev) for testing
2012-09-15 09:54:16 +01:00
Skud
0d5a879c4e
compile assets (css etc) in production (i.e. dev) as per http://stackoverflow.com/questions/7275636/rails-3-1-0-actionviewtemplateerrror-application-css-isnt-precompiled
2012-09-15 09:50:58 +01:00
Skud
4045b676f8
tweaked capistrano config to point to the actual dev branch
2012-09-12 09:52:03 +01:00
Skud
e6c52527a7
removing line i previously commented out at passenger's suggestion
2012-09-12 09:48:39 +01:00
Miles Gould