Commit Graph
13034 Commits
Author SHA1 Message Date
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 2e8867dda7 Add forums to top nav 2013-02-14 13:37:48 +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
Skud 3052e41278 Merge pull request #110 from phazel/password_fields
Password fields
2013-02-12 17:27:51 -08:00
gnattery d5d894d133 Rearranged password fields 2013-02-13 12:19:21 +11:00
gnattery f6ad4fec75 Rearranging password fields 2013-02-13 12:14:36 +11:00
Gnat 41fcc5bd06 Attempted rearranging settings page, broke something 2013-02-13 12:14:36 +11:00
Skud fcbabf52f1 Merge pull request #109 from Skud/geolocation
Geolocation
2013-02-12 16:25:51 -08: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
Miles Gould 59372df8ef Merge branch 'rails_3_2_12' into dev 2013-02-12 12:52:32 +00:00
Miles Gould 3d37f35457 Upgrade to Rails 3.2.12, after *another* security flaw.
https://groups.google.com/forum/?hl=en&fromgroups=#!topic/rubyonrails-security/AFBKNY7VSH8
2013-02-12 12:49:52 +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 807a840528 Added location and lat/long fields to Member 2013-02-12 11:26:13 +11:00
Skud 8c367f713d added geocoder gem 2013-02-12 11:17:02 +11:00
Skud b479106169 Merge pull request #108 from sabreuse/json-update
Update json for security fix
2013-02-11 16:04:50 -08:00
Amy fd37e437d7 Update json for security fix 2013-02-11 18:51:35 -05:00
Gnat efd90e2d76 Add validation for uniqueness of login_name 2013-02-11 02:43:47 +00:00
pozorvlak 649a1a4091 Merge pull request #106 from Skud/rack-upgrade
rack upgrade to 1.4.5
2013-02-08 15:31:54 -08:00
Skud a4938eba23 rack upgrade to 1.4.5 2013-02-09 10:26:51 +11:00
pozorvlak b126ac8358 Merge pull request #105 from Skud/comments2
Comments
2013-02-08 15:18:50 -08: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 40bcb8c380 fixed up titles 2013-02-08 17:35:08 +11:00
Skud 979ad334f3 made the index page not be ugly 2013-02-08 17:31:17 +11:00
Skud 801347976e Added edit/delete buttons to comment display 2013-02-08 17:24:06 +11:00
Skud 62af897bf1 various prettification 2013-02-08 16:55:55 +11:00
Skud f45434ff83 redirect to post after new/edit comment 2013-02-08 16:40:27 +11:00
Skud 660c626581 show comments on post page 2013-02-08 16:36:15 +11:00
Skud acc1f4006f fixed tests to reflect removed fields 2013-02-08 16:13:52 +11:00
Skud 93edede4da Merged from mistaken branch on G/g 2013-02-08 16:11:38 +11:00
Skud 3b3f9d261f can't create a new post without a post_id 2013-02-08 15:02:21 +11:00