Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Added shortcuts | Nicolas Lœuillet | 2016-11-15 | 16 | -6/+121 | |
|/ / / | ||||||
* | | | Merge pull request #2566 from wallabag/add-unmarkit | Nicolas Lœuillet | 2016-11-09 | 24 | -34/+125 | |
|\ \ \ | | | | | | | | | Added unmark.it sharing | |||||
| * | | | Added unmark.it sharing | Nicolas Lœuillet | 2016-11-09 | 24 | -34/+125 | |
| | | | | | | | | | | | | | | | | Fix #668 | |||||
* | | | | Merge pull request #2564 from wallabag/mruminski-patch-1 | Nicolas Lœuillet | 2016-11-09 | 1 | -5/+5 | |
|\ \ \ \ | |/ / / |/| | | | Update messages.pl.yml | |||||
| * | | | Update messages.pl.yml | Mateusz Rumiński | 2016-11-08 | 1 | -5/+5 | |
|/ / / | | | | | | | translate Pinboard importer section to polish | |||||
* | | | Merge pull request #2553 from wallabag/add-tagform-mobile | Nicolas Lœuillet | 2016-11-08 | 15 | -13/+51 | |
|\ \ \ | | | | | | | | | Added new tag form in mobile view for Material theme | |||||
| * | | | Added new tag form in mobile view for Material theme | Nicolas Lœuillet | 2016-11-08 | 15 | -13/+51 | |
|/ / / | | | | | | | | | | Fix #2376 | |||||
* | | | Merge pull request #2548 from wallabag/pinboard | Jeremy Benoist | 2016-11-08 | 29 | -10/+672 | |
|\ \ \ | | | | | | | | | Add Pinboard import | |||||
| * | | | docs: update german import.rst | Strubbl | 2016-11-07 | 1 | -21/+18 | |
| | | | | ||||||
| * | | | Use more explicit check | Jeremy Benoist | 2016-11-07 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Add english doc into german one | Jeremy Benoist | 2016-11-06 | 1 | -5/+44 | |
| | | | | ||||||
| * | | | Update messages.en.yml | Strubbl | 2016-11-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | Instapaper->Pinboard | |||||
| * | | | Update messages.de.yml | Strubbl | 2016-11-06 | 1 | -3/+3 | |
| | | | | ||||||
| * | | | Add doc | Jeremy Benoist | 2016-11-06 | 2 | -0/+32 | |
| | | | | ||||||
| * | | | Fix tests | Jeremy Benoist | 2016-11-06 | 2 | -2/+2 | |
| | | | | ||||||
| * | | | Add Pinboard import | Jeremy Benoist | 2016-11-04 | 24 | -2/+596 | |
| | | | | ||||||
* | | | | Merge pull request #2551 from wallabag/remove-maintenance-bundle | Jeremy Benoist | 2016-11-06 | 9 | -112/+0 | |
|\ \ \ \ | |/ / / |/| | | | Removed Maintenance bundle | |||||
| * | | | Removed Maintenance bundle | Nicolas Lœuillet | 2016-11-06 | 9 | -112/+0 | |
|/ / / | ||||||
* | | | Merge pull request #2541 from wallabag/mruminski-patch-1 | Jeremy Benoist | 2016-11-04 | 1 | -5/+5 | |
|\ \ \ | | | | | | | | | Update messages.pl.yml | |||||
| * | | | Update messages.pl.yml | Mateusz Rumiński | 2016-11-04 | 1 | -5/+5 | |
| | | | | | | | | | | | | missing polish translation added | |||||
* | | | | Merge pull request #2540 from wallabag/Quent-in-patch-1 | Thomas Citharel | 2016-11-04 | 1 | -19/+19 | |
|\ \ \ \ | |/ / / |/| | | | Update of the OC version | |||||
| * | | | Update of the OC version | Quent-in | 2016-11-04 | 1 | -19/+19 | |
|/ / / | ||||||
* | | | Merge pull request #2535 from wallabag/default-sort-2.2 | Jeremy Benoist | 2016-11-04 | 3 | -2/+59 | |
|\ \ \ | | | | | | | | | Use created_at as default sort | |||||
| * | | | Add index into Table definition | Jeremy Benoist | 2016-11-04 | 1 | -1/+5 | |
| | | | | ||||||
| * | | | Use created_at as default sort | Jeremy Benoist | 2016-11-04 | 2 | -1/+54 | |
|/ / / | | | | | | | | | | With index (following https://github.com/wallabag/wallabag/pull/2534) | |||||
* | | | Cleanup | Jeremy Benoist | 2016-11-03 | 7 | -29/+6 | |
| | | | ||||||
* | | | Fix rest controller merge | Jeremy Benoist | 2016-11-03 | 4 | -0/+141 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-11-03 | 60 | -1936/+2477 | |
|\| | | ||||||
| * | | Merge pull request #2530 from wallabag/add-doc-failed-load-external-entity | Nicolas Lœuillet | 2016-11-02 | 3 | -0/+21 | |
| |\ \ | | | | | | | | | Added documentation about failed to load external entity error | |||||
| | * | | Update faq.rst | Jeremy Benoist | 2016-11-02 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | update German faq.rst | Strubbl | 2016-11-02 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | update German faq.rst | Strubbl | 2016-11-02 | 1 | -4/+4 | |
| | | | | ||||||
| | * | | Added more info about Doctrine / PHP bug | Nicolas Lœuillet | 2016-11-02 | 3 | -0/+6 | |
| | | | | ||||||
| | * | | Added documentation about failed to load external entity error | Nicolas Lœuillet | 2016-11-02 | 3 | -0/+15 | |
| |/ / | | | | | | | | | | Fix #2529 | |||||
| * | | Merge pull request #2519 from Jibec/master | Jeremy Benoist | 2016-11-02 | 4 | -373/+373 | |
| |\ \ | | | | | | | | | Translation update - French | |||||
| | * | | wallabag is full lowercase | Jeremy Benoist | 2016-11-02 | 1 | -7/+7 | |
| | | | | ||||||
| | * | | Translation - French - tiny typo | Jean-Baptiste | 2016-10-31 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Translation - French - tiny escape correction | Jean-Baptiste | 2016-10-31 | 1 | -24/+24 | |
| | | | | ||||||
| | * | | Translation - French - tiny escape correction | Jean-Baptiste | 2016-10-31 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Translation update - French | Jean-Baptiste | 2016-10-30 | 1 | -4/+4 | |
| | | | | ||||||
| | * | | Translation update - French | Jean-Baptiste | 2016-10-30 | 2 | -367/+367 | |
| | | | | ||||||
| | * | | Translation update - French | Jean-Baptiste | 2016-10-30 | 0 | -0/+0 | |
| | | | | ||||||
| | * | | Translation update - French | Jean-Baptiste | 2016-10-30 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge pull request #2528 from Kdecherf/slashdot-cookie | Jeremy Benoist | 2016-11-01 | 1 | -0/+1 | |
| |\ \ \ | | | | | | | | | | | Force user-agent for .slashdot.org | |||||
| | * | | | Force user-agent for .slashdot.org | Kevin Decherf | 2016-11-01 | 1 | -0/+1 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Slashdot replaces actual content with a form regarding cookies when requests originate from France. By forcing the user-agent, the warning seems to go away. Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | |||||
| * | | | Merge pull request #2524 from lologhi/instapaper-cli-import | Nicolas Lœuillet | 2016-11-01 | 1 | -0/+3 | |
| |\ \ \ | | | | | | | | | | | Add Instapaper to CLI import | |||||
| | * | | | Add Instapaper to CLI import | Laurent | 2016-11-01 | 1 | -0/+3 | |
| |/ / / | ||||||
| * | | | Merge pull request #2521 from foxmask/master | Nicolas Lœuillet | 2016-10-31 | 3 | -9/+9 | |
| |\ \ \ | | | | | | | | | | | fix path for the install scripts | |||||
| | * | | | fix path for in install scripts | FoxMaSk | 2016-10-30 | 3 | -3/+3 | |
| | | | | | ||||||
| | * | | | fix path for in install scripts | FoxMaSk | 2016-10-30 | 3 | -9/+9 | |
| | | | | |