aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
...
| * Handle filter form using some JSJeremy Benoist2015-09-133-15/+49
| * Cleanup base layoutJeremy Benoist2015-09-132-47/+56
| * Remove some global assetsJeremy Benoist2015-09-1313-3544/+4
| * Move baggy theme in its folderJeremy Benoist2015-09-1316-0/+0
|/
* Merge pull request #1417 from wallabag/v2-display-pictureJeremy Benoist2015-09-136-2/+25
|\
| * add previewPicture on baggy themeNicolas Lœuillet2015-09-133-1/+12
| * add preview picturesNicolas Lœuillet2015-09-123-1/+13
* | Merge pull request #1418 from wallabag/v2-previewpicture-filterJeremy Benoist2015-09-133-2/+32
|\ \
| * | add test for previewPicture filterNicolas Lœuillet2015-09-132-3/+14
| * | forgot case for previewPicture filterNicolas Lœuillet2015-09-131-0/+6
| * | filter for entries with previewPictureNicolas Lœuillet2015-09-122-2/+15
| |/
* | Merge pull request #1362 from wallabag/v2-fosuserNicolas Lœuillet2015-09-1218-333/+164
|\ \ | |/ |/|
| * Fix testsJeremy Benoist2015-09-124-10/+11
| * fix tests for FosUserNicolas Lœuillet2015-09-113-17/+16
| * implement FosUserNicolas Lœuillet2015-09-1114-307/+138
|/
* Merge pull request #1397 from wallabag/v2-grabyNicolas Lœuillet2015-09-1112-358/+730
|\
| * CSJeremy Benoist2015-09-103-9/+6
| * Move fetching content in a separate classJeremy Benoist2015-09-105-19/+156
| * Update depsJeremy Benoist2015-09-102-96/+160
| * Update url from grabyJeremy Benoist2015-08-242-1/+2
| * CSJeremy Benoist2015-08-244-114/+409
| * Integrate grabyJeremy Benoist2015-08-2410-181/+59
* | Merge pull request #1403 from wallabag/v2-material-full-size-domain-filterJeremy Benoist2015-08-261-1/+1
|\ \
| * | typoThomas Citharel2015-08-261-1/+1
| * | Use full size of the panel for domain-filteringThomas Citharel2015-08-261-1/+1
|/ /
* | Merge pull request #1400 from wallabag/v2-fix-1357Jeremy Benoist2015-08-253-5/+10
|\ \ | |/ |/|
| * fix #1357, truncate domain name if it's too loooongNicolas Lœuillet2015-08-243-5/+10
|/
* Merge pull request #1395 from wallabag/v2-fix-1378Jeremy Benoist2015-08-244-5/+48
|\
| * fix #1378: nice display for tags listNicolas Lœuillet2015-08-244-5/+48
* | Merge pull request #1396 from wallabag/j0k3r-patch-1Nicolas Lœuillet2015-08-241-1/+2
|\ \ | |/ |/|
| * Apply margin only on settings pageJeremy Benoist2015-08-241-1/+2
|/
* Merge pull request #1392 from wallabag/v2-fix-redirectNicolas Lœuillet2015-08-241-5/+4
|\
| * Fix redirect after deletionJeremy Benoist2015-08-221-5/+4
* | Merge pull request #1393 from wallabag/fix-filter-same-dayNicolas Lœuillet2015-08-244-2/+51
|\ \
| * | Add test for same day filterJeremy Benoist2015-08-232-5/+14
| * | Fix date filter on same dayJeremy Benoist2015-08-223-2/+42
* | | Merge pull request #1384 from wallabag/v2-fix-config-displayNicolas Lœuillet2015-08-232-14/+21
|\ \ \ | |/ / |/| |
| * | Fix display issue in config rss tabJeremy Benoist2015-08-222-14/+21
* | | Merge pull request #1372 from wallabag/v2-assign-tagsJeremy Benoist2015-08-229-2/+186
|\ \ \ | |_|/ |/| |
| * | assign tags to an entryNicolas Lœuillet2015-08-229-2/+186
* | | Merge pull request #1390 from wallabag/coderatingJeremy Benoist2015-08-211-0/+4
|\ \ \
| * | | Enable code rating on ScrutinizerJeremy Benoist2015-08-211-0/+4
|/ / /
* | | Merge pull request #1385 from wallabag/v2-status-filterJeremy Benoist2015-08-219-6/+88
|\ \ \
| * | | restore composer.lockNicolas Lœuillet2015-08-211-11/+11
| * | | filters: adapt queryBuilder for 'all' viewNicolas Lœuillet2015-08-212-28/+19
| * | | filters: add test for status filter and adapt other tests resultsNicolas Lœuillet2015-08-212-2/+31
| * | | filters: implement status filter and a new view (to display all entries)Nicolas Lœuillet2015-08-217-15/+77
| |/ /
* | | Merge pull request #1389 from wallabag/v2-fix-duplicateJeremy Benoist2015-08-211-23/+0
|\ \ \ | |/ / |/| |
| * | remove dead codeNicolas Lœuillet2015-08-211-23/+0
|/ /
* | Merge pull request #1386 from wallabag/v2-refactorNicolas Lœuillet2015-08-2016-290/+182
|\ \ | |/ |/|