mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-01 20:57:21 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 62 Branches 82 Tags
Layout/HashAlignment
Commit Graph

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Skud
0aef781d3d Merge pull request #120 from flov/dev 
fixed-to-top and padding for nicer design
 2013-03-05 02:16:06 -08:00
Skud
551e9a2b2c Merge pull request #119 from pozorvlak/commentcount 
Counts of comments and links in posts/_single
 2013-03-05 02:04:39 -08:00
Miles Gould
8b47773b59 Clean up post view specs as per Skud's comments. 
See
e470cf7358 (commitcomment-2732846)
 2013-03-04 11:57:59 +00:00
Florian Vallen
0b178f765d fixed-to-top and padding for nicer design 2013-02-28 20:36:47 +11:00
Miles Gould
e470cf7358 Send "N comments" links to the comments anchors. 
We have to call post.save in the posts/index specs, because post_path
fails unless the post has been persisted (and hence had its slug
generated). I think. That fixed the failing tests, anyway.
 2013-02-27 15:39:42 +00:00
Miles Gould
e7a1beb323 Add anchor tag for comments in posts/show. 2013-02-27 13:26:35 +00:00
Miles Gould
ade199c17b Better links for posts. 
- add Permalink
 - show Reply instead of "Comment" (iff you can comment)
 - Edit link shows if you have permission to edit
 - reorganised tests for post/_single
 - posts/_single now requires current_user; patch tests for comments.
 2013-02-27 12:53:50 +00:00
Miles Gould
a1fcafc1a3 Give contexts in posts/single tests more descriptive names. 2013-02-27 11:59:39 +00:00
Miles Gould
3c13be2c0a Left-align comment links in posts. 2013-02-27 11:56:13 +00:00
Miles Gould
5a18fcc0b4 Use a ul.inline for "N comments | Comment" links. 2013-02-27 11:45:58 +00:00
Jared McCorkindale
5f4d989cbd add read link to post single and comment link 2013-02-27 11:45:58 +00:00
Jared McCorkindale
67d89826f4 add link to comment value 2013-02-27 11:45:58 +00:00
Jared McCorkindale
1c1fac0aa5 hiding comment count from post show 2013-02-27 11:45:58 +00:00
Jared McCorkindale
cf678a45c4 add count of comments to posts partial 2013-02-27 11:44:02 +00:00
pozorvlak
1bc963d169 Merge pull request #117 from pozorvlak/prettier-plantings 
Prettier plantings
 2013-02-26 06:31:07 -08:00
pozorvlak
9ebbfa1300 Merge pull request #118 from sabreuse/menu-collapse 
Fix the remaining mobile menu issues
 2013-02-25 16:29:14 -08:00
Miles Gould
18f9141445 Test display of location on plantings/show. 
As discussed at
d87a1ee4fd.

The version of app/views/plantings/show.html.haml from commit 97ce623
fails the "()" test, as expected.
 2013-02-26 00:25:16 +00:00
Miles Gould
627c373c41 Simplified some code using Garden.to_s. 2013-02-26 00:05:32 +00:00
Miles Gould
b0ffd85326 Stringify gardens as their names. 2013-02-25 23:07:47 +00:00
Skud
204b5cdf8c initial tweaks to homepage 2013-02-26 09:23:49 +11:00
Amy
8597c8ac10 add .collapse class to the header menu to fix the remaining mobile menu issues. See https://www.pivotaltracker.com/story/show/44352329 2013-02-25 10:50:18 -05:00
Miles Gould
d87a1ee4fd Don't show () on plantings/show if no location given. 
Can someone explain the semantics of nil and defined? to me?
 2013-02-25 14:58:17 +00:00
Miles Gould
97ce62389c Fix one-argument calls to link_to. 
Fixes broken tests.
 2013-02-25 14:34:37 +00:00
Skud
cc64139a4d added 'where' to planting info (incl. location if known) 2013-02-25 21:47:57 +11:00
Skud
28b26179f4 Merge branch 'dev' of https://github.com/Growstuff/growstuff into prettier-plantings 2013-02-25 21:42:06 +11:00