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
Skud
2373bbf5c9
Broke recent plantings/posts out into partial
...
... which is now displayed on both the signed in and signed out
homepages.
2013-04-02 12:15:08 +11:00
gnattery
759903761d
sort plantings
2013-04-01 15:53:41 +11:00
gnattery
615c478fa6
Merge branch 'private_message' of github.com:phazel/growstuff into private_message
...
Conflicts:
spec/controllers/notifications_controller_spec.rb
2013-04-01 13:43:51 +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
gnattery
ceef39e846
Cleaned up controller for notifications.
...
Removed json from notification, since it's a bit risky and we don't really need it.
2013-04-01 11:44:14 +11:00
Skud
e64776afc2
sort plantings by reverse creation date
2013-03-31 21:19:30 +11:00
Skud
a5f6931e12
rewrote blurb
2013-03-31 21:00:57 +11:00
Skud
05d1a8807a
moved Member.confirmed to a scope
2013-03-31 20:28:29 +11:00
Miles Gould
afa5b7a72f
Find nearby members back-end (hardcoded to 100mi).
2013-03-29 16:03:00 +00:00
Miles Gould
400fa98d35
Basic controller and view tests for "nearby members"
2013-03-29 15:36:34 +00:00
Skud
8140671525
display sunniness on planting page
2013-03-29 17:13:28 +11:00
Skud
9b179553ce
added sunniness to the planting form
2013-03-29 17:02:01 +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
Skud
b5fee57606
Merge pull request #158 from Skud/hotfix-analytics
...
Hotfix analytics
2013-03-28 18:28:20 -07:00
Skud
da4a86bd2c
Hotfix: don't escape HTML for analytics script
2013-03-29 10:25:28 +11:00
Miles Gould
c9cc7be0d1
Refactor model code out of view in posts/show.
2013-03-28 10:57:30 +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
Skud
1015257cc4
use fully qualified links in notification email
2013-03-28 12:18:33 +11:00
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
Miles Gould
98eabe097b
Fix test failure on redirect
...
The "create" method was never being called. Removing the sender_id
parameter fixed that. Routing problem, maybe?
2013-03-25 13:32:26 +00: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 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
