Commit Graph

2432 Commits

Author SHA1 Message Date
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
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
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
b0ffd85326 Stringify gardens as their names. 2013-02-25 23:07:47 +00:00
Skud
28b26179f4 Merge branch 'dev' of https://github.com/Growstuff/growstuff into prettier-plantings 2013-02-25 21:42:06 +11:00
Skud
1081131246 Prettifying the plantings page.
Added a couple of tiny methods on Crop, and delegated them across to
Planting, to easily display the default/first scientific name, and to
show the number of times a given crop's been planted.

Sadly, the tests randomly fail on my box saying "No route matches
{:controller=>"plantings", :action=>"show"}" which is just nonsense. I
have no idea why it's doing that, so I'm committing it anyway, in the
hopes that either someone can tell me what's up, or else it's just a
glitch on my dev box.
2013-02-25 20:44:47 +11:00
Miles Gould
16605b82b6 Merge branch "notifications". 2013-02-22 13:40:58 +00:00
Skud
adaee1c9ab don't send notifications to yourself 2013-02-22 17:27:40 +11:00
Skud
af9c1591ef added inbox link and count to nav 2013-02-22 17:20:25 +11:00
Skud
d3d0ff42b2 Show unread notifications as bold
The view here isn't as DRY as we'd like, but all the options were kind
of ugly, and this one was easiest.
2013-02-22 16:37:23 +11:00
Joseph Caudle
9e29aec14a Merge branch 'dev' into unique_usernames
* dev: (28 commits)
  Upgrade bootstrap by running `rails g bootstrap:install`
  added .to_i to times to attempt to pass tests on travis
  stubbed Time.now to prevent test failures
  Added friendly IDs for forum and role
  General prettification and making it look nice.
  show forum name in post meta
  Added a rake task to create an admin user.
  hooked roles up to cancan
  Added roles, but haven't yet hooked them up to CanCan
  PT story 41985889, Hides 'new garden' tab on other member's pages
  Add forums to top nav
  Display posts in summary on forum page
  tests for markdown
  post in (or not in) a forum
  prettifying forum views
  added associations between forums, posts, and members
  rails g scaffold Forum
  Rearranging password fields
  Attempted rearranging settings page, broke something
  Upgrade to Rails 3.2.12, after *another* security flaw.
  ...

Conflicts:
	spec/models/member_spec.rb
2013-02-21 22:19:45 -05:00
Joseph Caudle
434d06ad83 Add test to ensure uniqueness of login_name 2013-02-21 22:08:25 -05:00
Joseph Caudle
728f8ec9ce Update factory for members and specs about members
We have added a sequence for login_name which is similar to the one for
emails in which the member name is incremented each time a new member is
saved.

In addition, we have updated all specs which asked for an explicit
login_name of member1 to use a regex looking only for member and some
digit.
2013-02-21 21:57:39 -05:00
Joseph Caudle
20a15e449c Merge pull request #114 from Skud/forums
Forums
2013-02-21 17:14:42 -08:00
Skud
75306dc57a added .to_i to times to attempt to pass tests on travis 2013-02-22 09:19:30 +11:00
Skud
da5a3fb76c stubbed Time.now to prevent test failures 2013-02-22 08:28:14 +11:00
Skud
b743fe9465 Added friendly IDs for forum and role 2013-02-20 15:51:31 +11:00
Skud
0aab5286f0 General prettification and making it look nice.
Also upgraded Bootstrap, just for the hell of it.
2013-02-20 15:42:44 +11:00
Skud
11fa06b56c show forum name in post meta 2013-02-20 14:54:38 +11:00
Skud
f12941576c hooked roles up to cancan
Now only admins can create/edit forums, or mess with roles.

To add an admin user:

rails c
m = Member.find('skud')
r = Role.create(:name => 'admin')
r.members << m

We'll have to do this on the server to bootstrap the admin stuff.
Though actually, we should really write a rake task to generalise this.
2013-02-20 14:53:11 +11:00
Skud
0bc2ff25fe Added roles, but haven't yet hooked them up to CanCan 2013-02-19 12:29:22 +11:00
Cathy Sullivan
86f7d25411 PT story 41985889, Hides 'new garden' tab on other member's pages 2013-02-18 12:18:45 -08:00
Skud
cdee808933 prettified notifications inbox etc 2013-02-16 01:22:19 +11:00
Skud
528a5ce32c changed to/from to recipient/sender 2013-02-16 00:28:31 +11:00
Skud
4516a2f099 comments now generate notifications 2013-02-16 00:18:49 +11:00
Skud
abd934ca52 removing unwanted new/edit stuff for notifications 2013-02-16 00:00:35 +11:00
Skud
a2cfd44de4 Removed "notification type" since WAGNI (yet)
We figured that doing without it was more like the simplest thing that
could possibly work.

Note that we edited the migration in place after rolling back.  This
would cause problems if anyone had downloaded the code from pozorvlak's
repo the other day and run it, but we're assuming they didn't (since
they wouldn't have got anything interesting out of it anyway.)
2013-02-15 23:58:27 +11:00
Skud
e41f70db71 a bit of test cleanup 2013-02-15 23:48:30 +11:00
Skud
eaa4e9bab9 removed unwanted methods from controller 2013-02-15 23:42:45 +11:00
Skud
cc2c63b2eb added cancan abilities for reading notifications 2013-02-15 23:17:52 +11:00
Skud
b4c6a74caa Display posts in summary on forum page
Also had to tweak timezone config so that "X minutes ago" display
worked.  This *may* break tests or who knows what, for devs who are
elsewhere. Let's keep an eye out for that!
2013-02-14 13:35:23 +11:00
Skud
430068458d tests for markdown 2013-02-14 11:53:01 +11:00
Skud
a0955d2bfc post in (or not in) a forum 2013-02-14 11:46:25 +11:00
Skud
ef236befcd prettifying forum views 2013-02-13 15:55:16 +11:00
gnattery
de85a6dcce added associations between forums, posts, and members 2013-02-13 15:17:40 +11:00
gnattery
e10ea7f180 rails g scaffold Forum 2013-02-13 12:55:17 +11:00
Miles Gould
42d9034fc6 rails g scaffold notifications. 2013-02-12 13:17:14 +00:00
Miles Gould
6f104b0eeb Death to Spork! Death! Death! 2013-02-12 13:17:14 +00:00
Skud
192196ae8e added map to profile.
also making sure lat/long are zeroed if location is blanked
2013-02-12 22:38:48 +11:00
Skud
8ded8eb0c3 display location as text on profile 2013-02-12 11:56:56 +11:00
Skud
879bf0ca2c add location fields to member settings page 2013-02-12 11:45:26 +11:00
Skud
c50a652eb7 geocode locations when saved, using google API 2013-02-12 11:36:33 +11:00
Skud
8caa4d12e8 limit to recent comments 2013-02-08 18:14:37 +11:00
Skud
d37e7a148d Delete comments when post is deleted 2013-02-08 17:45:37 +11:00
Skud
b7f3634615 redirect to post after deleting comment 2013-02-08 17:37:37 +11:00
Skud
979ad334f3 made the index page not be ugly 2013-02-08 17:31:17 +11:00