From 8fea19dd38cf9c43bb6f6fa1a4f349555cbe90f8 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Tue, 8 Mar 2011 10:08:50 +0100
Subject: [PATCH 1/3] fixed wrong library path
---
addon/twitter/twitter.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addon/twitter/twitter.php b/addon/twitter/twitter.php
index b2e5aa7ced..678da9388a 100644
--- a/addon/twitter/twitter.php
+++ b/addon/twitter/twitter.php
@@ -138,7 +138,7 @@ function twitter_settings(&$a,&$s) {
* which the user can request a PIN to connect the account to a
* account at Twitter.
*/
- require_once('addon/twitter/twitteroauth.php');
+ require_once('library/twitteroauth.php');
$connection = new TwitterOAuth($ckey, $csecret);
$request_token = $connection->getRequestToken();
$token = $request_token['oauth_token'];
From a89bba724bb4d9a16cccb804c21b541c7cfa0152 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 13 Mar 2011 11:39:09 +0100
Subject: [PATCH 2/3] resolved some local git quirks
---
addon/twitter/twitter.php | 4 ----
1 file changed, 4 deletions(-)
diff --git a/addon/twitter/twitter.php b/addon/twitter/twitter.php
index 93aca3129b..c59d1b9e5c 100644
--- a/addon/twitter/twitter.php
+++ b/addon/twitter/twitter.php
@@ -138,11 +138,7 @@ function twitter_settings(&$a,&$s) {
* which the user can request a PIN to connect the account to a
* account at Twitter.
*/
-<<<<<<< HEAD
require_once('library/twitteroauth.php');
-=======
- require_once('library/twitteroauth.php');
->>>>>>> a912a0d3cae0ae9c873dcb5c45624a725bd2c2d6
$connection = new TwitterOAuth($ckey, $csecret);
$request_token = $connection->getRequestToken();
$token = $request_token['oauth_token'];
From 9808b0378dbc03d78120bab275b3100eb5f85ccf Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Fri, 25 Mar 2011 13:03:30 +0100
Subject: [PATCH 3/3] fixed wrong colors for links
---
view/theme/greenzero/style.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/view/theme/greenzero/style.css b/view/theme/greenzero/style.css
index 5a84011601..ec15b736e8 100644
--- a/view/theme/greenzero/style.css
+++ b/view/theme/greenzero/style.css
@@ -2,7 +2,7 @@
/* green variation by Tobias Diekershoff <tobias.diekershoff@gmx.net> */
-a, a:visited { color: #549f4f; text-decoration: none; }
+a:link, a:visited { color: #549f4f; text-decoration: none; }
a:hover {text-decoration: underline; }