Commit Graph

  • 1bee0a7752 Merge pull request #115 from jcaudle/upgrade-bootstrap Skud 2013-02-21 18:05:17 -08:00
  • a257c7037c Upgrade bootstrap by running rails g bootstrap:install Joseph Caudle 2013-02-21 20:50:42 -05:00
  • 20a15e449c Merge pull request #114 from Skud/forums Joseph Caudle 2013-02-21 17:14:42 -08:00
  • 75306dc57a added .to_i to times to attempt to pass tests on travis Skud 2013-02-22 09:19:30 +11:00
  • da5a3fb76c stubbed Time.now to prevent test failures Skud 2013-02-22 08:28:14 +11:00
  • b743fe9465 Added friendly IDs for forum and role Skud 2013-02-20 15:51:31 +11:00
  • 0aab5286f0 General prettification and making it look nice. Skud 2013-02-20 15:42:44 +11:00
  • 11fa06b56c show forum name in post meta Skud 2013-02-20 14:21:40 +11:00
  • 81f247769f Added a rake task to create an admin user. Skud 2013-02-20 14:09:29 +11:00
  • f12941576c hooked roles up to cancan Skud 2013-02-19 12:30:17 +11:00
  • 69414db0f1 Merge pull request #112 from cesullivan/garden_permissions Skud 2013-02-19 18:45:57 -08:00
  • 0bc2ff25fe Added roles, but haven't yet hooked them up to CanCan Skud 2013-02-14 15:25:15 +11:00
  • 86f7d25411 PT story 41985889, Hides 'new garden' tab on other member's pages Cathy Sullivan 2013-02-18 12:18:45 -08:00
  • cdee808933 prettified notifications inbox etc Skud 2013-02-16 01:22:19 +11:00
  • 528a5ce32c changed to/from to recipient/sender Skud 2013-02-16 00:28:31 +11:00
  • 4516a2f099 comments now generate notifications Skud 2013-02-16 00:18:49 +11:00
  • abd934ca52 removing unwanted new/edit stuff for notifications Skud 2013-02-16 00:00:35 +11:00
  • a2cfd44de4 Removed "notification type" since WAGNI (yet) Skud 2013-02-15 23:58:27 +11:00
  • e41f70db71 a bit of test cleanup Skud 2013-02-15 23:48:30 +11:00
  • eaa4e9bab9 removed unwanted methods from controller Skud 2013-02-15 23:42:45 +11:00
  • cc2c63b2eb added cancan abilities for reading notifications Skud 2013-02-15 23:17:52 +11:00
  • 2e8867dda7 Add forums to top nav Skud 2013-02-14 13:37:48 +11:00
  • b4c6a74caa Display posts in summary on forum page Skud 2013-02-14 13:35:23 +11:00
  • 430068458d tests for markdown Skud 2013-02-14 11:53:01 +11:00
  • a0955d2bfc post in (or not in) a forum Skud 2013-02-13 16:28:23 +11:00
  • ef236befcd prettifying forum views Skud 2013-02-13 15:55:16 +11:00
  • de85a6dcce added associations between forums, posts, and members gnattery 2013-02-13 15:17:40 +11:00
  • e10ea7f180 rails g scaffold Forum gnattery 2013-02-13 12:55:17 +11:00
  • 3052e41278 Merge pull request #110 from phazel/password_fields Skud 2013-02-12 17:27:51 -08:00
  • d5d894d133 Rearranged password fields gnattery 2013-02-13 12:19:21 +11:00
  • f6ad4fec75 Rearranging password fields gnattery 2013-02-13 12:11:31 +11:00
  • 41fcc5bd06 Attempted rearranging settings page, broke something Gnat 2013-02-08 01:43:23 +00:00
  • fcbabf52f1 Merge pull request #109 from Skud/geolocation Skud 2013-02-12 16:25:51 -08:00
  • 42d9034fc6 rails g scaffold notifications. Miles Gould 2013-02-12 12:41:24 +00:00
  • 6f104b0eeb Death to Spork! Death! Death! Miles Gould 2013-02-12 12:14:44 +00:00
  • 59372df8ef Merge branch 'rails_3_2_12' into dev Miles Gould 2013-02-12 12:52:32 +00:00
  • 3d37f35457 Upgrade to Rails 3.2.12, after *another* security flaw. Miles Gould 2013-02-12 12:49:52 +00:00
  • 192196ae8e added map to profile. Skud 2013-02-12 12:39:18 +11:00
  • 8ded8eb0c3 display location as text on profile Skud 2013-02-12 11:56:56 +11:00
  • 879bf0ca2c add location fields to member settings page Skud 2013-02-12 11:45:26 +11:00
  • c50a652eb7 geocode locations when saved, using google API Skud 2013-02-12 11:36:33 +11:00
  • 807a840528 Added location and lat/long fields to Member Skud 2013-02-12 11:18:37 +11:00
  • 8c367f713d added geocoder gem Skud 2013-02-12 11:17:02 +11:00
  • b479106169 Merge pull request #108 from sabreuse/json-update Skud 2013-02-11 16:04:50 -08:00
  • fd37e437d7 Update json for security fix Amy 2013-02-11 18:51:35 -05:00
  • efd90e2d76 Add validation for uniqueness of login_name Gnat 2013-02-11 02:43:47 +00:00
  • 649a1a4091 Merge pull request #106 from Skud/rack-upgrade pozorvlak 2013-02-08 15:31:54 -08:00
  • a4938eba23 rack upgrade to 1.4.5 Skud 2013-02-09 10:26:51 +11:00
  • b126ac8358 Merge pull request #105 from Skud/comments2 pozorvlak 2013-02-08 15:18:50 -08:00
  • 8caa4d12e8 limit to recent comments Skud 2013-02-08 17:56:26 +11:00
  • d37e7a148d Delete comments when post is deleted Skud 2013-02-08 17:45:37 +11:00
  • b7f3634615 redirect to post after deleting comment Skud 2013-02-08 17:37:37 +11:00
  • 40bcb8c380 fixed up titles Skud 2013-02-08 17:35:08 +11:00
  • 979ad334f3 made the index page not be ugly Skud 2013-02-08 17:31:17 +11:00
  • 801347976e Added edit/delete buttons to comment display Skud 2013-02-08 17:24:06 +11:00
  • 62af897bf1 various prettification Skud 2013-02-08 16:55:55 +11:00
  • f45434ff83 redirect to post after new/edit comment Skud 2013-02-08 16:40:27 +11:00
  • 660c626581 show comments on post page Skud 2013-02-08 16:36:15 +11:00
  • acc1f4006f fixed tests to reflect removed fields Skud 2013-02-08 16:13:52 +11:00
  • 93edede4da Merged from mistaken branch on G/g Skud 2013-02-08 16:11:38 +11:00
  • 3b3f9d261f can't create a new post without a post_id Skud 2013-02-08 15:02:21 +11:00
  • b6c759e521 edit comments Skud 2013-02-08 14:49:07 +11:00
  • ae59b1e18d pass post_id through to comment Skud 2013-02-08 14:37:57 +11:00
  • f66b4a64a3 added comment button to posts Skud 2013-02-08 14:22:49 +11:00
  • a0a88bee11 comment form shouldn't have author/post fields Skud 2013-02-08 14:14:07 +11:00
  • d800747365 Attempted rearranging settings page, broke something Gnat 2013-02-08 01:43:23 +00:00
  • 01ab177cc9 Merge pull request #104 from Skud/public_email Joseph Caudle 2013-02-05 22:25:06 -08:00
  • 09727d99b2 show email on profile if wanted Skud 2013-02-06 16:54:15 +11:00
  • d5327ebbf3 show_email checkbox on settings page Skud 2013-02-06 16:31:11 +11:00
  • cf05e4108d Merge pull request #103 from Skud/edit_settings Joseph Caudle 2013-02-05 21:28:31 -08:00
  • 363502a807 add show_email field to members Skud 2013-02-06 16:25:17 +11:00
  • 4f64946de2 Wrote some very basic tests for the improved settings page Skud 2013-02-06 16:10:43 +11:00
  • a50bee4828 oops, broke tests with the change to 'Sign in' Skud 2013-02-06 16:00:47 +11:00
  • 1dbed949f6 s/Log in/Sign in/ -- be consistent with devise Skud 2013-02-06 15:56:51 +11:00
  • 9b458070e0 Settings form now works (and is prettified) Skud 2013-02-06 15:54:43 +11:00
  • dfac54d936 Added hidden TOS field to edit settings page so it works Skud 2013-02-06 15:31:14 +11:00
  • 6da3e4fae5 Added associations and tested them gnattery 2013-02-06 15:20:44 +11:00
  • 3cff543184 rails g scaffold Comment gnattery 2013-02-06 14:49:49 +11:00
  • e5d380729e we more or less have a settings page. doesn't WORK though. Skud 2013-02-06 12:46:45 +11:00
  • fb37e1abaa fixed a weird variable expansion Skud 2013-02-06 11:41:08 +11:00
  • 893d92ac72 Added 'Settings' to top nav Skud 2013-02-06 11:39:03 +11:00
  • 7beaf4afa4 Merge pull request #102 from Skud/nomemberjson pozorvlak 2013-02-05 03:44:55 -08:00
  • e41293c121 fixed placement of curly braces. tests now pass. Skud 2013-02-05 22:30:28 +11:00
  • 1ccaab3085 Don't allow members to be accessible with JSON Skud 2013-02-02 23:37:24 +11:00
  • 2f2ec81345 Merge pull request #101 from Skud/spike-cancan pozorvlak 2013-02-01 04:33:58 -08:00
  • 58e5d04d50 controller tests for plantings now pass Skud 2013-02-01 22:55:48 +11:00
  • 302a32c768 that can? check was superflous; controller does it for us. Skud 2013-02-01 22:03:05 +11:00
  • 75e8ea1119 I'd rather not use Member.new Skud 2013-02-01 13:37:33 +11:00
  • 21960a5494 Tried to get controller tests passing. Skud 2013-02-01 13:25:06 +11:00
  • 87f14247e0 modified views to use CanCan Skud 2013-02-01 13:24:32 +11:00
  • 2d6f1ae210 redirect to previous page if available Skud 2013-02-01 11:29:14 +11:00
  • 3697c28a00 Added more informative error message. Skud 2013-02-01 11:23:54 +11:00
  • cd469264bd this seems to mostly work Skud 2013-02-01 11:21:13 +11:00
  • ed2e73832d sorta kinda works, but login/homepage are b0rked Skud 2013-02-01 11:10:12 +11:00
  • f25729ce3b First cut of a set of permissions Skud 2013-02-01 10:41:38 +11:00
  • ea8f30bd8d tweaked cancan defaults (we don't have current_user) Skud 2013-02-01 10:25:54 +11:00
  • 71760a4369 added cancan gem Skud 2013-02-01 10:24:37 +11:00
  • d442e3fcce Merge pull request #98 from Skud/mobile-homepage pozorvlak 2013-01-29 05:39:13 -08:00
  • 4a18710fe8 Merge pull request #99 from sauramaia/prettify-login pozorvlak 2013-01-29 05:35:27 -08:00
  • ce9e4b2e8d Merge pull request #100 from sabreuse/plantings-rss pozorvlak 2013-01-29 05:14:08 -08:00