Commit Graph

124 Commits

Author SHA1 Message Date
Skud
4b91e12b2b Merge pull request #201 from IAMRYO/garden_name
Garden name
2013-05-13 17:39:08 -07:00
Ryan Clark
95a2007683 fix up existing gardens with blank names. 2013-05-13 17:36:37 -07:00
Ryan Clark
5d03ffdf87 Added validation for garden names. 2013-05-13 17:28:37 -07:00
Ryan Clark
ee136666d5 Replace name validation with before_filter and add rake tast for empty names. Replace validation testing with before_filter tests. 2013-05-09 13:06:29 -07:00
pozorvlak
42b5f387d2 Merge pull request #199 from Skud/cropwrangling
Make life easier for crop wranglers
2013-05-09 07:04:10 -07:00
Ryan Clark
6ddfeb8f41 Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev 2013-05-08 20:23:20 -07:00
Ryan Clark
1348a2a492 Add validation for name in garden model with test. 2013-05-08 13:15:09 -07:00
Skud
e5526a3292 added validation for en_wikipedia_url 2013-05-02 13:27:12 +10:00
Miles Gould
aab0a438fd Replace blank/nil notification subjects with (no subject) 2013-04-30 12:39:03 +01:00
gnattery
9d4caaa2b5 Do validation for empty and spaces-only strings 2013-04-30 12:23:17 +01:00
Miles Gould
7be173eea9 Store name with authentications 2013-04-09 17:38:17 +01:00
Miles Gould
0db5826898 Remove unused methods on authentications. 2013-04-09 17:26:47 +01:00
Miles Gould
0697d5a5ea Restrict ability to create authentications. 2013-04-09 17:19:38 +01:00
Miles Gould
087a0cf176 Store token on creating a new authentication. 2013-04-09 16:46:31 +01:00
Miles Gould
82998ddfd4 Create an authentication object on successful callback. 2013-04-09 16:39:46 +01:00
Miles Gould
8647cd5315 Fix typo in models/member.rb 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
Skud
6ddc0a5e15 Minor tweaks, mostly to formatting
... because I'm picky ;)  I particularly wasn't keen on the search link
on the logged in homepage, which didn't really fit in there.  I also
made the link display on *all* profiles (not just your own), and changed
the way the headings/titles were formatted.

I also changed CanCan to not specify who can search nearby members, but
to skip it in the controller instead.  It just didn't really make sense
in ability.rb.
2013-04-03 15:28:11 +11:00
Miles Gould
fde8d163a9 Allow non-logged-in folk to search for members near a location. 2013-04-02 15:48:58 +01:00
Miles Gould
0f22fbf4aa Merge branch 'dev' into members_nearby
Conflicts:
	spec/factories/member.rb
2013-04-02 13:10:38 +01:00
pozorvlak
195055365d Merge pull request #161 from phazel/private_message
Private message
2013-04-02 04:21:19 -07:00
pozorvlak
9da60fe4b2 Merge pull request #163 from Skud/betterhomepage
Better homepage
2013-04-02 04:05:01 -07:00
Skud
c2a1e0853a Fixed bug where blank planting date didn't work 2013-04-02 15:28:27 +11:00
Skud
efb3c1cf50 Added a display of interesting members to the homepage.
Also merged in the latest dev (hence some minor changes to non-homepage,
non-member stuff).  I think I messed up the merge a bit :-/
2013-04-02 13:59:34 +11:00
Skud
93b173a272 delegate crop system name and url 2013-04-02 12:39:07 +11:00
gnattery
759903761d sort plantings 2013-04-01 15:53:41 +11:00
gnattery
2ecd996e8a Merge branch 'dev' of github.com:phazel/growstuff into private_message 2013-04-01 13:42:09 +11:00
gnattery
b2198101fa using cancan more correctly, fixed broken tests 2013-04-01 12:26:22 +11:00
Skud
e64776afc2 sort plantings by reverse creation date 2013-03-31 21:19:30 +11:00
Skud
05d1a8807a moved Member.confirmed to a scope 2013-03-31 20:28:29 +11:00
Miles Gould
fbab9f517d Remove unused restriction on "nearby members" access. 2013-03-29 17:56:08 +00:00
Miles Gould
7120b16f46 Ban the username "nearby", to Avoid Confusion. 2013-03-29 15:40:33 +00:00
Skud
2770b90e3a allow blank sunniness value as well as nil 2013-03-29 17:01:14 +11:00
Skud
2bfe033a0a generalised sunniness into a variable for later reuse 2013-03-29 16:58:16 +11:00
Skud
0e9b4caf58 added sunniness field to plantings 2013-03-29 16:33:37 +11:00
Miles Gould
be2c2626f7 Allow updating of send_notification_email.
Needed to stop the edit profile page breaking.
2013-03-28 12:22:51 +00:00
Miles Gould
9a3badea63 Skeleton "members near me". 2013-03-28 11:51:55 +00:00
Miles Gould
bb1e8ede19 Fix misordered comments on post page bug.
https://www.pivotaltracker.com/story/show/46799417
2013-03-28 10:43:47 +00:00
Miles Gould
91acf9f878 Only send email notifications to members who want them. 2013-03-27 12:17:46 +00:00
Miles Gould
64b957db20 Actually send email on creating notifications. 2013-03-27 11:58:05 +00:00
Miles Gould
3a11982ecd Allow free-form input of dates in plantings form.
See http://railscasts.com/episodes/32-time-in-text-field?view=asciicast

If an existing date has been set, it's pre-filled in ISO format.
2013-03-26 19:27:45 +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
gnattery
886c57b908 sort members by login name 2013-03-20 14:57:09 +11:00
gnattery
349aecbb69 Delete gardens 2013-03-20 12:30:38 +11:00
Joseph Caudle
ddf29d6a21 Merge branch 'restrict_usernames' into dev
* restrict_usernames:
  make login names remember case (so I can have Skud)
  Added validations for member names:

Conflicts:
	spec/factories/member.rb
2013-03-18 08:11:40 -04:00
Skud
d3260b03fe deleted 1 line of obsolete comment 2013-03-18 22:16:10 +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
Skud
5378e7344d Added validations for member names:
2-25 chars long
alphanumeric and underscores only
disallowed: "growstuff", "admin", "moderator"

removed everything that was there to handle/truncate long usernames
since it's no longer needed.
2013-03-18 17:36:54 +11:00
Skud
84a730ddcb limit crop wrangling to crop wranglers 2013-03-18 17:02:22 +11:00