aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #481 from wallabag/dev1.5.2Nicolas Lœuillet2014-02-21401-183/+31997
|\
| * [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
| | | * Full-Text RSS included as a script instead of file_get_contents call. Tnx to ...Maryana Rozhankivska2014-02-193-9/+50
| * | | rename font folder into fonts in baggy themeNicolas Lœuillet2014-02-206-1/+1
| |/ /
| * | [add] message in install screen to prevent user when wallabag is already inst...Nicolas Lœuillet2014-02-202-7/+15
| * | Merge pull request #473 from nsteinmetz/devNicolas Lœuillet2014-02-203-2/+7
| |\ \ | | |/ | |/|
| | * add font fileNicolas Steinmetz2014-02-191-0/+0
| | * Update font.cssNicolas Steinmetz2014-02-191-0/+6
| | * Update _head.twigNicolas Steinmetz2014-02-191-2/+1
| * | [fix] css display with baggy themeNicolas Lœuillet2014-02-192-6/+6
| * | Merge branch 'dev' of https://github.com/wallabag/wallabag into devNicolas Lœuillet2014-02-190-0/+0
| |\ \
| | * \ Merge pull request #467 from mariroz/devNicolas Lœuillet2014-02-194-1/+40
| | |\ \
| * | \ \ Merge branch 'dev' of git://github.com/mariroz/wallabag into devNicolas Lœuillet2014-02-194-1/+40
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | "save a link" added to top menu (default theme) to toggle "save link" form me...Maryana Rozhankivska2014-02-164-1/+40
* | | | Merge pull request #469 from wallabag/devNicolas Lœuillet2014-02-192-4/+4
|\| | |
| * | | version number 1.5.11.5.1.1Nicolas Lœuillet2014-02-192-4/+4
* | | | Merge pull request #468 from wallabag/dev1.5.1Nicolas Lœuillet2014-02-199-16/+440
|\| | |
| * | | [fix] security problems with tagsNicolas Lœuillet2014-02-192-13/+37
| * | | Merge branch 'dev' of https://github.com/wallabag/wallabag into devNicolas Lœuillet2014-02-182-0/+35
| |\ \ \
| | * | | Merge pull request #460 from mariroz/devNicolas Lœuillet2014-02-182-0/+35
| | |\| | | | | |/ | | |/|
| | | * duplicate check added. fix of issue #400Maryana Rozhankivska2014-02-142-0/+35
| | |/
| * / [add] script to make the install more user friendly #466Nicolas Lœuillet2014-02-185-1/+344
| |/
| * [add] link to empty cache in config screen, #454Nicolas Lœuillet2014-02-143-1/+23
| * [fix] #452 remove crappy codeNicolas Lœuillet2014-02-131-1/+1
* | Merge pull request #450 from wallabag/dev1.5.0Nicolas Lœuillet2014-02-1388-184/+3269
|\|
| * [change] change default content #445Nicolas Lœuillet2014-02-131-0/+0
| * [fix] remove htacces in inc/, bug to fetch contentNicolas Lœuillet2014-02-131-2/+0
| * add help about vendor.zipNicolas Lœuillet2014-02-131-1/+1
| * [change] wallabag in feeds titleNicolas Lœuillet2014-02-131-2/+2
| * new default theme, baggy \o/Nicolas Lœuillet2014-02-121-1/+1
| * new theme, baggy one cf #448Nicolas Lœuillet2014-02-1243-0/+1873
| * go go go, 1.5 powaNicolas Lœuillet2014-02-121-1/+1
| * [change] time for sessionNicolas Lœuillet2014-02-121-2/+2