Commit Graph

97 Commits

Author SHA1 Message Date
Skud
d006854a6c added omniauth-flickr gem 2013-04-30 22:55:40 +10:00
Skud
c2dbebb046 Merge pull request #189 from pozorvlak/nearby
Find users within a given distance; allow specification of units.
2013-04-30 03:04:29 -07:00
Miles Gould
8bc4d8f4ce Use km by default. 2013-04-30 10:39:57 +01:00
Skud
58482bfbc9 added contact link to footer 2013-04-29 09:39:30 +10:00
Skud
5b2dbc571e security fix: check ENV for rails secret token 2013-04-27 10:23:32 +10:00
Miles Gould
643c8f0917 Rename local vars in tests for greater clarity. 2013-04-25 23:17:29 +01:00
Skud
2418be18d3 added connections to settings page, fixed tests 2013-04-18 23:41:04 +10:00
Miles Gould
83ac83a076 Add omniauth to our middleware. 2013-04-09 16:39:46 +01:00
Miles Gould
a3ad8c7bf9 Stub "authentications#create" method. 2013-04-09 16:39:45 +01:00
Miles Gould
5ea91bf56a Added an Authentications table.
Connects users to remote web services, as recommended at
http://asciicasts.com/episodes/235-omniauth-part-1

In addition, we store "token" and "secret" fields.
2013-04-09 16:39:09 +01:00
Miles Gould
2e3febb1d6 Change route to "search/members/nearby" for consistency. 2013-04-02 14:17:00 +01:00
Miles Gould
0f22fbf4aa Merge branch 'dev' into members_nearby
Conflicts:
	spec/factories/member.rb
2013-04-02 13:10:38 +01:00
Miles Gould
ae4b0cca2b Remove extra route to notifications/new. 2013-04-02 12:29:29 +01:00
pozorvlak
195055365d Merge pull request #161 from phazel/private_message
Private message
2013-04-02 04:21:19 -07:00
Skud
0ec01ab259 improved date/time formatting
we set defaults for date and time formatting (and override them in a few
places)
2013-04-02 12:30:05 +11:00
gnattery
2ecd996e8a Merge branch 'dev' of github.com:phazel/growstuff into private_message 2013-04-01 13:42:09 +11:00
Miles Gould
f08a5249e5 Change route of "nearby members" page. 2013-03-29 17:28:11 +00:00
Miles Gould
5b6e51273d Stub out geocoder calls in test environment. 2013-03-29 17:14:55 +00:00
Miles Gould
fed8ce2c17 Allow setting location in members/:id/nearby
It currently doesn't actually do anything, but the thought's there.
2013-03-28 12:40:18 +00:00
Miles Gould
9a3badea63 Skeleton "members near me". 2013-03-28 11:51:55 +00:00
Miles Gould
f21df1dbb9 Method to send email notifications. 2013-03-27 11:23:52 +00:00
pozorvlak
37e406d112 Merge pull request #149 from pozorvlak/password-reset
Password reset - make emails friendlier and fix blank page
2013-03-27 03:23:10 -07:00
Skud
dcd7df7f47 Made the password reset email friendlier.
Also did the same for the unlock instructions, while I was in there.
2013-03-26 19:26:29 +11:00
Skud
7f7db12f9f added analytics tracking code w/ per-env config 2013-03-26 13:23:35 +11:00
gnattery
ac7b48406b Members can send each other private messages.
Problems:
Notifications controller test fails on redirecting, but seems to work fine in practice
Send Message button doesn't look nice on page
2013-03-25 17:52:50 +11:00
Cesy
045f9bf2a0 Merge pull request #137 from Skud/confirmationwords
add more verbiage to confirmation email
2013-03-21 05:12:02 -07:00
Skud
7352d5a8ed added support/faq page 2013-03-21 22:34:04 +11:00
Skud
e3a33a66cb add more verbiage to confirmation email 2013-03-20 17:27:42 +11:00
Skud
a221c42ab0 setting up NewRelic for performance monitoring 2013-03-19 15:22:59 +11:00
Skud
ea96813d7c make the site/app name (growstuff) a config var 2013-03-19 14:41:54 +11:00
Skud
b66632717f Use unicorn for concurrency on heroku 2013-03-19 14:10:06 +11:00
Skud
ec5f642f58 added mandrill to production environment 2013-03-19 12:48:14 +11:00
Skud
68a36310b7 make login names remember case (so I can have Skud)
... but don't let anyone take "skud" if I'm "Skud"

don't allow 'staff' as a login_name either
2013-03-18 20:48:06 +11:00
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