moparisthebest/wallabag
1
0
Fork 0
mirror of https://github.com/moparisthebest/wallabag synced 2024-11-27 03:12:21 -05:00
Code Issues Releases Wiki Activity

Merge branch 'dev' of https://github.com/wallabag/wallabag into dev

Browse Source
This commit is contained in:
Thomas Citharel 2014-08-21 16:24:13 +02:00
commit 45e60cb52a
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
inc/poche/Poche.class.php
View File

@ -524,6 +524,14 @@ class Poche
$longlastingsession = isset($_POST['longlastingsession']);
$passwordTest = ($isauthenticated) ? $user['password'] : Tools::encodeString($password . $login);
Session::login($user['username'], $user['password'], $login, $passwordTest, $longlastingsession, array('poche_user' => new User($user)));
# reload l10n
$language = $user['config']['language'];
@putenv('LC_ALL=' . $language);
setlocale(LC_ALL, $language);
bindtextdomain($language, LOCALE);
textdomain($language);
$this->messages->add('s', _('welcome to your wallabag'));
Tools::logm('login successful');
Tools::redirect($referer);

2
inc/poche/config.inc.default.php
View File

@ -59,7 +59,7 @@
@define ('LOCALE', ROOT . '/locale');
@define ('CACHE', ROOT . '/cache');
@define ('PAGINATION', '10');
@define ('PAGINATION', '12');
//limit for download of articles during import
@define ('IMPORT_LIMIT', 5);

2
themes/baggy/_pocheit-form.twig
View File

@ -4,7 +4,7 @@
{% trans "Save a link" %}</h2>
<input type="hidden" name="autoclose" value="1" />
<input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
<span id="add-link-result"></span>
<input type="submit" value="{% trans "save link!" %}" />
<div id="add-link-result"></div>
</form>
</div>

2
themes/baggy/css/main.css
View File

@ -630,7 +630,7 @@ a.add-to-wallabag-link-after:after {
#add-link-result {
font-weight: bold;
margin-top: 10px;
font-size: 0.9em;
}
/* ==========================================================================