Miles Gould
bba8b1b092
Added email notification checkbox to settings
2013-03-27 12:26:29 +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
f21df1dbb9
Method to send email notifications.
2013-03-27 11:23:52 +00:00
Miles Gould
61fb83456d
Generate skeleton notifier.
2013-03-27 10:30:21 +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
Miles Gould
5d09386cda
Fix broken test for unlock instructions
...
There were some extra assertions left over from Devise's use of mocks that no
longer make sense.
2013-03-27 10:19:52 +00:00
Courtney Hazel
22b985b268
Merge pull request #148 from Skud/date-picker
...
Date picker
2013-03-27 00:14:12 -07: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
b87bd202f6
Create new plantings with planted_at set to today.
...
There may be issues with time zones: can someone not on UTC test this?
2013-03-26 19:27:45 +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
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
Cesy Avon
f3cb251180
Merge branch 'standardise_buttons' of https://github.com/phazel/growstuff into dev
2013-03-24 01:56:24 -07:00
Cesy
47b40c11e3
Merge pull request #146 from phazel/settings_link
...
profile has link to edit settings
2013-03-24 01:41:37 -07:00
gnattery
9e805677b0
forgot to add a test
2013-03-23 19:22:45 +11:00
gnattery
bdcaee9b79
profile has link to edit settings
2013-03-23 18:57:43 +11:00
Cesy Avon
c586990329
Merge branch 'paginate' of https://github.com/phazel/growstuff into dev
...
Conflicts:
Gemfile.lock
2013-03-21 05:17:14 -07:00
Cesy
045f9bf2a0
Merge pull request #137 from Skud/confirmationwords
...
add more verbiage to confirmation email
2013-03-21 05:12:02 -07:00
Cesy
4bacd06a11
Merge pull request #135 from phazel/delete_gardens
...
Delete gardens
2013-03-21 05:11:44 -07:00
Skud
d42c7cc2c6
Merge pull request #141 from Skud/support
...
added support/faq page
2013-03-21 04:36:14 -07:00
Skud
7352d5a8ed
added support/faq page
2013-03-21 22:34:04 +11:00
Skud
b4faba7182
various tweaks based on comments on phazel's work
2013-03-21 12:37:57 +11:00
gnattery
d26b3d42ed
standardise button styles
2013-03-21 00:37:46 +11:00
Skud
10f8e363b1
two small improvements/bugfixes to post form
...
- fixed bug with "will be posted in /forums" when no forum specified
- changed wording of "what's happening..." when posting in forum
2013-03-20 22:25:15 +11:00
Skud
17309723d5
show markdown help on post and comment pages
2013-03-20 22:08:09 +11:00
Skud
e3a33a66cb
add more verbiage to confirmation email
2013-03-20 17:27:42 +11:00
gnattery
ee42ebbf1b
paginate posts
2013-03-20 15:27:54 +11:00
gnattery
793b25e3dd
Paginate and sort members.
...
We've decided to remove tests for pagination display because we trust will_paginate
2013-03-20 15:17:10 +11:00
gnattery
886c57b908
sort members by login name
2013-03-20 14:57:09 +11:00
gnattery
be1034a50d
paginate crops
2013-03-20 14:50:16 +11:00
gnattery
349aecbb69
Delete gardens
2013-03-20 12:30:38 +11:00
Skud
51c6ace28c
added new policies for soft launch
2013-03-19 22:16:27 +11:00
Skud
ea96813d7c
make the site/app name (growstuff) a config var
2013-03-19 14:41:54 +11:00
Joseph Caudle
f5c2733756
Remove merge conflict marker to fix build
2013-03-18 08:25:41 -04: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
27480a1baf
tests for signed in homepage
2013-03-06 19:52:57 +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
8b47773b59
Clean up post view specs as per Skud's comments.
...
See
e470cf7358 (commitcomment-2732846)
2013-03-04 11:57:59 +00:00
Miles Gould
e470cf7358
Send "N comments" links to the comments anchors.
...
We have to call post.save in the posts/index specs, because post_path
fails unless the post has been persisted (and hence had its slug
generated). I think. That fixed the failing tests, anyway.
2013-02-27 15:39:42 +00:00
Miles Gould
e7a1beb323
Add anchor tag for comments in posts/show.
2013-02-27 13:26:35 +00:00
Miles Gould
ade199c17b
Better links for posts.
...
- add Permalink
- show Reply instead of "Comment" (iff you can comment)
- Edit link shows if you have permission to edit
- reorganised tests for post/_single
- posts/_single now requires current_user; patch tests for comments.
2013-02-27 12:53:50 +00:00
Miles Gould
a1fcafc1a3
Give contexts in posts/single tests more descriptive names.
2013-02-27 11:59:39 +00:00
Jared McCorkindale
5f4d989cbd
add read link to post single and comment link
2013-02-27 11:45:58 +00:00
Jared McCorkindale
67d89826f4
add link to comment value
2013-02-27 11:45:58 +00:00
Jared McCorkindale
1c1fac0aa5
hiding comment count from post show
2013-02-27 11:45:58 +00:00
