Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #2252 from wallabag/fix-last-merge | Nicolas Lœuillet | 2016-09-02 | 6 | -108/+4 | |
|\ \ \ | | | | | | | | | Fixed last merge who caused CSS/JS bugs | |||||
| * | | | Add tinydot to material concat | Jeremy Benoist | 2016-09-02 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Fixed last merge who caused CSS/JS bugs | Nicolas Lœuillet | 2016-08-30 | 5 | -108/+3 | |
| | | | | ||||||
* | | | | Merge pull request #2242 from wallabag/fix-minor-css | Jeremy Benoist | 2016-09-01 | 4 | -26/+45 | |
|\ \ \ \ | | | | | | | | | | | Fix print / article views | |||||
| * | | | | CSS indentation | Nicolas Lœuillet | 2016-09-01 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Fixed print view for baggy theme | Nicolas Lœuillet | 2016-08-26 | 2 | -21/+26 | |
| | | | | | ||||||
| * | | | | Fix print / article views | Nicolas Lœuillet | 2016-08-26 | 2 | -5/+19 | |
| | | | | | ||||||
* | | | | | Merge pull request #2258 from mruminski/2.1 | Nicolas Lœuillet | 2016-09-01 | 1 | -10/+10 | |
|\ \ \ \ \ | | | | | | | | | | | | | Update messages.pl.yml | |||||
| * | | | | | Update messages.pl.yml | Mateusz Rumiński | 2016-09-01 | 1 | -10/+10 | |
|/ / / / / | | | | | | | | | | | add missing polish translations | |||||
* | | | | | Merge pull request #2255 from wallabag/readability | Jeremy Benoist | 2016-09-01 | 24 | -17/+716 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | Add Readability import | |||||
| * | | | | Added documentation for Readability migration | Nicolas Lœuillet | 2016-09-01 | 2 | -9/+32 | |
| | | | | | ||||||
| * | | | | Add Readability to Quickstart page | Jeremy Benoist | 2016-09-01 | 12 | -0/+12 | |
| | | | | | ||||||
| * | | | | Add tests on ReadabilityImport | Jeremy Benoist | 2016-09-01 | 4 | -2/+297 | |
| | | | | | ||||||
| * | | | | Add missing translations | Jeremy Benoist | 2016-09-01 | 11 | -8/+49 | |
| | | | | | ||||||
| * | | | | Fix import count tests | Jeremy Benoist | 2016-09-01 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Add Readability import | Jeremy Benoist | 2016-09-01 | 6 | -0/+328 | |
|/ / / / | | | | | | | | | | | | | Based on the JSON export instead of the API (which will be shutting down by the September 30, 2016) | |||||
* | | | | Merge remote-tracking branch 'origin/master' into 2.1 | Jeremy Benoist | 2016-08-28 | 13 | -6/+192 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Occitan version | Quent-in | 2016-08-27 | 1 | -0/+11 | |
| | | | | | | | | | | | | | | | | Occitan translation, I hope I properly put it where it has to be. If there reminds other textes to translate, please let me know! | |||||
| * | | | Merge pull request #2241 from modos189/v2-issue-1991 | Jeremy Benoist | 2016-08-26 | 1 | -0/+4 | |
| |\ \ \ | | | | | | | | | | | Fix issue #1991: correction of the height field to add articles | |||||
| | * | | | Fix issue #1991: correction of the height field to add articles | Alexandr Danilov | 2016-08-26 | 1 | -0/+4 | |
| |/ / / | ||||||
| * | | | Merge pull request #2238 from modos189/v2-improve-view | Thomas Citharel | 2016-08-25 | 5 | -18/+83 | |
| |\ \ \ | | | | | | | | | | | V2 improve view | |||||
| | * | | | A new version of the plugin tinydot with update on window resize | Alexandr Danilov | 2016-08-25 | 3 | -17/+81 | |
| | | | | | ||||||
| | * | | | Changes in the login form: | Alexandr Danilov | 2016-08-25 | 2 | -1/+2 | |
| |/ / / | | | | | | | | | | | | | | | | | * The alignment of the login form centered in WebKit * Indent after the reference password recovery | |||||
| * | | | Merge pull request #2236 from wallabag/allow-failure-php-7.1 | Jeremy Benoist | 2016-08-24 | 1 | -0/+1 | |
| |\ \ \ | | | | | | | | | | | Allow failure for PHP 7.1 | |||||
| | * | | | Allow failure for PHP 7.1 | Jeremy Benoist | 2016-08-24 | 1 | -0/+1 | |
| |/ / / | | | | | | | | | Got tired of `EE/home/travis/build.sh: line 45: 4445 Segmentation fault (core dumped) phpunit -v` using PHP 7.1.0beta3 | |||||
| * | | | Merge pull request #2234 from cstuder/patch-1 | Nicolas Lœuillet | 2016-08-24 | 3 | -3/+3 | |
| |\ \ \ | | | | | | | | | | | Fixes mailto link in documentation | |||||
| | * | | | Fixes mailto link in german translation | Christian Studer | 2016-08-24 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Fixes mailto link in french translation | Christian Studer | 2016-08-24 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Fixes mailto link | Christian Studer | 2016-08-24 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge pull request #2235 from wallabag/german-doc-config | Nicolas Lœuillet | 2016-08-24 | 2 | -0/+57 | |
| |\ \ \ \ | | |/ / / | |/| | | | Add configuration for german documentation | |||||
| | * | | | Add configuration for german documentation | Nicolas Lœuillet | 2016-08-24 | 2 | -0/+57 | |
| |/ / / | ||||||
| * | | | Merge pull request #2230 from modos189/issue_2055 | Nicolas Lœuillet | 2016-08-23 | 5 | -1/+48 | |
| |\ \ \ | | | | | | | | | | | Cut entries title in card view: continued | |||||
| | * | | | Replacement plugin dotdotdot (6.7 KB) on my tinydot (315 bytes) | Alexandr Danilov | 2016-08-23 | 5 | -773/+41 | |
| | | | | | ||||||
| | * | | | Simplify the initialization of the plugin dotdotdot | Alexandr Danilov | 2016-08-22 | 2 | -2/+1 | |
| | | | | | ||||||
| | * | | | Added the jquery library dotdotdot ( http://dotdotdot.frebsite.nl/ ) that ↵ | Alexandr Danilov | 2016-08-22 | 5 | -0/+780 | |
| | | | | | | | | | | | | | | | | | | | | allows you to clip a text on the second line and fixed cut entries title in card view | |||||
| | * | | | Don't cut entries title in card view | Baptiste Mille-Mathias | 2016-05-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | Stop cutting titles arbitrary at caracter 42. | |||||
| * | | | | Update SymfonyRequirements | Jeremy Benoist | 2016-08-23 | 1 | -3/+10 | |
| | | | | | ||||||
* | | | | | Merge pull request #2243 from wallabag/feature-untagged-entries | Jeremy Benoist | 2016-08-28 | 18 | -1/+78 | |
|\ \ \ \ \ | | | | | | | | | | | | | Add untagged entries | |||||
| * | | | | | Add missing translations | Jeremy Benoist | 2016-08-28 | 10 | -0/+11 | |
| | | | | | | ||||||
| * | | | | | Add tests for untagged entries | Nicolas Lœuillet | 2016-08-28 | 1 | -0/+10 | |
| | | | | | | ||||||
| * | | | | | Add untagged entries | Nicolas Lœuillet | 2016-08-28 | 17 | -1/+57 | |
|/ / / / / | | | | | | | | | | | | | | | | Fix #1631 | |||||
* | | | | | Merge pull request #2245 from wallabag/change-page-title | Jeremy Benoist | 2016-08-28 | 3 | -26/+15 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Changed where page title is displayed | |||||
| * | | | | Changed where page title is displayed | Nicolas Lœuillet | 2016-08-26 | 3 | -26/+15 | |
|/ / / / | ||||||
* | | | | Merge pull request #2240 from wallabag/add-icon-public-share | Jeremy Benoist | 2016-08-26 | 2 | -1/+5 | |
|\ \ \ \ | | | | | | | | | | | Add icon for public share link | |||||
| * | | | | Add icon for public share link | Nicolas Lœuillet | 2016-08-25 | 2 | -1/+5 | |
|/ / / / | ||||||
* | | | | Merge pull request #2237 from wallabag/add-original-url-public-entry | Nicolas Lœuillet | 2016-08-25 | 1 | -0/+1 | |
|\ \ \ \ | | | | | | | | | | | Add original link in public view of the article | |||||
| * | | | | Remove text about original URL in public view | Nicolas Lœuillet | 2016-08-25 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Add original link in public view of the article | Nicolas Lœuillet | 2016-08-25 | 1 | -0/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #1904 from wallabag/feature-public-mode | Jeremy Benoist | 2016-08-25 | 33 | -9/+346 | |
|\ \ \ \ | | | | | | | | | | | Share entry with a public URL | |||||
| * | | | | Update test | Jeremy Benoist | 2016-08-24 | 3 | -18/+41 | |
| | | | | | | | | | | | | | | | | | | | | and some cleanup |