Merge branch 'master' of github.com:SSilence/selfoss

fossar · Jun 30, 2014 · 798e8a7 · 798e8a7
2 parents 1fe2557 + bd2de14
commit 798e8a7
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 2 deletions.
diff --git a/helpers/Authentication.php b/helpers/Authentication.php
@@ -105,9 +105,11 @@ public function login($username, $password) {
                 $this->loggedin = true;
                 $_SESSION['loggedin'] = true;
                 return true;
+            } else {
+                return false;
             }
         }
-        return false;
+        return true;	
     }
 
 

diff --git a/helpers/ContentLoader.php b/helpers/ContentLoader.php
@@ -198,7 +198,7 @@ protected function sanitizeContent($content) {
                 "keep_bad"       => 0,
                 "comment"        => 1,
                 "cdata"          => 1,
-                "elements"       => 'div,p,ul,li,a,img,dl,dt,dd,h1,h2,h3,h4,h5,h6,ol,br,table,tr,td,blockquote,pre,ins,del,th,thead,tbody,b,i,strong,em,tt'
+                "elements"       => 'div,p,ul,li,a,img,dl,dt,dd,h1,h2,h3,h4,h5,h6,ol,br,table,tr,td,blockquote,pre,ins,del,th,thead,tbody,b,i,strong,em,tt,sub,sup'
             )
         );
     }

diff --git a/public/css/style.css b/public/css/style.css
@@ -396,6 +396,7 @@ input {
 
     .entry.selected.unread,
     .entry.unread {
+        margin-left: 3px;
         border-left:3px solid #5f9490;
     }
 
@@ -454,6 +455,7 @@ input {
         margin-top:20px;
         line-height: 1.7em;
         overflow: hidden;
+        padding: 0 1em;
     }
 
         .entry-content a {

diff --git a/public/lang/et.ini b/public/lang/et.ini
@@ -0,0 +1,39 @@
+lang_markread=Märgi loetuks
+lang_newest=Uued
+lang_unread=Mitteloetud
+lang_starred=Tärniga
+lang_tags=Sildid
+lang_alltags=Kõik sildid
+lang_timestamp=lisatud {0,date} kell {0,time}
+lang_hours=lisatud {0,plural,one {1 tund},other {# tundi}} tagasi
+lang_minutes=lisatud {0,plural,one {1 minut},other {# minutit}} tagasi
+lang_seconds=lisatud {0,plural,one {1 sekund},other {# sekundit}} tagasi
+lang_star=tärniga
+lang_unstar=tärnita
+lang_mark=märgi loetuks
+lang_unmark=märgi mitteloetuks
+lang_load_img=pildid
+lang_open_window=ava
+lang_searchbutton=otsi
+lang_sources=Tellimused
+lang_source_add=Lisa tellimus
+lang_source_opml=või impordi opml-fail või Google Reader
+lang_source_export=ekspordi tellimused
+lang_source_edit=toimeta
+lang_source_delete=kustuta
+lang_source_warn=Kas tõesti kustutada tellimus?
+lang_source_new=uus salvestamata tellimus
+lang_source_title=Nimi
+lang_source_tags=Sildid
+lang_source_comma=komaga eraldatud
+lang_source_select=Tellimuse allika liik
+lang_source_type=Liik
+lang_source_save=Salvesta
+lang_source_cancel=loobu
+lang_source_saved=salvestatud
+lang_no_entries=Ühtki sündmust ei leitud
+lang_more=rohkem
+lang_login=logi sisse
+lang_login_username=Kasutajanimi
+lang_login_password=Parool
+lang_no_title=Nimeta