Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2846 from wallabag/mruminski-patch-1 | Jeremy Benoist | 2017-02-06 | 1 | -6/+6 |
|\ | | | | | fix misspells in polish translation | ||||
| * | fix misspells in polish translation | Mateusz Rumiński | 2017-02-06 | 1 | -6/+6 |
|/ | |||||
* | Merge pull request #2842 from K-Phoen/update-rulerz | Jeremy Benoist | 2017-02-06 | 3 | -5/+4 |
|\ | | | | | Update RulerZ | ||||
| * | Update RulerZ | Kévin Gomez | 2017-02-05 | 3 | -5/+4 |
| | | |||||
* | | Merge pull request #2841 from Kdecherf/active-menu-search | Jeremy Benoist | 2017-02-05 | 1 | -4/+16 |
|\ \ | |/ |/| | Show active list in the left menu during search | ||||
| * | Show active list in the left menu during search | Kevin Decherf | 2017-02-05 | 1 | -4/+16 |
| | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | | Merge pull request #2788 from Zettt/master | Jeremy Benoist | 2017-02-05 | 1 | -0/+13 |
|\ \ | | | | | | | Documentation on how to configure mobile apps to work with wallabag.it | ||||
| * | | Added configuration documentation for mobile apps | Andreas Zeitler | 2017-02-05 | 1 | -0/+13 |
| | | | |||||
* | | | Merge pull request #2839 from foxmask/master | Jeremy Benoist | 2017-02-05 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | scripts/update.sh: 18: scripts/update.sh: composer.phar: not found | ||||
| * | | scripts/update.sh: 18: scripts/update.sh: composer.phar: not found | FoxMaSk | 2017-02-04 | 1 | -1/+1 |
| | | | | | | | | | when composer.phar is not globally installed, we should add "./" in front of "composer.phar" to run it from the current folder. | ||||
* | | | Merge pull request #2838 from wallabag/Quent-in-patch-1 | Jeremy Benoist | 2017-02-04 | 1 | -60/+60 |
|\ \ \ | | | | | | | | | Update Oc version | ||||
| * | | | Update Oc version | Quent-in | 2017-02-04 | 1 | -60/+60 |
| |/ / | | | | | | | I'll be ready for next train | ||||
* | | | Merge pull request #2840 from wallabag/fix-frameworkbundle | Jeremy Benoist | 2017-02-04 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Restored correct version for framework-extra-bundle | ||||
| * | | Restored correct version for framework-extra-bundle | Nicolas Lœuillet | 2017-02-04 | 1 | -1/+1 |
|/ / | | | | | The bundle was fixed in latest version. | ||||
* | | Merge pull request #2818 from Kdecherf/fix-search-bar | Nicolas Lœuillet | 2017-02-03 | 3 | -3/+5 |
|\ \ | | | | | | | Fix nav-panel-search height | ||||
| * | | Added minified CSS files | Nicolas Lœuillet | 2017-02-02 | 2 | -2/+2 |
| | | | |||||
| * | | Fix nav-panel-search height | Kevin Decherf | 2017-02-02 | 1 | -1/+3 |
|/ / | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | | Merge pull request #2831 from wallabag/Quent-in-patch-1 | Jeremy Benoist | 2017-02-02 | 1 | -6/+6 |
|\ \ | | | | | | | Update of CraueConfigBundle in Occitan | ||||
| * | | Update of CraueConfigBundle in Occitan | Quent-in | 2017-02-02 | 1 | -6/+6 |
|/ / | |||||
* | | Merge pull request #2824 from wallabag/simplify-strings | Nicolas Lœuillet | 2017-02-02 | 13 | -72/+72 |
|\ \ | | | | | | | Renamed Developer section to API client management | ||||
| * | | Freezed sensio/framework-extra-bundle version | Nicolas Lœuillet | 2017-02-02 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #2829 from wallabag/mruminski-patch-1 | Jeremy Benoist | 2017-02-02 | 1 | -5/+5 |
| |\ \ | | | | | | | | | Update polish strings | ||||
| | * | | Update polish strings | Mateusz Rumiński | 2017-02-01 | 1 | -5/+5 |
| |/ / | | | | | | | update missing polish strings | ||||
| * | | Update german strings. | Julian Oster | 2017-02-01 | 1 | -5/+5 |
| | | | |||||
| * | | Renamed Developer section to API client management | Nicolas Lœuillet | 2017-02-01 | 12 | -71/+71 |
| | | | |||||
* | | | Merge pull request #2826 from wallabag/jlnostr-patch-1 | Jeremy Benoist | 2017-02-02 | 1 | -40/+40 |
|\ \ \ | |/ / |/| | | Translate missing strings for de-DE. | ||||
| * | | Translate missing strings for de-DE. | Julian Oster | 2017-02-01 | 1 | -40/+40 |
|/ / | |||||
* | | Merge pull request #2816 from wallabag/add-details-update | Nicolas Lœuillet | 2017-01-31 | 3 | -0/+27 |
|\ \ | | | | | | | Added details about upgrade from 2.1.x or 2.2.0 | ||||
| * | | Added details about upgrade from 2.1.x or 2.2.0 | Nicolas Lœuillet | 2017-01-31 | 3 | -0/+27 |
|/ / | |||||
* | | Merge pull request #2812 from wallabag/prepare-221 | Nicolas Lœuillet | 2017-01-31 | 2 | -1/+5 |
|\ \ | | | | | | | Prepare wallabag 2.2.1 :rocket: | ||||
| * | | Prepare wallabag 2.2.1 :rocket: | Nicolas Lœuillet | 2017-01-31 | 2 | -1/+5 |
|/ / | |||||
* | | Merge pull request #2809 from wallabag/fix-22-migrations | Nicolas Lœuillet | 2017-01-31 | 4 | -2/+325 |
|\ \ | | | | | | | Fixed duplicate entry for share_public in craue_setting_table | ||||
| * | | Added check in migration about uuid field | Nicolas Lœuillet | 2017-01-30 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed duplicate entry for share_public in craue_setting_table | Nicolas Lœuillet | 2017-01-30 | 4 | -1/+324 |
|/ / | |||||
* | | Merge pull request #2790 from wallabag/prepare-220 | Nicolas Lœuillet | 2017-01-27 | 2 | -5/+89 |
|\ \ | | | | | | | Prepare wallabag 2.2.0 🚀 | ||||
| * | | Prepare wallabag 2.2.0 :rocket: | Nicolas Lœuillet | 2017-01-27 | 2 | -5/+89 |
|/ / | |||||
* | | Merge pull request #2789 from wallabag/add-index-starred-archived | Nicolas Lœuillet | 2017-01-27 | 7 | -0/+314 |
|\ \ | | | | | | | Added indexes on is_archived and is_starred | ||||
| * | | Fixed check on index | Nicolas Lœuillet | 2017-01-27 | 1 | -4/+2 |
| | | | |||||
| * | | Added indexes on is_archived and is_starred | Nicolas Lœuillet | 2017-01-27 | 7 | -0/+316 |
|/ / | |||||
* | | Merge pull request #2416 from wallabag/2.2 | Jeremy Benoist | 2017-01-27 | 282 | -1079/+9826 |
|\ \ | |/ |/| | wallabag 2.2.0 | ||||
| * | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2017-01-26 | 12 | -25/+31 |
| |\ | |/ |/| | |||||
* | | Merge pull request #2759 from wallabag/prepare-2162.1.6 | Nicolas Lœuillet | 2017-01-18 | 2 | -3/+9 |
|\ \ | | | | | | | Prepare wallabag 2.1.6 :rocket: | ||||
| * | | Prepare wallabag 2.1.6 :rocket: | Nicolas Lœuillet | 2017-01-17 | 2 | -3/+9 |
|/ / | |||||
* | | Merge pull request #2758 from wallabag/fix-public-sharing | Nicolas Lœuillet | 2017-01-17 | 9 | -22/+26 |
|\ \ | | | | | | | Fixed possible JS injection via the title edition | ||||
| * | | Fixed possible JS injection via the title edition | Nicolas Lœuillet | 2017-01-17 | 9 | -22/+26 |
|/ / | |||||
* | | Merge pull request #2736 from lex111/patch-1 | Thomas Citharel | 2017-01-04 | 2 | -2/+2 |
|\ \ | | | | | | | Update copyright year | ||||
| * | | Update copyright year in COPYING.md | Alexey Py | 2017-01-05 | 1 | -1/+1 |
| | | | |||||
| * | | Update copyright year | Alexey Py | 2017-01-04 | 1 | -1/+1 |
|/ / | |||||
| * | Merge pull request #2646 from wallabag/explain-migrations-in-doc | Nicolas Lœuillet | 2017-01-26 | 21 | -113/+2641 |
| |\ | | | | | | | Added explanations about migrations | ||||
| | * | Moved queries in a separate file | Nicolas Lœuillet | 2017-01-25 | 6 | -802/+2396 |
| | | |