Commit Graph

107 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
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
pozorvlak
6df9d8b09a Merge pull request #194 from Skud/empty_subjects
*crosses fingers*
2013-05-08 03:21:57 -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
gnattery
939a10d2f4 Post subjects cannot be nil 2013-04-30 12:20:26 +01:00
Miles Gould
2421126825 Put locations in geolocated_member factory names. 2013-04-25 23:27:52 +01:00
Skud
2418be18d3 added connections to settings page, fixed tests 2013-04-18 23:41:04 +10: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
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
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
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
Skud
7b065a0092 fixed pozorvlak's date-picker branch
- tweaked javascript to specify date format (this fixed the javascript
    problems)
- converted planted_at to a date field, rather than datetime
- made tests pass even in non-UTC timezones
2013-03-26 20:54:12 +11: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
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
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
Skud
0bb6a68220 Merge branch 'dev' of https://github.com/Growstuff/growstuff into signed-in-homepage 2013-03-05 22:36:55 +11:00
Skud
3c0e467da1 prettified signed-in homepage; tests still needed 2013-03-05 22:20:13 +11:00
Miles Gould
b0ffd85326 Stringify gardens as their names. 2013-02-25 23:07:47 +00:00
Skud
28b26179f4 Merge branch 'dev' of https://github.com/Growstuff/growstuff into prettier-plantings 2013-02-25 21:42:06 +11:00
Skud
1081131246 Prettifying the plantings page.
Added a couple of tiny methods on Crop, and delegated them across to
Planting, to easily display the default/first scientific name, and to
show the number of times a given crop's been planted.

Sadly, the tests randomly fail on my box saying "No route matches
{:controller=>"plantings", :action=>"show"}" which is just nonsense. I
have no idea why it's doing that, so I'm committing it anyway, in the
hopes that either someone can tell me what's up, or else it's just a
glitch on my dev box.
2013-02-25 20:44:47 +11:00
Miles Gould
16605b82b6 Merge branch "notifications". 2013-02-22 13:40:58 +00:00
Skud
adaee1c9ab don't send notifications to yourself 2013-02-22 17:27:40 +11:00
Skud
af9c1591ef added inbox link and count to nav 2013-02-22 17:20:25 +11:00
Joseph Caudle
9e29aec14a Merge branch 'dev' into unique_usernames
* dev: (28 commits)
  Upgrade bootstrap by running `rails g bootstrap:install`
  added .to_i to times to attempt to pass tests on travis
  stubbed Time.now to prevent test failures
  Added friendly IDs for forum and role
  General prettification and making it look nice.
  show forum name in post meta
  Added a rake task to create an admin user.
  hooked roles up to cancan
  Added roles, but haven't yet hooked them up to CanCan
  PT story 41985889, Hides 'new garden' tab on other member's pages
  Add forums to top nav
  Display posts in summary on forum page
  tests for markdown
  post in (or not in) a forum
  prettifying forum views
  added associations between forums, posts, and members
  rails g scaffold Forum
  Rearranging password fields
  Attempted rearranging settings page, broke something
  Upgrade to Rails 3.2.12, after *another* security flaw.
  ...

Conflicts:
	spec/models/member_spec.rb
2013-02-21 22:19:45 -05:00
Joseph Caudle
434d06ad83 Add test to ensure uniqueness of login_name 2013-02-21 22:08:25 -05:00
Joseph Caudle
728f8ec9ce Update factory for members and specs about members
We have added a sequence for login_name which is similar to the one for
emails in which the member name is incremented each time a new member is
saved.

In addition, we have updated all specs which asked for an explicit
login_name of member1 to use a regex looking only for member and some
digit.
2013-02-21 21:57:39 -05:00
Skud
75306dc57a added .to_i to times to attempt to pass tests on travis 2013-02-22 09:19:30 +11:00
Skud
da5a3fb76c stubbed Time.now to prevent test failures 2013-02-22 08:28:14 +11:00