Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-08-22 | 2 | -4/+4 |
|\ | |||||
| * | Merge pull request #3323 from egilli/fix-export-link-with-baggy | Jérémy Benoist | 2017-08-14 | 1 | -3/+3 |
| |\ | | | | | | | Fix export links in baggy theme | ||||
| | * | Fix export links in baggy theme | Étienne Gilli | 2017-08-13 | 1 | -3/+3 |
| |/ | |||||
| * | Merge pull request #3322 from braco/patch-1 | Jérémy Benoist | 2017-08-12 | 1 | -1/+1 |
| |\ | | | | | | | Update Readme with crucial information | ||||
| | * | Update Readme with crucial information | braco | 2017-08-10 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #3326 from nclsHart/reload-entry-command | Jérémy Benoist | 2017-08-22 | 4 | -2/+224 |
|\ \ | | | | | | | Add reload entry command | ||||
| * | | rename getAllEntriesIdAndUrl into findAllEntriesIdAndUrlByUserId | Nicolas Hart | 2017-08-22 | 2 | -2/+2 |
| | | | |||||
| * | | rename getAllEntriesId into findAllEntriesIdByUserId | Nicolas Hart | 2017-08-22 | 2 | -2/+2 |
| | | | |||||
| * | | Add reload entry command | Nicolas Hart | 2017-08-21 | 3 | -0/+222 |
|/ / | |||||
* | | Merge pull request #3319 from Quent-in/2.3 | Jérémy Benoist | 2017-08-10 | 1 | -2/+2 |
|\ \ | | | | | | | Translation : OC small changes | ||||
| * | | Small change | Quent-in | 2017-08-09 | 1 | -2/+2 |
| | | | | | | | | | Apostrophe par erreur, et "aller À votre compte" et non "sur", pas choquant mais mieux je pense en OC. | ||||
* | | | Merge pull request #3314 from nclsHart/fix-3313 | Jérémy Benoist | 2017-08-08 | 3 | -39/+23 |
|\ \ \ | | | | | | | | | Reduce number of queries on tag list | ||||
| * | | | Reduce number of queries on tag list | Nicolas Hart | 2017-08-06 | 3 | -39/+23 |
| | | | | |||||
* | | | | Merge pull request #3317 from wallabag/mruminski-patch-1 | Jérémy Benoist | 2017-08-08 | 1 | -13/+13 |
|\ \ \ \ | |/ / / |/| | | | Update messages.pl.yml | ||||
| * | | | Update messages.pl.yml | Mateusz Rumiński | 2017-08-08 | 1 | -13/+13 |
|/ / / | | | | | | | add polish translation for credentials | ||||
* | | | Merge pull request #3312 from Quent-in/2.3 | Jérémy Benoist | 2017-08-06 | 3 | -42/+42 |
|\| | | | | | | | | Occitan language updates | ||||
| * | | Correction apostrophe encadrée par simples apostrophes | Quent-in | 2017-08-05 | 1 | -1/+1 |
| | | | |||||
| * | | Correction indent. L538 | Quent-in | 2017-08-05 | 1 | -1/+1 |
| | | | | | | | | | Correction indentation suite rapport Travis | ||||
| * | | Update | Quent-in | 2017-08-05 | 1 | -3/+3 |
| | | | | | | | | | | | | 2FA : choix des occitanophones interrogés : autentificacion en dos temps. + fautes de frappes | ||||
| * | | Update OC: correction fautes de frappe | Quent-in | 2017-08-05 | 1 | -16/+16 |
| | | | |||||
| * | | Update with new strings | Quent-in | 2017-08-05 | 1 | -21/+21 |
| | | | | | | | | | L538 : not quite sure about the number of space. | ||||
| * | | Update registration using API | Quent-in | 2017-08-05 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #3311 from nclsHart/makefile-webpack | Jérémy Benoist | 2017-08-05 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | Fix make build by replacing grunt with webpack | ||||
| * | | Fix make build by replacing grunt with webpack | Nicolas Hart | 2017-08-05 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #3301 from nclsHart/list-user-command | Jérémy Benoist | 2017-08-02 | 3 | -0/+149 |
|\ \ \ | |/ / |/| | | Add list users command | ||||
| * | | add search argument and limit option to list users command | Nicolas Hart | 2017-07-31 | 3 | -3/+83 |
| | | | |||||
| * | | Add list user command | Nicolas Hart | 2017-07-30 | 2 | -0/+69 |
|/ / | |||||
* | | Merge pull request #3297 from nclsHart/commands-better-rendering | Jérémy Benoist | 2017-07-30 | 8 | -77/+78 |
|\ \ | | | | | | | Better rendering for all core commands | ||||
| * | | Better rendering for all core commands | Nicolas Hart | 2017-07-29 | 8 | -77/+78 |
| | | | |||||
* | | | Merge pull request #3298 from nclsHart/fix-namespace-phpdoc | Jérémy Benoist | 2017-07-30 | 9 | -8/+17 |
|\ \ \ | | | | | | | | | Fix some namespaces and phpdoc | ||||
| * | | | Fix some namespaces and phpdoc | Nicolas Hart | 2017-07-29 | 9 | -8/+17 |
| | | | | |||||
* | | | | Merge pull request #3299 from nclsHart/missing-method-prepare-entry | Jérémy Benoist | 2017-07-30 | 1 | -0/+2 |
|\ \ \ \ | |/ / / |/| | | | Add missing abstract method prepareEntry in BrowserImport | ||||
| * | | | Add missing abstract method prepareEntry in BrowserImport | Nicolas Hart | 2017-07-29 | 1 | -0/+2 |
|/ / / | |||||
* | | | Merge pull request #3290 from nclsHart/fix-3019 | Jérémy Benoist | 2017-07-29 | 14 | -1/+14 |
|\ \ \ | |/ / |/| | | Add a dedicated title for all entries page | ||||
| * | | add a dedicated title for all entries page | Nicolas Hart | 2017-07-27 | 14 | -1/+14 |
| | | | |||||
* | | | Merge pull request #3291 from nclsHart/show-user-io | Jérémy Benoist | 2017-07-28 | 1 | -10/+13 |
|\ \ \ | | | | | | | | | Better rendering for show user command using symfony style | ||||
| * | | | Better rendering for show user command using symfony style | Nicolas Hart | 2017-07-27 | 1 | -10/+13 |
| |/ / | |||||
* | | | Merge pull request #3292 from nclsHart/remove-getdoctrine | Jérémy Benoist | 2017-07-28 | 3 | -15/+0 |
|\ \ \ | | | | | | | | | Remove unused method getDoctrine in several commands | ||||
| * | | | Remove unused method getDoctrine in several commands | Nicolas Hart | 2017-07-27 | 3 | -15/+0 |
| |/ / | |||||
* | | | Merge pull request #3293 from nclsHart/remove-unused-use | Jérémy Benoist | 2017-07-28 | 1 | -1/+0 |
|\ \ \ | | | | | | | | | Remove unused use statement in install command | ||||
| * | | | Remove unused use statement in install command | Nicolas Hart | 2017-07-27 | 1 | -1/+0 |
| |/ / | |||||
* | | | Merge pull request #3280 from Simounet/fix/2.3-date | Jérémy Benoist | 2017-07-25 | 2 | -2/+42 |
|\ \ \ | | | | | | | | | Fix updatePublishedAt on already parsed article's date | ||||
| * | | | Add a test for updatePublishedAt | Jeremy Benoist | 2017-07-24 | 2 | -3/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid error when a content is re-submitted and it previously add a published date. Also, fix the `testPostSameEntry` | ||||
| * | | | Fix updatePublishedAt on already parsed article's date | Simounet | 2017-07-24 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #3284 from wallabag/travis-7.2 | Jérémy Benoist | 2017-07-24 | 1 | -0/+2 |
|\ \ \ \ | |/ / / |/| | | | Testing on PHP 7.2 | ||||
| * | | | Testing on PHP 7.2 | Jérémy Benoist | 2017-07-24 | 1 | -0/+2 |
|/ / / | |||||
* | | | Merge pull request #3283 from wallabag/fix-language-validation | Jérémy Benoist | 2017-07-24 | 2 | -7/+7 |
|\ \ \ | |/ / |/| | | Put the final URL in data test | ||||
| * | | CS | Jeremy Benoist | 2017-07-24 | 1 | -6/+6 |
| | | | |||||
| * | | Put the final URL in data test | Jeremy Benoist | 2017-07-24 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #3266 from egilli/export-domain-as-author | Jérémy Benoist | 2017-07-11 | 4 | -6/+35 |
|\ \ | | | | | | | Use the article publisher as author for exported files |