Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #504 from mariroz/dev | Nicolas Lœuillet | 2014-02-26 | 4 | -3/+129 |
|\ | | | | | translation related: how-to md file added, script to generate php from all twig templates, polish mo file compiled | ||||
| * | translation related: how-to md file added, script to generate php from all ↵ | Maryana Rozhankivska | 2014-02-26 | 4 | -3/+129 |
|/ | | | | twig templates, polish mo file compiled | ||||
* | Merge pull request #502 from skibbipl/patch-1 | Nicolas Lœuillet | 2014-02-26 | 1 | -81/+74 |
|\ | | | | | Update pl_PL.utf8.po | ||||
| * | Update pl_PL.utf8.po | Skibbi | 2014-02-25 | 1 | -81/+74 |
|/ | | | First cleanup, more to come. | ||||
* | Merge pull request #501 from mariroz/dev | Nicolas Lœuillet | 2014-02-25 | 1 | -0/+1 |
|\ | | | | | fix of #498, #493, #494 - because disappeared in last commit | ||||
| * | fix of #498, #493, #494 - because disappeared in last commit | Maryana Rozhankivska | 2014-02-25 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #499 from mariroz/dev | Nicolas Lœuillet | 2014-02-25 | 2 | -171/+131 |
|\| | | | | | French translation added by @Draky50110, issue #488 | ||||
| * | French translation added by @Draky50110, issue #488 | Maryana Rozhankivska | 2014-02-25 | 2 | -171/+131 |
| | | |||||
* | | Merge pull request #495 from mariroz/dev | Nicolas Lœuillet | 2014-02-25 | 23 | -1420/+4412 |
|\| | | | | | fix of global $http visibility, issues #493, #494 | ||||
| * | "poche" word removed completely, all locales .po files updated, en, pl, ru ↵ | Maryana Rozhankivska | 2014-02-25 | 19 | -1304/+3582 |
| | | | | | | | | and uk .mo files recompiled. | ||||
| * | fix of #486 - import issue | Maryana Rozhankivska | 2014-02-24 | 2 | -351/+357 |
| | | |||||
| * | Polish, Russian and Ukrainian locales updated, Franch locale po file ↵ | Maryana Rozhankivska | 2014-02-24 | 7 | -518/+1225 |
| | | | | | | | | uopdated. issue #488 | ||||
| * | fix of global $http visibility, issues #493, #494 | Maryana Rozhankivska | 2014-02-24 | 1 | -0/+1 |
|/ | |||||
* | [fix] redirect on config page after token generation #491 | Nicolas Lœuillet | 2014-02-23 | 1 | -0/+1 |
| | |||||
* | [change] remove old logo #484 | Nicolas Lœuillet | 2014-02-23 | 2 | -1/+1 |
| | |||||
* | [release] 1.5.2 | Nicolas Lœuillet | 2014-02-21 | 1 | -1/+1 |
| | |||||
* | [fix] content is now cleaned by HTML purifier from prevent XSS attack | Nicolas Lœuillet | 2014-02-21 | 2 | -0/+8 |
| | |||||
* | [add] HTML Purifier added to clean code | Nicolas Lœuillet | 2014-02-21 | 362 | -0/+31430 |
| | |||||
* | [add] languages well displayed on config page #480 | Nicolas Lœuillet | 2014-02-21 | 3 | -4/+17 |
| | |||||
* | [add] slovene language | Nicolas Lœuillet | 2014-02-21 | 2 | -0/+239 |
| | |||||
* | [fix] link in footer was unclickable #453 | Nicolas Lœuillet | 2014-02-21 | 1 | -0/+1 |
| | |||||
* | [change] login button into sign in | Nicolas Lœuillet | 2014-02-21 | 2 | -2/+2 |
| | |||||
* | [change] remove some poche terms in old default theme #471 | Nicolas Lœuillet | 2014-02-21 | 1 | -12/+15 |
| | |||||
* | typo in fonts call and in label on config screen | Nicolas Lœuillet | 2014-02-21 | 2 | -7/+7 |
| | |||||
* | Merge branch 'dev' of git://github.com/mariroz/wallabag into dev | Nicolas Lœuillet | 2014-02-21 | 15 | -125/+138 |
|\ | |||||
| * | a lot of refactoring: tag action is now handled by home view and uses ↵ | Maryana Rozhankivska | 2014-02-20 | 15 | -125/+138 |
| | | | | | | | | sorting and pagination. Some small view enhacenments. Fix of #476, #461 for baggy and other themes | ||||
| * | Merge remote-tracking branch 'upstream/dev' into dev | Maryana Rozhankivska | 2014-02-20 | 5 | -9/+22 |
| |\ | |||||
* | | | [fix] themes sorted A->Z #470 | Nicolas Lœuillet | 2014-02-20 | 3 | -2/+4 |
| | | | |||||
* | | | Merge branch 'dev' of git://github.com/arnaudmm/wallabag into arnaudmm-dev | Nicolas Lœuillet | 2014-02-20 | 1 | -9/+21 |
|\ \ \ | |||||
| * | | | Feature #457 : import from pocket now import tags too | arnaudmm | 2014-02-20 | 1 | -9/+21 |
| | |/ | |/| | |||||
* | | | Merge branch 'mariroz-dev' into dev | Nicolas Lœuillet | 2014-02-20 | 4 | -11/+52 |
|\ \ \ | |||||
| * \ \ | Merge branch 'dev' of git://github.com/mariroz/wallabag into mariroz-dev | Nicolas Lœuillet | 2014-02-20 | 4 | -11/+52 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | multiple tag entry displayed fix, issue #474 | Maryana Rozhankivska | 2014-02-20 | 1 | -2/+2 |
| | | | |||||
| | * | Full-Text RSS included as a script instead of file_get_contents call. Tnx to ↵ | Maryana Rozhankivska | 2014-02-19 | 3 | -9/+50 |
| | | | | | | | | | | | | @Faless. Fix issues #366 and #463 | ||||
* | | | rename font folder into fonts in baggy theme | Nicolas Lœuillet | 2014-02-20 | 6 | -1/+1 |
|/ / | |||||
* | | [add] message in install screen to prevent user when wallabag is already ↵ | Nicolas Lœuillet | 2014-02-20 | 2 | -7/+15 |
| | | | | | | | | installed | ||||
* | | Merge pull request #473 from nsteinmetz/dev | Nicolas Lœuillet | 2014-02-20 | 3 | -2/+7 |
|\ \ | |/ |/| | Baggy Theme - PtSans font is now local | ||||
| * | add font file | Nicolas Steinmetz | 2014-02-19 | 1 | -0/+0 |
| | | |||||
| * | Update font.css | Nicolas Steinmetz | 2014-02-19 | 1 | -0/+6 |
| | | | | | | Add reference for ptsans font in local instead of google fonts | ||||
| * | Update _head.twig | Nicolas Steinmetz | 2014-02-19 | 1 | -2/+1 |
| | | | | | | Remove googlefonts now called in font.css - need still to put the woff file in font directory | ||||
* | | [fix] css display with baggy theme | Nicolas Lœuillet | 2014-02-19 | 2 | -6/+6 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/wallabag/wallabag into dev | Nicolas Lœuillet | 2014-02-19 | 0 | -0/+0 |
|\ \ | |||||
| * \ | Merge pull request #467 from mariroz/dev | Nicolas Lœuillet | 2014-02-19 | 4 | -1/+40 |
| |\ \ | | | | | | | | | "save a link" added to top menu (default theme) to toggle "save link" form, issue #461 | ||||
* | \ \ | Merge branch 'dev' of git://github.com/mariroz/wallabag into dev | Nicolas Lœuillet | 2014-02-19 | 4 | -1/+40 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | "save a link" added to top menu (default theme) to toggle "save link" form ↵ | Maryana Rozhankivska | 2014-02-16 | 4 | -1/+40 |
| | | | | | | | | | | | | message, issue #461. "Mark all the entries as read" link added in default theme. | ||||
* | | | version number 1.5.11.5.1.1 | Nicolas Lœuillet | 2014-02-19 | 2 | -4/+4 |
| | | | |||||
* | | | [fix] security problems with tags | Nicolas Lœuillet | 2014-02-19 | 2 | -13/+37 |
| | | | |||||
* | | | Merge branch 'dev' of https://github.com/wallabag/wallabag into dev | Nicolas Lœuillet | 2014-02-18 | 2 | -0/+35 |
|\ \ \ | |||||
| * | | | Merge pull request #460 from mariroz/dev | Nicolas Lœuillet | 2014-02-18 | 2 | -0/+35 |
| |\| | | | |/ | |/| | duplicate check added. fix of issue #400 | ||||
| | * | duplicate check added. fix of issue #400 | Maryana Rozhankivska | 2014-02-14 | 2 | -0/+35 |
| |/ |