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
Miles Gould
7430dfc25e
Tried to use Bootstrap datepicker. Failed!
...
We get the Javascript error "datepicker is not a function".
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
Miles Gould
abaa38aad2
Install bootstrap-datepicker-rails Gem.
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
cc987b443f
fixes the blank form when resetting password
2013-03-26 16:00:55 +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
Cesy
422a52b2c7
Merge pull request #145 from phazel/linkify_crop_image
...
Linkify crop image
2013-03-24 01:40:35 -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
gnattery
d81306e7d2
linkify crop image
2013-03-23 18:35:24 +11:00
gnattery
825d679c87
pagination appears at bottom of page
2013-03-23 18:23:53 +11:00
Courtney Hazel
72ab008f10
Merge pull request #143 from jcaudle/fix-travis-ci-status-image
...
Fix Travis CI status image
2013-03-21 17:22:45 -07:00
Joseph Caudle
6c40443459
Fix Travis CI status image
...
Since Travis CI uses case-sensitive urls for GitHub account and
organization names, this commit adjusts the reference to match the
organization name exactly.
2013-03-21 19:06:37 -04: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 Avon
765392c675
Merge branch 'dev' of http://github.com/Growstuff/growstuff into dev
2013-03-21 05:14:07 -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
Cesy Avon
e7e4b7cad8
Merge branch 'dev' of http://github.com/Growstuff/growstuff into dev
2013-03-21 04:23:33 -07:00
Courtney Hazel
fed13e0f5d
Merge pull request #5 from Skud/buttons
...
various tweaks based on comments on phazel's work
2013-03-20 19:02:47 -07:00
Skud
b4faba7182
various tweaks based on comments on phazel's work
2013-03-21 12:37:57 +11:00
Courtney Hazel
113f53f5c4
Merge pull request #139 from Skud/markdownhelp
...
Markdown help, plus tweaks to post form
2013-03-20 06:47:44 -07: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
Cesy Avon
d250de98ca
Merge branch 'dev' of http://github.com/Growstuff/growstuff into dev
2013-03-20 03:23:40 -07: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
b74b195d03
Merge pull request #134 from Skud/copyright-title
...
removed duplicate title from copyright policy
2013-03-19 17:25:08 -07:00
Skud
cdca6a3092
removed duplicate title from copyright policy
2013-03-20 11:23:45 +11:00
