Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|/ | |||||
* | Merge pull request #3372 from wallabag/translate-export-page | Nicolas Lœuillet | 2017-10-11 | 14 | -8/+47 |
|\ | |||||
| * | CS | Jeremy Benoist | 2017-10-11 | 1 | -3/+3 |
| * | Fixed @j0k3r's review | Nicolas Lœuillet | 2017-10-11 | 1 | -0/+1 |
| * | Fixed @tcitworld's review | Nicolas Lœuillet | 2017-10-11 | 2 | -7/+3 |
| * | Translated first page of exported article | Nicolas Lœuillet | 2017-10-11 | 14 | -2/+44 |
|/ | |||||
* | Merge pull request #3376 from wallabag/symfony-3.3 | Jérémy Benoist | 2017-10-11 | 44 | -68/+90 |
|\ | |||||
| * | Fix MondeDiplo https url | Jeremy Benoist | 2017-10-10 | 1 | -1/+1 |
| * | CS | Jeremy Benoist | 2017-10-09 | 27 | -37/+37 |
| * | Jump to Symfony 3.3 & update others deps | Jeremy Benoist | 2017-10-09 | 18 | -30/+52 |
* | | Merge pull request #3378 from wallabag/2.3-ru | Jérémy Benoist | 2017-10-10 | 5 | -0/+617 |
|\ \ | |/ |/| | |||||
| * | update Russian language | Олег | 2017-10-10 | 3 | -90/+96 |
| * | add Russian language | Олег | 2017-10-10 | 2 | -0/+12 |
| * | Add Russian language in CoreBundle Resources and CraueConfigBundle | Олег | 2017-10-10 | 2 | -0/+599 |
|/ | |||||
* | Merge pull request #3347 from Kdecherf/entry-stats | Nicolas Lœuillet | 2017-09-16 | 1 | -2/+7 |
|\ | |||||
| * | Entry view: update .stats margins and color | Kevin Decherf | 2017-09-09 | 1 | -2/+7 |
* | | Merge pull request #3345 from wallabag/Quent-in-patch-1 | Jérémy Benoist | 2017-09-09 | 1 | -1/+1 |
|\ \ | |||||
| * | | Update messages.oc.yml | Quent-in | 2017-09-09 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #3340 from Kdecherf/fix-webpack | Jérémy Benoist | 2017-09-07 | 2 | -2/+2 |
|\ \ | |||||
| * | | Fix webpack error on comments | Kevin Decherf | 2017-09-06 | 2 | -2/+2 |
| |/ | |||||
* | | Merge pull request #3309 from wallabag/fix-multiple-tag-search | Jérémy Benoist | 2017-09-07 | 5 | -10/+36 |
|\ \ | |||||
| * | | Remove unused function | Jeremy Benoist | 2017-09-06 | 1 | -20/+0 |
| * | | Fix tests | Jeremy Benoist | 2017-09-06 | 2 | -2/+3 |
| * | | Multiple tag search was broken from API | Jeremy Benoist | 2017-09-06 | 5 | -10/+55 |
|/ / | |||||
* | | Merge pull request #3332 from nclsHart/better-txt-export | Nicolas Lœuillet | 2017-09-06 | 2 | -2/+5 |
|\ \ | |/ |/| | |||||
| * | better entry txt export using html2text | Nicolas Hart | 2017-08-27 | 2 | -2/+5 |
* | | Merge pull request #3337 from strobeltobias/patch-1 | Jérémy Benoist | 2017-09-04 | 1 | -90/+90 |
|\ \ | |||||
| * | | Update messages.de.yml | Jérémy Benoist | 2017-09-04 | 1 | -1/+1 |
| * | | Update to comply with suggested changes | Tobias Strobel | 2017-09-03 | 1 | -7/+7 |
| * | | Add missing quotation marks and small fixes (2) | Tobias Strobel | 2017-09-01 | 1 | -90/+90 |
* | | | Merge pull request #3333 from Quent-in/2.3 | Jérémy Benoist | 2017-09-03 | 4 | -60/+60 |
|\ \ \ | |||||
| * | | | Update wallabag_user.oc.yml | Quent-in | 2017-08-30 | 1 | -2/+2 |
| * | | | Update CraueConfigBundle.oc.yml | Quent-in | 2017-08-30 | 1 | -1/+1 |
| * | | | Update validators.oc.yml | Quent-in | 2017-08-30 | 1 | -2/+2 |
| * | | | Update | Quent-in | 2017-08-30 | 1 | -55/+55 |
| |/ / | |||||
* | | | Merge pull request #3139 from Kdecherf/2502-tag-case | Jérémy Benoist | 2017-09-03 | 6 | -6/+111 |
|\ \ \ | |||||
| * | | | php-cs-fixer on DoctrineMigrations/Version20170719231144 | Kevin Decherf | 2017-08-27 | 1 | -24/+24 |
| * | | | Fix tests | Jeremy Benoist | 2017-08-27 | 1 | -1/+1 |