Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |/ | |||||
* / | [add] script to make the install more user friendly #466 | Nicolas Lœuillet | 2014-02-18 | 5 | -1/+344 |
|/ | |||||
* | [add] link to empty cache in config screen, #454 | Nicolas Lœuillet | 2014-02-14 | 3 | -1/+23 |
| | |||||
* | [fix] #452 remove crappy code | Nicolas Lœuillet | 2014-02-13 | 1 | -1/+1 |
| | |||||
* | [change] change default content #445 | Nicolas Lœuillet | 2014-02-13 | 1 | -0/+0 |
| | |||||
* | [fix] remove htacces in inc/, bug to fetch content | Nicolas Lœuillet | 2014-02-13 | 1 | -2/+0 |
| | |||||
* | add help about vendor.zip | Nicolas Lœuillet | 2014-02-13 | 1 | -1/+1 |
| | |||||
* | [change] wallabag in feeds title | Nicolas Lœuillet | 2014-02-13 | 1 | -2/+2 |
| | |||||
* | new default theme, baggy \o/ | Nicolas Lœuillet | 2014-02-12 | 1 | -1/+1 |
| | |||||
* | new theme, baggy one cf #448 | Nicolas Lœuillet | 2014-02-12 | 43 | -0/+1873 |
| | |||||
* | go go go, 1.5 powa | Nicolas Lœuillet | 2014-02-12 | 1 | -1/+1 |
| | |||||
* | [change] time for session | Nicolas Lœuillet | 2014-02-12 | 1 | -2/+2 |
| | |||||
* | [add] mark all as read #385 | Nicolas Lœuillet | 2014-02-12 | 2 | -0/+13 |
| | |||||
* | [fix] somes fixes on old default theme | Nicolas Lœuillet | 2014-02-12 | 3 | -11/+29 |
| | |||||
* | change static files | Nicolas Lœuillet | 2014-02-12 | 2 | -3/+3 |
| | |||||
* | Merge branch 'dev' of https://github.com/wallabag/wallabag into dev | Nicolas Lœuillet | 2014-02-12 | 36 | -156/+1343 |
|\ | |||||
| * | Merge pull request #439 from flolauck/master | Nicolas Lœuillet | 2014-02-10 | 6 | -1/+10 |
| |\ | | | | | | | Adding .htaccess files to prohibit access to critical directories, e.g., db/ | ||||
| | * | Adding .htaccess files to prohibit access to critical directories, e.g., db/ | Florian Lauck | 2014-02-10 | 5 | -0/+9 |
| | | | |||||
| | * | Merge pull request #427 from wallabag/dev1.4.0 | Nicolas Lœuillet | 2014-02-03 | 84 | -173/+1397 |
| | |\ | | | | | | | | | changelog 1.4 | ||||
| | * | | poche -> wallabag | Nicolas Lœuillet | 2014-01-28 | 1 | -23/+4 |
| | | | | |||||
| * | | | Merge pull request #435 from mariroz/dev | Nicolas Lœuillet | 2014-02-07 | 8 | -124/+1197 |
| |\ \ \ | | | | | | | | | | | Polish and Ukrainian translations added. Russian - updated. Plust 2 smal... | ||||
| | * | | | Polish and Ukrainian translations added. Russian - updated. Plust 2 small ↵ | Maryana Rozhankivska | 2014-02-07 | 8 | -124/+1197 |
| |/ / / | | | | | | | | | | | | | translation related fixes in code. | ||||
| * | | | Merge pull request #434 from thomaslebeau/theme-courgette | Nicolas Lœuillet | 2014-02-07 | 15 | -30/+135 |
| |\ \ \ | | | | | | | | | | | Theme courgette | ||||
| | * | | | [remove] fontello theme courgette | Thomas LEBEAU | 2014-02-07 | 4 | -23/+0 |
| | | | | | |||||
| | * | | | [add] maj theme courgette : ajout tag | Thomas LEBEAU | 2014-02-07 | 11 | -7/+135 |
| |/ / / |