Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into 2.1 | Jeremy Benoist | 2016-08-22 | 31 | -133/+284 |
|\ | |||||
| * | Merge pull request #2222 from wallabag/add-date-on-article-view | Nicolas Lœuillet | 2016-08-22 | 13 | -0/+55 |
| |\ | |||||
| | * | Display text on baggy | Jeremy Benoist | 2016-08-21 | 13 | -5/+20 |
| | * | Changed code indentation | Nicolas Lœuillet | 2016-08-18 | 2 | -6/+14 |
| | * | Added creation date and reading time on article view | Nicolas Lœuillet | 2016-08-18 | 13 | -0/+32 |
| * | | Merge pull request #2221 from wallabag/replace-favorite-star | Jeremy Benoist | 2016-08-21 | 16 | -22/+22 |
| |\ \ | |||||
| | * | | Fixed some translations | Nicolas Lœuillet | 2016-08-18 | 3 | -4/+4 |
| | * | | Replaced favorite word/icon with star one | Nicolas Lœuillet | 2016-08-18 | 16 | -22/+22 |
| | |/ | |||||
| * / | Avoid breaking import when fetching fail | Jeremy Benoist | 2016-08-20 | 3 | -32/+63 |
| |/ | |||||
| * | CS | Jeremy Benoist | 2016-08-17 | 3 | -5/+7 |
| * | Fix form user display for baggy theme | Nicolas Lœuillet | 2016-08-17 | 1 | -1/+2 |
| * | Fix form user display when 2FA is disabled | Nicolas Lœuillet | 2016-08-17 | 1 | -1/+1 |
| * | Fixed typo in entry:notice:entry_saved | charno6 | 2016-07-23 | 1 | -1/+1 |
| * | Merge pull request #2199 from Simounet/facto/social-links | Jeremy Benoist | 2016-07-21 | 8 | -52/+95 |
| |\ | |||||
| | * | php-cs-fixer pass | Simounet | 2016-07-20 | 2 | -2/+4 |
| | * | Chrome extension URL updated | Simounet | 2016-07-20 | 1 | -1/+1 |
| | * | Handling socials links into a config file | Simounet | 2016-07-20 | 8 | -52/+93 |
| * | | FIX image inside a figure element max-width (baggy theme) | Simounet | 2016-07-20 | 1 | -1/+1 |
| * | | FIX image inside a figure element max-width | Simounet | 2016-07-20 | 1 | -1/+2 |
| |/ | |||||
* | | Added name on client | Thomas Citharel | 2016-08-22 | 11 | -23/+75 |
* | | add some missing phpdoc parameters | Thomas Citharel | 2016-07-24 | 1 | -0/+2 |
* | | Merge remote-tracking branch 'origin/master' into 2.1 | Jeremy Benoist | 2016-07-20 | 2 | -3/+3 |
|\| | |||||
| * | Fixed spelling Artúclos --> Artículos | benages | 2016-07-18 | 1 | -1/+1 |
| * | Remove fr part | Thomas Citharel | 2016-07-02 | 1 | -1/+1 |
| * | Fix 3rd-Party Apps links (Chrome & Firefox) | Thomas Citharel | 2016-07-02 | 1 | -2/+2 |
* | | Bring tags on entries view to baggy | Thomas Citharel | 2016-07-01 | 2 | -1/+11 |
* | | fix merge issue | Thomas Citharel | 2016-06-29 | 1 | -1/+2 |
* | | Add filter for tags on API | Thomas Citharel | 2016-06-29 | 2 | -2/+9 |
* | | CS | Thomas Citharel | 2016-06-25 | 1 | -1/+1 |
* | | Add since parameter | Thomas Citharel | 2016-06-25 | 2 | -2/+8 |
* | | add line to other languages | Thomas Citharel | 2016-06-24 | 9 | -0/+9 |
* | | minor ui fixes | Thomas Citharel | 2016-06-23 | 1 | -5/+2 |
* | | fix typo on icons | Thomas Citharel | 2016-06-23 | 1 | -2/+2 |
* | | Add tags on entries view | Thomas Citharel | 2016-06-23 | 3 | -0/+21 |
* | | Merge branch 'master' into 2.1 | Jeremy Benoist | 2016-06-23 | 46 | -6063/+20 |
|\| | |||||
| * | Merge pull request #2157 from wallabag/lower-upper-readingtime | Jeremy Benoist | 2016-06-23 | 1 | -7/+16 |
| |\ | |||||
| | * | fixup! Handle only upper or only lower reading filter | Jeremy Benoist | 2016-06-23 | 1 | -2/+2 |
| | * | Handle only upper or only lower reading filter | Jeremy Benoist | 2016-06-23 | 1 | -7/+16 |
| * | | Fix a few french translations typos | Thomas Citharel | 2016-06-23 | 1 | -4/+4 |
| |/ | |||||
| * | Jump to Symfony 3.1 | Jeremy Benoist | 2016-06-22 | 45 | -6058/+0 |
| * | Try to find bad redirection after delete | Jeremy Benoist | 2016-06-17 | 1 | -3/+4 |
| * | Merge pull request #2122 from wallabag/fix-tags-deletion | Nicolas Lœuillet | 2016-05-31 | 17 | -41/+122 |
| |\ | |||||
| | * | Change ManyToMany between entry & tag | Jeremy Benoist | 2016-05-31 | 4 | -7/+68 |
| | * | Display a message when saving an entry failed | Jeremy Benoist | 2016-05-30 | 12 | -27/+45 |
| | * | Move fixtures to the right place | Jeremy Benoist | 2016-05-30 | 2 | -6/+8 |
| | * | Fix the deletion of Tags/Entries relation when delete an entry | Nicolas Lœuillet | 2016-05-28 | 1 | -1/+1 |
| * | | Merge pull request #2052 from danbartram/feature-filter-unread | Jeremy Benoist | 2016-05-27 | 14 | -0/+50 |
| |\ \ | | |/ | |/| | |||||
| | * | Add unread filter test to EntryControllerTest | Daniel Bartram | 2016-05-09 | 1 | -0/+18 |
| | * | Add unread filter to entries pages | Daniel Bartram | 2016-05-09 | 13 | -0/+32 |
* | | | Merge pull request #2142 from wallabag/v2-use-npm | Nicolas Lœuillet | 2016-06-23 | 105 | -19146/+108 |
|\ \ \ |