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
Skud
41b659011d
Merge pull request #136 from Growstuff/dev
...
Update Terms of Service/other policies for soft launch
2013-03-19 18:35:56 -07: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
Joseph Caudle
95867b857c
Merge pull request #124 from Skud/cropwranglers
...
limit crop wrangling to crop wranglers
2013-03-18 04:51:10 -07:00
Skud
d3260b03fe
deleted 1 line of obsolete comment
2013-03-18 22:16:10 +11:00
Skud
9210a20be9
Tiny CSS tweak to fix navbar problems
...
When you click "Growstuff" it should take you to the homepage. This was
broken, and only a few pixels to the left of the G were clickable. This
seems to fix it. I hope.
2013-03-18 21:29:53 +11:00
Skud
68a36310b7
make login names remember case (so I can have Skud)
...
... but don't let anyone take "skud" if I'm "Skud"
don't allow 'staff' as a login_name either
2013-03-18 20:48:06 +11:00
Skud
5378e7344d
Added validations for member names:
...
2-25 chars long
alphanumeric and underscores only
disallowed: "growstuff", "admin", "moderator"
removed everything that was there to handle/truncate long usernames
since it's no longer needed.
2013-03-18 17:36:54 +11:00
Skud
84a730ddcb
limit crop wrangling to crop wranglers
2013-03-18 17:02:22 +11:00
Courtney Hazel
81e414b2ee
Merge pull request #123 from Skud/stylin
...
Stylin
2013-03-10 20:41:27 -07:00
Skud
29016c3211
Tweaked member avatars
...
The member's name (in text) is no longer part of the avatar itself, as
it looks pretty awful and/or redundant in some places where it's used.
2013-03-11 14:32:34 +11:00
Skud
c0ccbf2a0d
georgia with lora headings
2013-03-11 14:30:26 +11:00
Skud
5bb0926a88
Rockin' it 70s style
2013-03-08 17:17:31 +11:00
Courtney Hazel
78341817f6
Merge pull request #122 from Skud/signed-in-homepage
...
Signed in homepage
2013-03-06 21:31:26 -08:00
Skud
a67d00b6b1
i have no idea why i made a planting belong to a forum
2013-03-06 20:07:08 +11:00
Skud
27480a1baf
tests for signed in homepage
2013-03-06 19:52:57 +11:00
Skud
2b616b636c
removed unwanted forums text if you don't admin any
2013-03-05 22:37:29 +11:00
Skud
0bb6a68220
Merge branch 'dev' of https://github.com/Growstuff/growstuff into signed-in-homepage
2013-03-05 22:36:55 +11:00
Skud
3c0e467da1
prettified signed-in homepage; tests still needed
2013-03-05 22:20:13 +11:00
Cesy Avon