aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* phpepub via composerNicolas Lœuillet2015-01-1912-6181/+54
* phinx for database migrationNicolas Lœuillet2015-01-193-49/+263
* foo testNicolas Lœuillet2015-01-196-795/+474
* add phpunitNicolas Lœuillet2015-01-192-2/+794
* bin folderNicolas Lœuillet2015-01-193-0/+0
* pagination with composer and move FlattrItemNicolas Lœuillet2015-01-196-552/+47
* replace session classNicolas Lœuillet2015-01-183-4/+46
* replace flash messages libraryNicolas Lœuillet2015-01-184-236/+57
* remove 3rd librariesNicolas Lœuillet2015-01-18366-33359/+790
* remove autoload section in composer.jsonNicolas Lœuillet2015-01-161-5/+0
* packagistNicolas Lœuillet2015-01-161-0/+28
* Merge pull request #690 from doc75/log_auth_errorNicolas Lœuillet2015-01-161-0/+2
|\
| * add message in web server log in case of authentication failure to enable the...Guillaume Virlet2015-01-051-0/+2
* | Merge pull request #1003 from vpmalley/devNicolas Lœuillet2015-01-162-5/+12
|\ \
| * | [RSS] introducing query param 'limit' to restrict the number of items to disp...Vincent Malley2015-01-162-5/+12
|/ /
* | Merge pull request #999 from moparisthebest/additions_devThomas Citharel2015-01-133-14/+55
|\ \ | |/ |/|
| * Add ability to mark all articles from a tag as readmoparisthebest2015-01-123-3/+20
| * Add ability to delete all articles matching a searchmoparisthebest2015-01-123-11/+28
| * Add ability to tag an article on creationmoparisthebest2015-01-121-0/+7
|/
* fixes #963 and use our own readability.php file for mobiClassThomas Citharel2015-01-035-1183/+7
* updated french mo file (see #986)Thomas Citharel2015-01-031-0/+0
* Merge branch 'master' into devThomas Citharel2015-01-033-3/+7
|\
| * Merge pull request #986 from goofy-bz/patch-2Nicolas Lœuillet2015-01-021-1/+1
| |\
| | * Update fr_FR.utf8.pogoofy-bz2015-01-021-1/+1
| |/
| * Merge pull request #974 from jbfavre/fix_ftrss_call_can_break_importThomas Citharel2014-12-261-1/+4
| |\
| | * Make call to FTRSS silent to avoid warnings which can break importJean Baptiste Favre2014-12-211-1/+4
| |/
| * Merge pull request #933 from wallabag/dev1.8.1old1.8.1bis1.8.1bNicolas Lœuillet2014-11-161-2/+2
| |\
| * \ Merge pull request #932 from wallabag/dev1.8.1Nicolas Lœuillet2014-11-15103-501/+2186
| |\ \
| * \ \ Merge branch 'dev'1.8.0Nicolas Lœuillet2014-10-101012-7222/+10188
| |\ \ \
| | * \ \ Merge branch 'master' into devNicolas Lœuillet2014-10-101-1/+2
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'fix/securityMaster'1.7.2Nicolas Lœuillet2014-07-241-42/+42
| |\ \ \ \
| | * | | | 1.7.2Nicolas Lœuillet2014-07-241-34/+34
| | * | | | security fixMaryana Rozhankivska2014-07-241-41/+41
| |/ / / /
| * | | | Merge pull request #761 from wallabag/dev1.7.1Nicolas Lœuillet2014-07-1517-166/+191
| |\ \ \ \
| * \ \ \ \ Merge pull request #712 from wallabag/dev1.7.0Nicolas Lœuillet2014-05-2969-4591/+12244
| |\ \ \ \ \
| * | | | | | Added PHPePubtcitworld2014-05-161-1/+2
| * | | | | | Merge pull request #634 from wallabag/dev1.6.1bNicolas Lœuillet2014-04-1116-749/+814
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #595 from wallabag/dev1.6.11.6.0Nicolas Lœuillet2014-04-03100-2255/+9895
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/wallabag/wallabag into devThomas Citharel2014-12-261-4/+7
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #975 from wallabag/fixflattrcallsNicolas Lœuillet2014-12-231-4/+7
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | don't call flattr if flattr is disabledThomas Citharel2014-12-221-4/+7
| |/ / / / / / / / /
* / / / / / / / / / deleted (again) courgetteThomas Citharel2014-12-261-127/+0
|/ / / / / / / / /
* | | | | | | | | Merge pull request #971 from wallabag/fix-jquery-installationThomas Citharel2014-12-191-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove idea filesNicolas Loeuillet2014-12-181-5/+0
| * | | | | | | | | change jquery path into installation scriptNicolas Loeuillet2014-12-182-1/+6
|/ / / / / / / / /
* | | | | | | | | Merge pull request #923 from wallabag/add-html-docThomas Citharel2014-12-1787-5/+6443
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | link to doc inside wallabag:aboutThomas Citharel2014-12-172-6/+16
| * | | | | | | | | Merge branch 'add-html-doc' of https://github.com/wallabag/wallabag into docu...Thomas Citharel2014-12-1786-0/+6428
|/| | | | | | | | |
| * | | | | | | | | upgrade documentationNicolas Lœuillet2014-11-2448-219/+2677
| * | | | | | | | | add link to documentation into installationNicolas Lœuillet2014-11-241-0/+1