aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
...
* 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
* | | version number 1.5.11.5.1.1Nicolas Lœuillet2014-02-192-4/+4
* | | [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
* [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
* [add] mark all as read #385Nicolas Lœuillet2014-02-122-0/+13
* [fix] somes fixes on old default themeNicolas Lœuillet2014-02-123-11/+29
* change static filesNicolas Lœuillet2014-02-122-3/+3
* Merge branch 'dev' of https://github.com/wallabag/wallabag into devNicolas Lœuillet2014-02-1236-156/+1343
|\
| * Merge pull request #439 from flolauck/masterNicolas Lœuillet2014-02-106-1/+10
| |\
| | * Adding .htaccess files to prohibit access to critical directories, e.g., db/Florian Lauck2014-02-105-0/+9
| | * Merge pull request #427 from wallabag/dev1.4.0Nicolas Lœuillet2014-02-0384-173/+1397
| | |\
| | * | poche -> wallabagNicolas Lœuillet2014-01-281-23/+4
| * | | Merge pull request #435 from mariroz/devNicolas Lœuillet2014-02-078-124/+1197
| |\ \ \
| | * | | Polish and Ukrainian translations added. Russian - updated. Plust 2 small tra...Maryana Rozhankivska2014-02-078-124/+1197
| |/ / /
| * | | Merge pull request #434 from thomaslebeau/theme-courgetteNicolas Lœuillet2014-02-0715-30/+135
| |\ \ \
| | * | | [remove] fontello theme courgetteThomas LEBEAU2014-02-074-23/+0
| | * | | [add] maj theme courgette : ajout tagThomas LEBEAU2014-02-0711-7/+135
| |/ / /