mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-01 02:39:26 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 98 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
13034 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Courtney Hazel 5bb7a2899c Merge pull request #6 from pozorvlak/private_message 
Fix test failure on redirect
 2013-03-25 06:52:21 -07: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
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
Skud 2cab16c449 Merge pull request #142 from Growstuff/dev 
Several stories to push to production
 2013-03-21 15:35:02 -07: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