Commit Graph

  • dcbe944683 Removed unneeded generated files. Miles Gould 2013-04-08 16:27:50 +01:00
  • a3ad8c7bf9 Stub "authentications#create" method. Miles Gould 2013-04-08 16:27:03 +01:00
  • 5ea91bf56a Added an Authentications table. Miles Gould 2013-04-04 18:48:54 +01:00
  • 2187972b47 Gitignore the local credentials.sh script. Miles Gould 2013-04-04 18:38:12 +01:00
  • e6e8398038 Install omniauth-twitter Miles Gould 2013-04-04 18:34:29 +01:00
  • 25130fcb7f Install Omniauth Miles Gould 2013-04-04 18:17:01 +01:00
  • f574bbb11f Merge pull request #169 from attlebish/fixsenderlink Skud 2013-04-03 21:02:14 -07:00
  • 9ed7a66c1c Fixed link to sender profile in notifications Lilly 2013-04-04 14:52:59 +11:00
  • 8a82fa1655 Merge pull request #168 from attlebish/gravatarlink Skud 2013-04-03 20:15:03 -07:00
  • 5ae524baad Put avatar on settings page with link to gravatar.com Lilly 2013-04-04 13:59:05 +11:00
  • ef91cc30b7 Merge pull request #167 from attlebish/signupswap Skud 2013-04-03 18:34:49 -07:00
  • 6a07b12da1 Swapped "sign up" and "sign in" links on navbar Lilly 2013-04-04 12:28:53 +11:00
  • 9beec9000c Merge pull request #166 from Skud/members_nearby Skud 2013-04-02 21:34:04 -07:00
  • 4d44b7750b Merge pull request #160 from pozorvlak/members_nearby Skud 2013-04-02 21:33:50 -07:00
  • 6ddc0a5e15 Minor tweaks, mostly to formatting Skud 2013-04-03 15:28:11 +11:00
  • f3a56a8d2c Merge pull request #165 from Growstuff/dev Skud 2013-04-02 15:35:33 -07:00
  • 7cdfec3d4c Harmonise "find members near you" language. Miles Gould 2013-04-02 15:55:58 +01:00
  • fde8d163a9 Allow non-logged-in folk to search for members near a location. Miles Gould 2013-04-02 15:48:58 +01:00
  • 2e3febb1d6 Change route to "search/members/nearby" for consistency. Miles Gould 2013-04-02 14:17:00 +01:00
  • 8afb826a65 Use members thumbnail on members/near page. Miles Gould 2013-04-02 13:54:37 +01:00
  • 0f22fbf4aa Merge branch 'dev' into members_nearby Miles Gould 2013-04-02 13:10:38 +01:00
  • 6e83a632a9 Wrap various things in <p> tags; test "can update location". Miles Gould 2013-04-02 13:09:13 +01:00
  • ae4b0cca2b Remove extra route to notifications/new. Miles Gould 2013-04-02 12:29:29 +01:00
  • 195055365d Merge pull request #161 from phazel/private_message pozorvlak 2013-04-02 04:21:19 -07:00
  • 9da60fe4b2 Merge pull request #163 from Skud/betterhomepage pozorvlak 2013-04-02 04:05:01 -07:00
  • 5431cdcd71 Merge pull request #164 from Skud/blankplantingtime Joseph Caudle 2013-04-01 23:51:05 -07:00
  • c2a1e0853a Fixed bug where blank planting date didn't work Skud 2013-04-02 15:28:27 +11:00
  • efb3c1cf50 Added a display of interesting members to the homepage. Skud 2013-04-02 13:24:57 +11:00
  • 93b173a272 delegate crop system name and url Skud 2013-04-02 12:39:07 +11:00
  • 0ec01ab259 improved date/time formatting Skud 2013-04-02 12:30:05 +11:00
  • 2373bbf5c9 Broke recent plantings/posts out into partial Skud 2013-04-02 12:15:08 +11:00
  • 910f478e12 Merge pull request #162 from phazel/sorted_plantings Skud 2013-03-31 22:07:31 -07:00
  • 759903761d sort plantings gnattery 2013-04-01 15:53:41 +11:00
  • 615c478fa6 Merge branch 'private_message' of github.com:phazel/growstuff into private_message gnattery 2013-04-01 13:43:51 +11:00
  • 2ecd996e8a Merge branch 'dev' of github.com:phazel/growstuff into private_message gnattery 2013-04-01 13:42:09 +11:00
  • b2198101fa using cancan more correctly, fixed broken tests gnattery 2013-04-01 12:26:22 +11:00
  • ceef39e846 Cleaned up controller for notifications. gnattery 2013-04-01 11:44:14 +11:00
  • fe895562f5 a few small tweaks to the views gnattery 2013-04-01 11:34:05 +11:00
  • b2b7686112 Merge pull request #159 from Skud/sunshade Cesy 2013-03-31 12:16:33 -07:00
  • e64776afc2 sort plantings by reverse creation date Skud 2013-03-31 21:19:30 +11:00
  • a5f6931e12 rewrote blurb Skud 2013-03-31 21:00:57 +11:00
  • 05d1a8807a moved Member.confirmed to a scope Skud 2013-03-31 20:28:29 +11:00
  • 56be8e84e9 Add more links to "find nearby members" Miles Gould 2013-03-29 18:03:59 +00:00
  • fbab9f517d Remove unused restriction on "nearby members" access. Miles Gould 2013-03-29 17:56:08 +00:00
  • 6e3b14e979 Show member thumbnails on search/members/near. Miles Gould 2013-03-29 17:49:38 +00:00
  • 2d93e3a370 Prettify "nearby members" page Miles Gould 2013-03-29 17:45:25 +00:00
  • f08a5249e5 Change route of "nearby members" page. Miles Gould 2013-03-29 17:28:11 +00:00
  • b21b2e58e0 Fix bug in nearby members view. Miles Gould 2013-03-29 17:28:00 +00:00
  • 5b6e51273d Stub out geocoder calls in test environment. Miles Gould 2013-03-29 17:14:55 +00:00
  • afa5b7a72f Find nearby members back-end (hardcoded to 100mi). Miles Gould 2013-03-29 16:03:00 +00:00
  • 7120b16f46 Ban the username "nearby", to Avoid Confusion. Miles Gould 2013-03-29 15:40:33 +00:00
  • 400fa98d35 Basic controller and view tests for "nearby members" Miles Gould 2013-03-29 15:36:34 +00:00
  • 5866cc5bbc Document current_user vs current_member usage. Miles Gould 2013-03-29 15:19:01 +00:00
  • 8140671525 display sunniness on planting page Skud 2013-03-29 17:13:28 +11:00
  • 9b179553ce added sunniness to the planting form Skud 2013-03-29 17:02:01 +11:00
  • 2770b90e3a allow blank sunniness value as well as nil Skud 2013-03-29 17:01:14 +11:00
  • 2bfe033a0a generalised sunniness into a variable for later reuse Skud 2013-03-29 16:58:16 +11:00
  • 0e9b4caf58 added sunniness field to plantings Skud 2013-03-29 16:33:37 +11:00
  • b5fee57606 Merge pull request #158 from Skud/hotfix-analytics Skud 2013-03-28 18:28:20 -07:00
  • 1bc5682ef5 Merge pull request #155 from pozorvlak/comment_order Skud 2013-03-28 18:28:02 -07:00
  • 44027cf9f9 Merge pull request #157 from Skud/hotfix-analytics Skud 2013-03-28 16:31:53 -07:00
  • da4a86bd2c Hotfix: don't escape HTML for analytics script Skud 2013-03-29 10:25:28 +11:00
  • de39047781 Merge pull request #156 from Growstuff/dev Skud 2013-03-28 16:09:12 -07:00
  • fed8ce2c17 Allow setting location in members/:id/nearby Miles Gould 2013-03-28 12:40:18 +00:00
  • be2c2626f7 Allow updating of send_notification_email. Miles Gould 2013-03-28 12:22:51 +00:00
  • 9a3badea63 Skeleton "members near me". Miles Gould 2013-03-28 11:51:55 +00:00
  • 97be7ac293 Merge pull request #154 from pozorvlak/url_helpers Skud 2013-03-28 04:45:56 -07:00
  • c9cc7be0d1 Refactor model code out of view in posts/show. Miles Gould 2013-03-28 10:57:30 +00:00
  • bb1e8ede19 Fix misordered comments on post page bug. Miles Gould 2013-03-28 10:43:47 +00:00
  • b7b0948b04 Tidy up URL handlers in notification email. Miles Gould 2013-03-28 10:18:53 +00:00
  • be6aaf81f2 Merge pull request #152 from Skud/email_notifications pozorvlak 2013-03-28 03:10:21 -07:00
  • 1015257cc4 use fully qualified links in notification email Skud 2013-03-28 12:18:33 +11:00
  • 324a9eaf49 Merge pull request #150 from Skud/email_notifications Cesy 2013-03-27 07:02:24 -07:00
  • 7be6ee3d69 a few small tweaks to email notification views Skud 2013-03-27 23:53:54 +11:00
  • 7692193599 Actually add the view for the notifications. Miles Gould 2013-03-27 12:43:47 +00:00
  • bba8b1b092 Added email notification checkbox to settings Miles Gould 2013-03-27 12:26:29 +00:00
  • 91acf9f878 Only send email notifications to members who want them. Miles Gould 2013-03-27 12:17:46 +00:00
  • 64b957db20 Actually send email on creating notifications. Miles Gould 2013-03-27 11:58:05 +00:00
  • f21df1dbb9 Method to send email notifications. Miles Gould 2013-03-27 11:23:52 +00:00
  • 61fb83456d Generate skeleton notifier. Miles Gould 2013-03-27 10:30:21 +00:00
  • 37e406d112 Merge pull request #149 from pozorvlak/password-reset pozorvlak 2013-03-27 03:23:10 -07:00
  • 5d09386cda Fix broken test for unlock instructions Miles Gould 2013-03-27 10:19:52 +00:00
  • 22b985b268 Merge pull request #148 from Skud/date-picker Courtney Hazel 2013-03-27 00:14:12 -07:00
  • bd37981814 Merge pull request #147 from Skud/analytics Courtney Hazel 2013-03-26 17:58:35 -07:00
  • 7b065a0092 fixed pozorvlak's date-picker branch Skud 2013-03-26 20:54:12 +11:00
  • b87bd202f6 Create new plantings with planted_at set to today. Miles Gould 2013-03-01 12:34:50 +00:00
  • 7430dfc25e Tried to use Bootstrap datepicker. Failed! Miles Gould 2013-03-01 12:22:21 +00:00
  • 3a11982ecd Allow free-form input of dates in plantings form. Miles Gould 2013-03-01 11:11:31 +00:00
  • abaa38aad2 Install bootstrap-datepicker-rails Gem. Miles Gould 2013-03-01 10:43:27 +00:00
  • dcd7df7f47 Made the password reset email friendlier. Skud 2013-03-26 16:17:04 +11:00
  • cc987b443f fixes the blank form when resetting password Skud 2013-03-26 16:00:55 +11:00
  • 7f7db12f9f added analytics tracking code w/ per-env config Skud 2013-03-26 13:23:35 +11:00
  • 5bb7a2899c Merge pull request #6 from pozorvlak/private_message Courtney Hazel 2013-03-25 06:52:21 -07:00
  • 98eabe097b Fix test failure on redirect Miles Gould 2013-03-25 13:32:26 +00:00
  • ac7b48406b Members can send each other private messages. gnattery 2013-03-25 17:52:50 +11:00
  • f3cb251180 Merge branch 'standardise_buttons' of https://github.com/phazel/growstuff into dev Cesy Avon 2013-03-24 01:56:24 -07:00
  • 47b40c11e3 Merge pull request #146 from phazel/settings_link Cesy 2013-03-24 01:41:37 -07:00
  • 422a52b2c7 Merge pull request #145 from phazel/linkify_crop_image Cesy 2013-03-24 01:40:35 -07:00
  • 9e805677b0 forgot to add a test gnattery 2013-03-23 19:22:45 +11:00
  • bdcaee9b79 profile has link to edit settings gnattery 2013-03-23 18:57:43 +11:00