Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2547 from wallabag/add-option-markasread | Jeremy Benoist | 2016-11-17 | 28 | -39/+335 |
|\ | | | | | Added a configuration to define the redirection after archiving an entry | ||||
| * | Fix migration | Jeremy Benoist | 2016-11-17 | 2 | -8/+14 |
| | | |||||
| * | CS | Jeremy Benoist | 2016-11-16 | 1 | -3/+0 |
| | | |||||
| * | Update unit test for Redirect | Jeremy Benoist | 2016-11-16 | 1 | -61/+43 |
| | | |||||
| * | Tried to fix tests | Nicolas Lœuillet | 2016-11-16 | 2 | -6/+60 |
| | | |||||
| * | Added tests | Nicolas Lœuillet | 2016-11-16 | 3 | -6/+78 |
| | | |||||
| * | Added constants for redirection values | Nicolas Lœuillet | 2016-11-16 | 3 | -3/+8 |
| | | |||||
| * | Update messages.en.yml | Strubbl | 2016-11-16 | 1 | -2/+2 |
| | | |||||
| * | Update messages.de.yml | Strubbl | 2016-11-16 | 1 | -22/+22 |
| | | |||||
| * | update German configuration.rst | Strubbl | 2016-11-16 | 1 | -5/+4 |
| | | |||||
| * | Added a configuration to define the redirection after archiving an entry | Nicolas Lœuillet | 2016-11-16 | 26 | -3/+184 |
|/ | | | | Fix #496 | ||||
* | Merge pull request #2495 from wallabag/add-shortcuts | Nicolas Lœuillet | 2016-11-16 | 25 | -44/+230 |
|\ | | | | | Added shortcuts | ||||
| * | Added CSS class on links | Nicolas Lœuillet | 2016-11-16 | 8 | -49/+49 |
| | | |||||
| * | Fix keyboard navigation on quickstart view | Thomas Citharel | 2016-11-15 | 5 | -278/+25 |
| | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | fix next/prev page | Thomas Citharel | 2016-11-15 | 3 | -13/+10 |
| | | |||||
| * | Bring navigation (with right, left and enter) on material entries page. ↵ | Thomas Citharel | 2016-11-15 | 12 | -24/+162 |
| | | | | | | | | | | | | | | | | Supports going to next and previous page ! Also better indentation for js files (changed editorconfig for them). Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | Reorganized JS folders for shortcuts | Nicolas Lœuillet | 2016-11-15 | 13 | -46/+124 |
| | | |||||
| * | es6 imports | Thomas Citharel | 2016-11-15 | 9 | -40/+57 |
| | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | Added new shortcuts | Nicolas Lœuillet | 2016-11-15 | 11 | -7/+90 |
| | | |||||
| * | Changed FOSJSRouting format in config | Nicolas Lœuillet | 2016-11-15 | 1 | -1/+12 |
| | | |||||
| * | 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 |
| | | |