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
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
Skud
fce8bc0e40
Merge pull request #133 from Skud/softlaunch-tos
...
added new policies for soft launch
2013-03-19 04:18:07 -07:00
Skud
51c6ace28c
added new policies for soft launch
2013-03-19 22:16:27 +11:00
Skud
8b9d4b4076
Merge pull request #132 from Growstuff/dev
...
further setup for production environment
* unicorn for concurrency
* new relic
* site name is now a per-environment variable
* plus a security update to rails 3.2.13
2013-03-18 21:40:42 -07:00
Skud
75ca3438c6
Merge pull request #131 from Skud/newrelic
...
setting up NewRelic for performance monitoring
2013-03-18 21:34:07 -07:00
Skud
e04a38ac9f
Merge branch 'dev' of https://github.com/Growstuff/growstuff into newrelic
...
Conflicts:
Gemfile.lock
2013-03-19 15:33:34 +11:00
Skud
a221c42ab0
setting up NewRelic for performance monitoring
2013-03-19 15:22:59 +11:00
Skud
2ae3e7a960
Merge pull request #130 from Skud/rails3.2.13
...
upgrade rails to 3.2.13 - security patch
2013-03-18 21:11:29 -07:00
Skud
e04f5660cc
upgrade rails to 3.2.13 - security patch
2013-03-19 15:09:56 +11:00
Skud
a99561921f
Merge pull request #129 from Skud/appname
...
make the site/app name (growstuff) a config var
2013-03-18 20:43:42 -07:00
Skud
ea96813d7c
make the site/app name (growstuff) a config var
2013-03-19 14:41:54 +11:00
Skud
0d1d4ea070
Merge pull request #128 from Skud/heroku-production
...
Heroku production
2013-03-18 20:21:08 -07:00
Skud
b66632717f
Use unicorn for concurrency on heroku
2013-03-19 14:10:06 +11:00
Skud
ec5f642f58
added mandrill to production environment
2013-03-19 12:48:14 +11:00
Skud
97f7722b0d
Merge pull request #127 from Growstuff/dev
...
First attempt at a production push
2013-03-18 18:20:16 -07:00
Joseph Caudle
f5c2733756
Remove merge conflict marker to fix build
2013-03-18 08:25:41 -04:00
Joseph Caudle
09851210e6
Merge pull request #126 from Skud/fixnav
...
Tiny CSS tweak to fix navbar problems
2013-03-18 05:15:19 -07: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
