Commit Graph

11959 Commits

Author SHA1 Message Date
Miles Gould
a41c60b7de Be even more paranoid about params[:units]
And save a to_s call while we're at it.
2013-04-30 10:54:52 +01:00
Miles Gould
40b9104094 Make units dropdown wide enough to contain "miles".
It's now "miles" wide. Hehehe.
2013-04-30 10:43:40 +01:00
Miles Gould
8bc4d8f4ce Use km by default. 2013-04-30 10:39:57 +01:00
Skud
9ba92e580d Merge pull request #187 from pozorvlak/show_comments
Show existing comments when creating or editing a comment on a post
2013-04-30 02:19:38 -07:00
Cesy
56181144b3 Merge pull request #178 from Skud/faq-tweak
removed Courtney from about section
2013-04-30 00:27:50 -07:00
Cesy
9a484c8aa3 Merge pull request #188 from Skud/credentials-example
added credentials.example
2013-04-30 00:27:08 -07:00
Cesy
fc8edb3efa Merge pull request #177 from Skud/contact
added contact link to footer
2013-04-30 00:25:57 -07:00
Cesy
d59b944338 Merge pull request #175 from Skud/contributing
added CONTRIBUTING.md
2013-04-30 00:24:13 -07:00
Skud
c56666e68f added credentials.example 2013-04-30 10:11:22 +10:00
Miles Gould
c53dd6797f Show other comments on post when editing a comment. 2013-04-29 21:44:30 +01:00
Miles Gould
2b84fa8bad Show previous comments when creating a comment.
- Move "show previous comments" into a partial
 - invoke said partial from the new comment form
 - add tests.
2013-04-29 21:30:26 +01:00
Skud
11f979313a Added reply link to notification email.
Note: this breaks DRY but we couldn't figure out how to put it in a
helper and make it useable by both the controller and the mailer.
Suggestions/help much appreciated!
2013-04-29 18:55:13 +10:00
Skud
844f2c845e removed unused random crop code 2013-04-29 18:26:22 +10:00
Skud
36290c82ed Added a reply link to the notifications/show page
- sets subject "Re: whatever" for PMs
- also removed "sender=N" from PM link (wtf! -- it wasn't doing anything
    but it looked bad.)
2013-04-29 18:09:55 +10:00
Skud
c6f34d387a Merge pull request #185 from attlebish/fix-email-formatting
Fix email formatting
2013-04-28 23:30:25 -07:00
Lilly
c0c7b5f93c Added full stop to end of link to gravatar.com 2013-04-29 16:16:20 +10:00
Skud
015ffb9dfd Merge pull request #174 from blimey85/dev
Removed duplicate stylesheet_link_tag
2013-04-28 22:54:51 -07:00
Skud
5bd98d2621 Merge pull request #184 from Skud/travis-deploy
commented out auto-deployment stuff for now
2013-04-28 19:24:10 -07:00
Skud
f336b88111 commented out auto-deployment stuff for now 2013-04-29 12:18:58 +10:00
Skud
ec98540575 Merge pull request #183 from Skud/travis-deploy
another try at getting keys working
2013-04-28 18:56:07 -07:00
Skud
a6ab80fd8b another try at getting keys working 2013-04-29 11:55:15 +10:00
Skud
91a21e82ad Merge pull request #182 from Skud/travis-deploy
trying to get keys working
2013-04-28 18:31:14 -07:00
Skud
eac1448fcd trying to get keys working 2013-04-29 11:30:01 +10:00
Skud
fe3cbf339e Merge pull request #181 from Skud/travis-deploy
fixed linebreaks in "secure" line
2013-04-28 18:12:39 -07:00
Skud
da5e79365d fixed linebreaks in "secure" line
(what's generated by travis-encrypt --add seems to be wrong.)
2013-04-29 11:10:58 +10:00
Skud
4457300b0b Merge pull request #180 from Skud/travis-deploy
actually let's have a specific deploy user for this
2013-04-28 18:02:46 -07:00
Skud
9ba86cd674 actually let's have a specific deploy user for this 2013-04-29 11:01:22 +10:00
Skud
8e40b0fccd Merge pull request #179 from Skud/travis-deploy
Added continuous deployment script
2013-04-28 17:40:57 -07:00
Skud
c98ff6a879 Added continuous deployment script
Also:
- removed notifications (they weren't really working for us)
- added rvm line as per suggestion by travis-lint
2013-04-29 10:39:29 +10:00
Skud
b471ce7576 removed Courtney from about section 2013-04-29 09:43:50 +10:00
Skud
58482bfbc9 added contact link to footer 2013-04-29 09:39:30 +10:00
Cesy
cead5e0f0f Merge pull request #176 from Skud/secrettoken
security fix: check ENV for rails secret token
2013-04-27 01:34:00 -07:00
Skud
5b2dbc571e security fix: check ENV for rails secret token 2013-04-27 10:23:32 +10:00
Miles Gould
70fa93ab42 Replace tabs with spaces. 2013-04-26 14:27:35 +01:00
Skud
ddde2d30e3 minor wording changes 2013-04-26 13:23:44 +10:00
Skud
59a44be34b added CONTRIBUTING.md 2013-04-26 13:18:53 +10:00
Miles Gould
38246bd00b Add a dropdown to select units on members/nearby. 2013-04-25 23:48:25 +01:00
Miles Gould
2421126825 Put locations in geolocated_member factory names. 2013-04-25 23:27:52 +01:00
Miles Gould
643c8f0917 Rename local vars in tests for greater clarity. 2013-04-25 23:17:29 +01:00
Miles Gould
a8fd75492a Units: be less trusting of user input. 2013-04-25 23:05:08 +01:00
Miles Gould
a16d07cfef Fix tests for units in Members#nearby 2013-04-25 22:53:07 +01:00
Gary
00573d5d8a Removed duplicate stylesheet_link_tag 2013-04-24 20:11:21 -04:00
Cesy Avon
cebd49271a Finding nearby members by distance
Distance is now configurable
Units framework is there but it's not working yet
2013-04-23 10:13:21 -07:00
Cesy Avon
6caf8e4160 Writing tests first 2013-04-23 09:05:12 -07:00
Cesy
50e0a88992 Merge pull request #172 from Skud/omniauth_twitter
Connect to twitter
2013-04-19 09:34:20 -07:00
Skud
f05a8f9ce6 added twitter link to profile page 2013-04-19 00:00:56 +10:00
Skud
2418be18d3 added connections to settings page, fixed tests 2013-04-18 23:41:04 +10:00
Skud
0afbb704c3 Merge pull request #171 from Growstuff/dev
Production push: search nearby members, link to gravatar on settings page, other small tweaks
2013-04-17 03:54:55 -07:00
Samuel Cochran
41135f3869 Fix some email formatting issues 2013-04-15 11:32:26 +10:00
Miles Gould
612b966678 Disallow duplicate authentications.
You can authenticate multiple times against a server, but you must
supply different uids each time.
2013-04-09 17:56:48 +01:00