Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | Prepare release 2.0.6 | Nicolas Lœuillet | 2016-08-10 | 6 | -6/+22 | |
| |/ / / | ||||||
| * | | | Merge pull request #2200 from charno6/patch-1 | Thomas Citharel | 2016-07-23 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | | | Fixed typo in entry:notice:entry_saved | |||||
| | * | | | Fixed typo in entry:notice:entry_saved | charno6 | 2016-07-23 | 1 | -1/+1 | |
| |/ / / | | | | | | | | | "Eintag" to "Eintrag" | |||||
| * | | | Merge pull request #2199 from Simounet/facto/social-links | Jeremy Benoist | 2016-07-21 | 8 | -52/+95 | |
| |\ \ \ | | | | | | | | | | | Handling socials links into a config file | |||||
| | * | | | 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 | |
| | | | | | ||||||
| * | | | | Merge pull request #2198 from Simounet/fix/image-inside-figure | Thomas Citharel | 2016-07-20 | 2 | -2/+3 | |
| |\ \ \ \ | | |/ / / | |/| | | | FIX image inside a figure element max-width | |||||
| | * | | | 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 | 13 | -24/+110 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix typos in field name - Added migration for name field in API client table Manually cherry-picked from PR https://github.com/wallabag/wallabag/pull/2171 | |||||
* | | | | Upgrade PHPUnit to version 5 | Jeremy Benoist | 2016-08-22 | 3 | -2/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix deprecated getMock - Use PHPUnit 4 for PHP 5.5 build Manually cherry-picked from PR https://github.com/wallabag/wallabag/pull/2201 | |||||
* | | | | Merge pull request #2202 from wallabag/fix-phpdoc | Jeremy Benoist | 2016-07-24 | 1 | -0/+2 | |
|\ \ \ \ | | | | | | | | | | | add some missing phpdoc parameters | |||||
| * | | | | 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 | 26 | -64/+149 | |
|\| | | | ||||||
| * | | | Merge pull request #2195 from wallabag/remove-bin | Nicolas Lœuillet | 2016-07-20 | 10 | -9/+6 | |
| |\ \ \ | | | | | | | | | | | Remove binary from repo | |||||
| | * | | | Remove binary from repo | Jeremy Benoist | 2016-07-20 | 10 | -9/+6 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Since Composer 1.2, binaries are re-installed from vendors if there aren't found. This avoid us to commit binaries vendors into the repo. :warning: You have to update your Composer to the 1.2 (`composer selfupdate`) | |||||
| * | | | Merge pull request #2048 from wallabag/travis-php-7.1 | Nicolas Lœuillet | 2016-07-19 | 3 | -2/+3 | |
| |\ \ \ | | | | | | | | | | | Run PHP 7.1 on Travis | |||||
| | * | | | Run PHP 7.1 on Travis | Jeremy Benoist | 2016-07-18 | 3 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | - Using nightly (as of now it's PHP 7.1 alpha) - Force guzzle to be at least 5.3.1 (which fix some bugs in PHP 7) | |||||
| * | | | | Merge pull request #2194 from benages/patch-2 | Jeremy Benoist | 2016-07-18 | 1 | -1/+1 | |
| |\ \ \ \ | | |/ / / | |/| | | | Fixed spelling Artúclos --> Artículos | |||||
| | * | | | Fixed spelling Artúclos --> Artículos | benages | 2016-07-18 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | | | Merge pull request #2185 from wallabag/fix-3rd-party-links | Thomas Citharel | 2016-07-02 | 1 | -2/+2 | |
| |\ \ \ | | | | | | | | | | | Fix 3rd-Party Apps links (Chrome & Firefox) | |||||
| | * | | | 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 | |
| |/ / / | ||||||
| * | | | Merge pull request #2172 from wallabag/more-tests | Nicolas Lœuillet | 2016-06-24 | 11 | -51/+138 | |
| |\ \ \ | | | | | | | | | | | Change the way to login user in tests | |||||
| | * | | | Change the way to login user in tests | Jeremy Benoist | 2016-06-24 | 6 | -9/+90 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using a HTTP request we just login user like FOSUser does. It allows us to mock service in container for functional tests. Also, fix a bad config name in fos_user for firewall And finally, add functional test to PocketImport | |||||
| | * | | | Remove useless spaces | Jeremy Benoist | 2016-06-24 | 6 | -42/+48 | |
| |/ / / | ||||||
* | | | | Merge pull request #2183 from wallabag/tags-entries-view-baggy | Jeremy Benoist | 2016-07-18 | 4 | -75/+137 | |
|\ \ \ \ | | | | | | | | | | | Bring tags on entries view to baggy | |||||
| * | | | | Bring tags on entries view to baggy | Thomas Citharel | 2016-07-01 | 4 | -75/+137 | |
|/ / / / | | | | | | | | | | | | | Also, a couple of UI improvement and CSS fixing | |||||
* | | | | Merge pull request #2174 from wallabag/api-filter-tags | Nicolas Lœuillet | 2016-07-01 | 3 | -2/+32 | |
|\ \ \ \ | | | | | | | | | | | Add filter for tags on API | |||||
| * | | | | fix merge issue | Thomas Citharel | 2016-06-29 | 1 | -1/+2 | |
| | | | | | ||||||
| * | | | | Add filter for tags on API | Thomas Citharel | 2016-06-29 | 3 | -2/+31 | |
|/ / / / | ||||||
* | | | | Merge pull request #2176 from wallabag/add-since-parameter | Nicolas Lœuillet | 2016-06-29 | 3 | -2/+53 | |
|\ \ \ \ | | | | | | | | | | | Add since parameter | |||||
| * | | | | CS | Thomas Citharel | 2016-06-25 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Add since parameter | Thomas Citharel | 2016-06-25 | 3 | -2/+53 | |
|/ / / / | ||||||
* | | | | Merge pull request #2170 from wallabag/addTagsOnEntriesView | Nicolas Lœuillet | 2016-06-24 | 14 | -5/+75 | |
|\ \ \ \ | | | | | | | | | | | Add tags on entries view and minor ui fixes | |||||
| * | | | | uniformize tags on article view too | Thomas Citharel | 2016-06-24 | 1 | -2/+3 | |
| | | | | | ||||||
| * | | | | add line to other languages | Thomas Citharel | 2016-06-24 | 9 | -0/+9 | |
| | | | | | ||||||
| * | | | | minor ui fixes | Thomas Citharel | 2016-06-23 | 2 | -5/+6 | |
| | | | | | ||||||
| * | | | | fix typo on icons | Thomas Citharel | 2016-06-23 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Add tags on entries view | Thomas Citharel | 2016-06-23 | 4 | -0/+59 | |
| | | | | | | | | | | | | | | | | | | | | Should be tested on old browsers | |||||
* | | | | | Merge pull request #2169 from wallabag/fix-fonts | Jeremy Benoist | 2016-06-24 | 2 | -2/+3 | |
|\ \ \ \ \ | |/ / / / |/| | | | | fix font paths | |||||
| * | | | | fix font paths | Thomas Citharel | 2016-06-23 | 2 | -2/+3 | |
|/ / / / | ||||||
* | | | | Merge pull request #2168 from wallabag/fix-npm-dep-old-nodejs | Nicolas Lœuillet | 2016-06-23 | 1 | -1/+3 | |
|\ \ \ \ | | | | | | | | | | | Add modules when NodeJS versions are too low. | |||||
| * | | | | Add modules when NodeJS versions are too low. | Thomas Citharel | 2016-06-23 | 1 | -1/+3 | |
|/ / / / | | | | | | | | | | | | | And eventually one required anyway. | |||||
* | | | | Merge branch 'master' into 2.1 | Jeremy Benoist | 2016-06-23 | 54 | -102/+133 | |
|\| | | | ||||||
| * | | | Merge pull request #2157 from wallabag/lower-upper-readingtime | Jeremy Benoist | 2016-06-23 | 2 | -7/+52 | |
| |\ \ \ | | | | | | | | | | | Handle only upper or only lower reading filter | |||||
| | * | | | Add some tests about readingTime | Jeremy Benoist | 2016-06-23 | 1 | -0/+36 | |
| | | | | | ||||||
| | * | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | When we select only one value in the reading time filter, we need to perform a query with only one value (greater than OR lower than). |