aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/wallabag/wallabag into devNicolas Lœuillet2014-02-282-1/+2
|\
| * Merge pull request #517 from mariroz/devNicolas Lœuillet2014-02-282-1/+2
| |\
| | * effect of block rebuilding on next page removed, issue #479Maryana Rozhankivska2014-02-281-40/+40
| | * effect of block rebuilding on next page removed, issue #479Maryana Rozhankivska2014-02-282-40/+41
| |/
* / [add] label for brazilian language on config screenNicolas Lœuillet2014-02-271-0/+1
|/
* Merge pull request #515 from mariroz/devNicolas Lœuillet2014-02-271-1/+1
|\
| * fix of #509, related to php 5.3Maryana Rozhankivska2014-02-271-1/+1
* | Syntax fix.tcitworld2014-02-271-1/+1
* | Merge pull request #513 from camporez/devNicolas Lœuillet2014-02-272-0/+549
|\ \
| * | Add brazilian portuguese (pt-BR) translationcamporez2014-02-272-0/+549
| * | Create pt_BR.utf8.moCamporez2014-02-271-0/+549
|/ /
* | Merge pull request #510 from mariroz/devNicolas Lœuillet2014-02-2713-18/+233
|\|
| * some baggy theme fixes and enhancement: issue #479Maryana Rozhankivska2014-02-2713-19/+234
* | [fix] hover problem with logout link #489Nicolas Lœuillet2014-02-271-1/+1
* | [add] empty cache after changing language #492Nicolas Lœuillet2014-02-271-0/+2
* | [add] Empty cache after changing theme #503Nicolas Lœuillet2014-02-271-0/+2
* | [fix] Baggy theme navigation bug #485Nicolas Lœuillet2014-02-271-0/+1
* | Merge pull request #504 from mariroz/devNicolas Lœuillet2014-02-264-3/+129
|\|
| * translation related: how-to md file added, script to generate php from all tw...Maryana Rozhankivska2014-02-264-3/+129
|/
* Merge pull request #502 from skibbipl/patch-1Nicolas Lœuillet2014-02-261-81/+74
|\
| * Update pl_PL.utf8.poSkibbi2014-02-251-81/+74
|/
* Merge pull request #501 from mariroz/devNicolas Lœuillet2014-02-251-0/+1
|\
| * fix of #498, #493, #494 - because disappeared in last commitMaryana Rozhankivska2014-02-251-0/+1
* | Merge pull request #499 from mariroz/devNicolas Lœuillet2014-02-252-171/+131
|\|
| * French translation added by @Draky50110, issue #488Maryana Rozhankivska2014-02-252-171/+131
* | Merge pull request #495 from mariroz/devNicolas Lœuillet2014-02-2523-1420/+4412
|\|
| * "poche" word removed completely, all locales .po files updated, en, pl, ru an...Maryana Rozhankivska2014-02-2519-1304/+3582
| * fix of #486 - import issueMaryana Rozhankivska2014-02-242-351/+357
| * Polish, Russian and Ukrainian locales updated, Franch locale po file uopdated...Maryana Rozhankivska2014-02-247-518/+1225
| * fix of global $http visibility, issues #493, #494Maryana Rozhankivska2014-02-241-0/+1
|/
* [fix] redirect on config page after token generation #491Nicolas Lœuillet2014-02-231-0/+1
* [change] remove old logo #484Nicolas Lœuillet2014-02-232-1/+1
* [release] 1.5.2Nicolas Lœuillet2014-02-211-1/+1
* [fix] content is now cleaned by HTML purifier from prevent XSS attackNicolas Lœuillet2014-02-212-0/+8
* [add] HTML Purifier added to clean codeNicolas Lœuillet2014-02-21362-0/+31430
* [add] languages well displayed on config page #480Nicolas Lœuillet2014-02-213-4/+17
* [add] slovene languageNicolas Lœuillet2014-02-212-0/+239
* [fix] link in footer was unclickable #453Nicolas Lœuillet2014-02-211-0/+1
* [change] login button into sign inNicolas Lœuillet2014-02-212-2/+2
* [change] remove some poche terms in old default theme #471Nicolas Lœuillet2014-02-211-12/+15
* typo in fonts call and in label on config screenNicolas Lœuillet2014-02-212-7/+7
* Merge branch 'dev' of git://github.com/mariroz/wallabag into devNicolas Lœuillet2014-02-2115-125/+138
|\
| * a lot of refactoring: tag action is now handled by home view and uses sorting...Maryana Rozhankivska2014-02-2015-125/+138
| * Merge remote-tracking branch 'upstream/dev' into devMaryana Rozhankivska2014-02-205-9/+22
| |\
* | | [fix] themes sorted A->Z #470Nicolas Lœuillet2014-02-203-2/+4
* | | Merge branch 'dev' of git://github.com/arnaudmm/wallabag into arnaudmm-devNicolas Lœuillet2014-02-201-9/+21
|\ \ \
| * | | Feature #457 : import from pocket now import tags tooarnaudmm2014-02-201-9/+21
| | |/ | |/|
* | | Merge branch 'mariroz-dev' into devNicolas Lœuillet2014-02-204-11/+52
|\ \ \
| * \ \ Merge branch 'dev' of git://github.com/mariroz/wallabag into mariroz-devNicolas Lœuillet2014-02-204-11/+52
| |\ \ \ | | |/ / | |/| / | | |/
| | * multiple tag entry displayed fix, issue #474Maryana Rozhankivska2014-02-201-2/+2