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
gnattery
fe895562f5
a few small tweaks to the views
2013-04-01 11:34:05 +11:00
Cesy
b2b7686112
Merge pull request #159 from Skud/sunshade
...
Sun or shade?
2013-03-31 12:16:33 -07: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
56be8e84e9
Add more links to "find nearby members"
2013-03-29 18:03:59 +00:00
Miles Gould
fbab9f517d
Remove unused restriction on "nearby members" access.
2013-03-29 17:56:08 +00:00
Miles Gould
6e3b14e979
Show member thumbnails on search/members/near.
2013-03-29 17:49:38 +00:00
Miles Gould
2d93e3a370
Prettify "nearby members" page
...
- show search form elements inline
- add an h3 to make it clear where the results start
2013-03-29 17:45:25 +00:00
Miles Gould
f08a5249e5
Change route of "nearby members" page.
2013-03-29 17:28:11 +00:00
Miles Gould
b21b2e58e0
Fix bug in nearby members view.
2013-03-29 17:28:00 +00:00
Miles Gould
5b6e51273d
Stub out geocoder calls in test environment.
2013-03-29 17:14:55 +00:00
Miles Gould
afa5b7a72f
Find nearby members back-end (hardcoded to 100mi).
2013-03-29 16:03:00 +00:00
Miles Gould
7120b16f46
Ban the username "nearby", to Avoid Confusion.
2013-03-29 15:40:33 +00:00
Miles Gould
400fa98d35
Basic controller and view tests for "nearby members"
2013-03-29 15:36:34 +00:00
Miles Gould
5866cc5bbc
Document current_user vs current_member usage.
2013-03-29 15:19:01 +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
1bc5682ef5
Merge pull request #155 from pozorvlak/comment_order
...
Comment order in posts/show
2013-03-28 18:28:02 -07:00
Skud
44027cf9f9
Merge pull request #157 from Skud/hotfix-analytics
...
Hotfix: don't escape HTML for analytics script
2013-03-28 16:31:53 -07:00
Skud
da4a86bd2c
Hotfix: don't escape HTML for analytics script
2013-03-29 10:25:28 +11:00
Skud
de39047781
Merge pull request #156 from Growstuff/dev
...
Email notifications, password reset, date picker, and more
2013-03-28 16:09:12 -07: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
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
Skud
97be7ac293
Merge pull request #154 from pozorvlak/url_helpers
...
Tidy up URL handlers in notification email.
2013-03-28 04:45:56 -07: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
Miles Gould
b7b0948b04
Tidy up URL handlers in notification email.
...
As per @jcaudle's comment
https://github.com/Growstuff/growstuff/pull/152#issuecomment-15563523
2013-03-28 10:18:53 +00:00
pozorvlak
be6aaf81f2
Merge pull request #152 from Skud/email_notifications
...
use fully qualified links in notification email
2013-03-28 03:10:21 -07:00
Skud
1015257cc4
use fully qualified links in notification email
2013-03-28 12:18:33 +11:00
Cesy
324a9eaf49
Merge pull request #150 from Skud/email_notifications
...
Email notifications
2013-03-27 07:02:24 -07:00
Skud
7be6ee3d69
a few small tweaks to email notification views
2013-03-27 23:53:54 +11:00
Miles Gould
7692193599
Actually add the view for the notifications.
2013-03-27 12:43:47 +00: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
Courtney Hazel
bd37981814
Merge pull request #147 from Skud/analytics
...
added analytics tracking code w/ per-env config
2013-03-26 17:58:35 -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
