Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3422 from wallabag/simpleue-2 | Nicolas Lœuillet | 2017-11-19 | 2 | -1/+18 |
|\ | |||||
| * | Jump to Simpleue 2.0 | Jeremy Benoist | 2017-11-18 | 2 | -1/+18 |
* | | Merge pull request #3421 from comradekingu/patch-2 | Kevin Decherf | 2017-11-19 | 1 | -10/+10 |
|\ \ | |||||
| * | | "for the public wallabag demo", paywalled websites, diaspora* | Allan Nordhøy | 2017-11-18 | 1 | -3/+3 |
| * | | Spelling: diaspora, e-mail, moved ?, URL, sharing | Allan Nordhøy | 2017-11-18 | 1 | -8/+8 |
| |/ | |||||
* | | Merge pull request #3420 from comradekingu/patch-1 | Kevin Decherf | 2017-11-19 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Spelling: Two-factor for wallabag connection | Allan Nordhøy | 2017-11-18 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #3412 from aaa2000/fix-tests | Jérémy Benoist | 2017-11-12 | 2 | -6/+7 |
|\ | |||||
| * | Fix phpcs | adev | 2017-11-11 | 1 | -1/+1 |
| * | Fix tests | adev | 2017-11-11 | 2 | -6/+7 |
|/ | |||||
* | Merge pull request #3404 from wallabag/issue-2424 | Kevin Decherf | 2017-11-07 | 5 | -4/+15 |
|\ | |||||
| * | material: replace card activator with article link on card preview | Kevin Decherf | 2017-11-06 | 5 | -4/+15 |
|/ | |||||
* | Merge pull request #3397 from wallabag/issue-1871 | Kevin Decherf | 2017-11-06 | 4 | -2/+12 |
|\ | |||||
| * | Update assets for #3397 | Kevin Decherf | 2017-11-05 | 2 | -2/+2 |
| * | material: disable editing of entry url input when submitting new url | Kevin Decherf | 2017-11-05 | 2 | -0/+10 |
|/ | |||||
* | Merge pull request #3387 from Kdecherf/fix-assets-23 | Jérémy Benoist | 2017-11-02 | 116 | -411/+42 |
|\ | |||||
| * | Updating .gitignore | Kevin Decherf | 2017-10-24 | 2 | -4/+3 |
| * | Removing web/bundles/wallabagcore and adding prod assets in web/wallassets | Kevin Decherf | 2017-10-24 | 105 | -375/+7 |
| * | webpack & views: replace bundles/wallabagcore with wallassets | Kevin Decherf | 2017-10-24 | 9 | -32/+32 |
* | | Merge pull request #3399 from aaa2000/editorconfig-makefile | Jérémy Benoist | 2017-11-02 | 1 | -0/+3 |
|\ \ | |||||
| * | | Update .editorconfig for makefile | adev | 2017-11-01 | 1 | -0/+3 |
|/ / | |||||
* | | Merge pull request #3395 from wallabag/issue-3393 | Kevin Decherf | 2017-11-01 | 1 | -1/+1 |
|\ \ | |||||
| * | | views/config: fix overlaying drop down menu | Kevin Decherf | 2017-10-31 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #3392 from mart-e/add-title-page-epub | Jérémy Benoist | 2017-10-31 | 1 | -3/+3 |
|\ \ | |/ |/| | |||||
| * | Properly run php-cs-fixer | Jeremy Benoist | 2017-10-28 | 1 | -23/+23 |
| * | php-cs-fixer | Martin Trigaux | 2017-10-28 | 1 | -24/+24 |
| * | Set the title in a separated chapter | Martin Trigaux | 2017-10-28 | 1 | -5/+4 |
| * | add a title page | Martin Trigaux | 2017-10-28 | 1 | -1/+2 |
|/ | |||||
* | Merge pull request #3011 from wallabag/2.3 | Jérémy Benoist | 2017-10-23 | 666 | -147616/+21014 |
|\ | |||||
| * | Merge pull request #3385 from wallabag/prepare-23 | Nicolas Lœuillet | 2017-10-20 | 3 | -185/+84 |
| |\ | |||||
| | * | Prepare wallabag 2.3.0 | Nicolas Lœuillet | 2017-10-20 | 3 | -185/+84 |
| * | | Merge pull request #3384 from wallabag/mruminski-patch-1 | Nicolas Lœuillet | 2017-10-19 | 1 | -2/+2 |
| |\ \ | | |/ | |/| | |||||
| | * | Update messages.pl.yml | Mateusz Rumiński | 2017-10-19 | 1 | -2/+2 |
| |/ | |||||
| * | Merge pull request #3373 from wallabag/change-readingtime-notnull | Nicolas Lœuillet | 2017-10-18 | 2 | -2/+66 |
| |\ | |||||
| | * | Fixed @Kdecherf's review | Nicolas Lœuillet | 2017-10-13 | 1 | -0/+1 |
| | * | CS | Jeremy Benoist | 2017-10-13 | 1 | -3/+3 |
| | * | Changed reading_time field to prevent null values | Nicolas Lœuillet | 2017-10-13 | 2 | -2/+65 |
| * | | Merge pull request #3362 from sviande/fix_3361_api_warning | Jérémy Benoist | 2017-10-18 | 3 | -2/+9 |
| |\ \ | |||||
| | * | | Fix #3361 Entry Rest controller getEntries cast tags params to string | Sébastien Viande | 2017-10-13 | 1 | -1/+1 |
| | * | | CS | Jeremy Benoist | 2017-10-12 | 1 | -1/+1 |
| | * | | Fix #3361 add test | Sébastien Viande | 2017-10-12 | 1 | -0/+7 |
| | * | | Fix #3361 check type for tags in entry repository | Sébastien Viande | 2017-10-12 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge pull request #3383 from Kdecherf/fix-webpack-and-login | Nicolas Lœuillet | 2017-10-16 | 35 | -20/+682 |
| |\ \ | |||||
| | * | | Update prod assets | Kevin Decherf | 2017-10-16 | 32 | -18/+665 |
| | * | | webpack: handle _global img folder | Kevin Decherf | 2017-10-16 | 2 | -1/+16 |
| | * | | Fix non-centered login form | Kevin Decherf | 2017-10-16 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #3382 from nclsHart/replace-kernel-rootdir | Jérémy Benoist | 2017-10-15 | 11 | -20/+15 |
| |\ \ | |||||
| | * | | Replace kernel.root_dir by kernel.project_dir | Nicolas Hart | 2017-10-14 | 11 | -20/+15 |
| | |/ | |||||
| * | | Merge pull request #3381 from nclsHart/webserverbundle | Jérémy Benoist | 2017-10-15 | 1 | -0/+1 |
| |\ \ | | |/ | |/| | |||||
| | * | Enable WebServerBundle in dev environment | Nicolas Hart | 2017-10-13 | 1 | -0/+1 |
| |/ |