Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1418 from wallabag/v2-previewpicture-filter | Jeremy Benoist | 2015-09-13 | 3 | -2/+32 |
|\ | | | | | filter for entries with previewPicture | ||||
| * | add test for previewPicture filter | Nicolas Lœuillet | 2015-09-13 | 2 | -3/+14 |
| | | |||||
| * | forgot case for previewPicture filter | Nicolas Lœuillet | 2015-09-13 | 1 | -0/+6 |
| | | |||||
| * | filter for entries with previewPicture | Nicolas Lœuillet | 2015-09-12 | 2 | -2/+15 |
| | | |||||
* | | Merge pull request #1362 from wallabag/v2-fosuser | Nicolas Lœuillet | 2015-09-12 | 18 | -333/+164 |
|\ \ | |/ |/| | implement FosUser | ||||
| * | Fix tests | Jeremy Benoist | 2015-09-12 | 4 | -10/+11 |
| | | | | | | | | | | | | | | Ensure that created use during install command will always be unique. We assume that the install command must be run to initialize a wallabag instance. NEVER to add more user. Also, use a better way to retrieve the real name of the database and not the one defined in parameters.yml (which isn't the same for test envi because the dbname isn't defined in parameters.yml but directly in config_test.yml) | ||||
| * | fix tests for FosUser | Nicolas Lœuillet | 2015-09-11 | 3 | -17/+16 |
| | | |||||
| * | implement FosUser | Nicolas Lœuillet | 2015-09-11 | 14 | -307/+138 |
|/ | |||||
* | Merge pull request #1397 from wallabag/v2-graby | Nicolas Lœuillet | 2015-09-11 | 12 | -358/+730 |
|\ | | | | | Integrate graby | ||||
| * | CS | Jeremy Benoist | 2015-09-10 | 3 | -9/+6 |
| | | |||||
| * | Move fetching content in a separate class | Jeremy Benoist | 2015-09-10 | 5 | -19/+156 |
| | | |||||
| * | Update deps | Jeremy Benoist | 2015-09-10 | 2 | -96/+160 |
| | | |||||
| * | Update url from graby | Jeremy Benoist | 2015-08-24 | 2 | -1/+2 |
| | | |||||
| * | CS | Jeremy Benoist | 2015-08-24 | 4 | -114/+409 |
| | | |||||
| * | Integrate graby | Jeremy Benoist | 2015-08-24 | 10 | -181/+59 |
| | | |||||
* | | Merge pull request #1403 from wallabag/v2-material-full-size-domain-filter | Jeremy Benoist | 2015-08-26 | 1 | -1/+1 |
|\ \ | | | | | | | Use full size of the panel for domain-filtering | ||||
| * | | typo | Thomas Citharel | 2015-08-26 | 1 | -1/+1 |
| | | | |||||
| * | | Use full size of the panel for domain-filtering | Thomas Citharel | 2015-08-26 | 1 | -1/+1 |
|/ / | | | | | For longer domains | ||||
* | | Merge pull request #1400 from wallabag/v2-fix-1357 | Jeremy Benoist | 2015-08-25 | 3 | -5/+10 |
|\ \ | |/ |/| | fix #1357, truncate domain name if it's too loooong | ||||
| * | fix #1357, truncate domain name if it's too loooong | Nicolas Lœuillet | 2015-08-24 | 3 | -5/+10 |
|/ | |||||
* | Merge pull request #1395 from wallabag/v2-fix-1378 | Jeremy Benoist | 2015-08-24 | 4 | -5/+48 |
|\ | | | | | fix #1378: nice display for tags list | ||||
| * | fix #1378: nice display for tags list | Nicolas Lœuillet | 2015-08-24 | 4 | -5/+48 |
| | | |||||
* | | Merge pull request #1396 from wallabag/j0k3r-patch-1 | Nicolas Lœuillet | 2015-08-24 | 1 | -1/+2 |
|\ \ | |/ |/| | Apply margin only on settings page | ||||
| * | Apply margin only on settings page | Jeremy Benoist | 2015-08-24 | 1 | -1/+2 |
|/ | |||||
* | Merge pull request #1392 from wallabag/v2-fix-redirect | Nicolas Lœuillet | 2015-08-24 | 1 | -5/+4 |
|\ | | | | | Fix redirect after deletion | ||||
| * | Fix redirect after deletion | Jeremy Benoist | 2015-08-22 | 1 | -5/+4 |
| | | | | | | | | Fix #1391 | ||||
* | | Merge pull request #1393 from wallabag/fix-filter-same-day | Nicolas Lœuillet | 2015-08-24 | 4 | -2/+51 |
|\ \ | | | | | | | Fix date filter on same day | ||||
| * | | Add test for same day filter | Jeremy Benoist | 2015-08-23 | 2 | -5/+14 |
| | | | |||||
| * | | Fix date filter on same day | Jeremy Benoist | 2015-08-22 | 3 | -2/+42 |
| | | | | | | | | | | | | Fix #1379 | ||||
* | | | Merge pull request #1384 from wallabag/v2-fix-config-display | Nicolas Lœuillet | 2015-08-23 | 2 | -14/+21 |
|\ \ \ | |/ / |/| | | fix #1371 config screen: display bug in RSS tab | ||||
| * | | Fix display issue in config rss tab | Jeremy Benoist | 2015-08-22 | 2 | -14/+21 |
| | | | |||||
* | | | Merge pull request #1372 from wallabag/v2-assign-tags | Jeremy Benoist | 2015-08-22 | 9 | -2/+186 |
|\ \ \ | |_|/ |/| | | assign tags to an entry | ||||
| * | | assign tags to an entry | Nicolas Lœuillet | 2015-08-22 | 9 | -2/+186 |
| | | | |||||
* | | | Merge pull request #1390 from wallabag/coderating | Jeremy Benoist | 2015-08-21 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | Enable code rating on Scrutinizer | ||||
| * | | | Enable code rating on Scrutinizer | Jeremy Benoist | 2015-08-21 | 1 | -0/+4 |
|/ / / | |||||
* | | | Merge pull request #1385 from wallabag/v2-status-filter | Jeremy Benoist | 2015-08-21 | 9 | -6/+88 |
|\ \ \ | | | | | | | | | filters: implement status filter and a new view (to display all entries) | ||||
| * | | | restore composer.lock | Nicolas Lœuillet | 2015-08-21 | 1 | -11/+11 |
| | | | | |||||
| * | | | filters: adapt queryBuilder for 'all' view | Nicolas Lœuillet | 2015-08-21 | 2 | -28/+19 |
| | | | | |||||
| * | | | filters: add test for status filter and adapt other tests results | Nicolas Lœuillet | 2015-08-21 | 2 | -2/+31 |
| | | | | |||||
| * | | | filters: implement status filter and a new view (to display all entries) | Nicolas Lœuillet | 2015-08-21 | 7 | -15/+77 |
| |/ / | |||||
* | | | Merge pull request #1389 from wallabag/v2-fix-duplicate | Jeremy Benoist | 2015-08-21 | 1 | -23/+0 |
|\ \ \ | |/ / |/| | | remove dead code | ||||
| * | | remove dead code | Nicolas Lœuillet | 2015-08-21 | 1 | -23/+0 |
|/ / | |||||
* | | Merge pull request #1386 from wallabag/v2-refactor | Nicolas Lœuillet | 2015-08-20 | 16 | -290/+182 |
|\ \ | |/ |/| | WIP – Fixing things around :dash: | ||||
| * | CS | Jeremy Benoist | 2015-08-20 | 3 | -2/+3 |
| | | |||||
| * | Add test on getting starred entries using the API | Jeremy Benoist | 2015-08-20 | 1 | -0/+25 |
| | | |||||
| * | Add title in "picto-link" | Jeremy Benoist | 2015-08-20 | 1 | -3/+3 |
| | | | | | | | | Picto aren't always obvious for every one. So it's better to have some title when we move the mouse over. | ||||
| * | Update baggy about page | Jeremy Benoist | 2015-08-20 | 1 | -20/+18 |
| | | | | | | | | According to what have been done on the material theme | ||||
| * | Fixed my name & website :ok_hand: | Jeremy Benoist | 2015-08-20 | 2 | -1/+2 |
| | | |||||
| * | Remove unsed things | Jeremy Benoist | 2015-08-20 | 6 | -157/+15 |
| | | |||||
| * | Refactorize the way to retrieve entries | Jeremy Benoist | 2015-08-20 | 3 | -108/+117 |
|/ | | | | | One place to retrieve entries in Entry & Rss controller. More simple and easy to maintain. |