Skud
9ba86cd674
actually let's have a specific deploy user for this
2013-04-29 11:01:22 +10: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
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
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
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
Miles Gould
f2b2f12f67
Delete specs for unused views and controller methods.
2013-04-09 17:56:34 +01:00
Miles Gould
707bae2475
Make the authentication into a link to your Twitter page.
...
When we support other authentication providers, we'll need to make this
into a callback or something.
2013-04-09 17:38:30 +01:00
Miles Gould
7be173eea9
Store name with authentications
2013-04-09 17:38:17 +01:00
Miles Gould
36c509cc90
Add "link to another account" link to authentications/index
2013-04-09 17:32:03 +01:00
Miles Gould
0db5826898
Remove unused methods on authentications.
2013-04-09 17:26:47 +01:00
Miles Gould
ff80b63743
Add a "name" column to authentications.
2013-04-09 17:23:59 +01:00
Miles Gould
a3ac6343c7
Only show current member's authentications on index.
2013-04-09 17:20:40 +01:00
Miles Gould
0697d5a5ea
Restrict ability to create authentications.
2013-04-09 17:19:38 +01:00
Miles Gould
89d8390a6f
Added authbuttons-rails gem
...
Provides pretty icons for Twitter, FB, GitHub, etc. No Flickr :-(
2013-04-09 16:50:09 +01:00
Miles Gould
087a0cf176
Store token on creating a new authentication.
2013-04-09 16:46:31 +01:00
Miles Gould
82998ddfd4
Create an authentication object on successful callback.
2013-04-09 16:39:46 +01:00
Miles Gould
b3154b8592
Fix stub authentications#create method
...
As per comment at
http://railscasts.com/episodes/235-omniauth-part-1?view=comments#comment_153390
2013-04-09 16:39:46 +01:00
Miles Gould
8647cd5315
Fix typo in models/member.rb
2013-04-09 16:39:46 +01:00
Miles Gould
83ac83a076
Add omniauth to our middleware.
2013-04-09 16:39:46 +01:00
Miles Gould
dcbe944683
Removed unneeded generated files.
2013-04-09 16:39:45 +01:00
Miles Gould
a3ad8c7bf9
Stub "authentications#create" method.
2013-04-09 16:39:45 +01:00
Miles Gould
5ea91bf56a
Added an Authentications table.
...
Connects users to remote web services, as recommended at
http://asciicasts.com/episodes/235-omniauth-part-1
In addition, we store "token" and "secret" fields.
2013-04-09 16:39:09 +01:00
Miles Gould
2187972b47
Gitignore the local credentials.sh script.
...
This contains API keys and secrets and so should not be kept in Git.
Example script (edit as required):
export MANDRILL_USERNAME=xxxxxxxxxxxxxxxxxxxxx
export MANDRILL_APIKEY=xxxxxxxxxxxxxxxxxxxxx
export TWITTER_KEY=xxxxxxxxxxxxxxxxxxxxx
export TWITTER_SECRET=xxxxxxxxxxxxxxxxxxxxx
2013-04-04 18:38:56 +01:00
Miles Gould
e6e8398038
Install omniauth-twitter
...
You lied to us, RailsCasts! You lied!
Specifically, http://asciicasts.com/episodes/235-omniauth-part-1 lied to
us about which gem we needed to install. See also
https://github.com/intridea/omniauth/issues/641 for the issues this
caused.
2013-04-04 18:35:34 +01:00
Miles Gould
25130fcb7f
Install Omniauth
2013-04-04 18:17:01 +01:00
Skud
f574bbb11f
Merge pull request #169 from attlebish/fixsenderlink
...
Fixed link to sender profile in notifications
2013-04-03 21:02:14 -07:00
Lilly
9ed7a66c1c
Fixed link to sender profile in notifications
2013-04-04 14:52:59 +11:00
Skud
8a82fa1655
Merge pull request #168 from attlebish/gravatarlink
...
Put avatar on settings page with link to gravatar.com
2013-04-03 20:15:03 -07:00
Lilly
5ae524baad
Put avatar on settings page with link to gravatar.com
2013-04-04 13:59:05 +11:00
Skud
ef91cc30b7
Merge pull request #167 from attlebish/signupswap
...
Swapped "sign up" and "sign in" links on navbar
2013-04-03 18:34:49 -07:00
Lilly
6a07b12da1
Swapped "sign up" and "sign in" links on navbar
2013-04-04 12:28:53 +11:00
Skud
9beec9000c
Merge pull request #166 from Skud/members_nearby
...
Nearby members - minor formatting tweaks
2013-04-02 21:34:04 -07:00
Skud
4d44b7750b
Merge pull request #160 from pozorvlak/members_nearby
...
"Find nearby members" page
2013-04-02 21:33:50 -07:00
Skud
6ddc0a5e15
Minor tweaks, mostly to formatting
...
... because I'm picky ;) I particularly wasn't keen on the search link
on the logged in homepage, which didn't really fit in there. I also
made the link display on *all* profiles (not just your own), and changed
the way the headings/titles were formatted.
I also changed CanCan to not specify who can search nearby members, but
to skip it in the controller instead. It just didn't really make sense
in ability.rb.
2013-04-03 15:28:11 +11:00
Miles Gould
7cdfec3d4c
Harmonise "find members near you" language.
2013-04-02 15:55:58 +01:00
Miles Gould
fde8d163a9
Allow non-logged-in folk to search for members near a location.
2013-04-02 15:48:58 +01:00
Miles Gould
2e3febb1d6
Change route to "search/members/nearby" for consistency.
2013-04-02 14:17:00 +01:00
Miles Gould
8afb826a65
Use members thumbnail on members/near page.
2013-04-02 13:54:37 +01:00
Miles Gould
0f22fbf4aa
Merge branch 'dev' into members_nearby
...
Conflicts:
spec/factories/member.rb
2013-04-02 13:10:38 +01:00
Miles Gould
6e83a632a9
Wrap various things in <p> tags; test "can update location".
2013-04-02 13:09:13 +01:00
Miles Gould
ae4b0cca2b
Remove extra route to notifications/new.
2013-04-02 12:29:29 +01:00
pozorvlak
195055365d
Merge pull request #161 from phazel/private_message
...
Private message
2013-04-02 04:21:19 -07:00
pozorvlak
9da60fe4b2
Merge pull request #163 from Skud/betterhomepage
...
Better homepage
2013-04-02 04:05:01 -07:00
Joseph Caudle
5431cdcd71
Merge pull request #164 from Skud/blankplantingtime
...
Fixed bug where blank planting date didn't work
2013-04-01 23:51:05 -07:00
Skud
c2a1e0853a
Fixed bug where blank planting date didn't work
2013-04-02 15:28:27 +11:00
Skud
efb3c1cf50
Added a display of interesting members to the homepage.
...
Also merged in the latest dev (hence some minor changes to non-homepage,
non-member stuff). I think I messed up the merge a bit :-/
2013-04-02 13:59:34 +11:00
Skud
93b173a272
delegate crop system name and url
2013-04-02 12:39:07 +11:00
