Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3362 from sviande/fix_3361_api_warning | Jérémy Benoist | 2017-10-18 | 2 | -2/+2 |
|\ | | | | | Fix #3361 check type for tags in entry repository | ||||
| * | Fix #3361 Entry Rest controller getEntries cast tags params to string | Sébastien Viande | 2017-10-13 | 1 | -1/+1 |
| | | |||||
| * | Fix #3361 check type for tags in entry repository | Sébastien Viande | 2017-10-12 | 1 | -1/+1 |
| | | | | | | | | Check is $tags is a string before explode | ||||
* | | Replace kernel.root_dir by kernel.project_dir | Nicolas Hart | 2017-10-14 | 2 | -2/+2 |
|/ | | | | | kernel.root_dir and Kernel::getRootDir() are deprecated since Symfony 3.3. See https://symfony.com/blog/new-in-symfony-3-3-a-simpler-way-to-get-the-project-root-directory and https://github.com/symfony/symfony/blob/3.3/UPGRADE-3.3.md#httpkernel for more information. | ||||
* | 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 | 26 | -43/+43 |
|\ | | | | | Symfony 3.3 | ||||
| * | CS | Jeremy Benoist | 2017-10-09 | 22 | -30/+30 |
| | | |||||
| * | Jump to Symfony 3.3 & update others deps | Jeremy Benoist | 2017-10-09 | 5 | -13/+13 |
| | | | | | | | | Also update tests urls | ||||
* | | update Russian language | Олег | 2017-10-10 | 2 | -62/+68 |
| | | |||||
* | | add Russian language | Олег | 2017-10-10 | 1 | -0/+11 |
| | | |||||
* | | Add Russian language in CoreBundle Resources and CraueConfigBundle | Олег | 2017-10-10 | 1 | -0/+564 |
|/ | |||||
* | Update messages.oc.yml | Quent-in | 2017-09-09 | 1 | -1/+1 |
| | |||||
* | Remove unused function | Jeremy Benoist | 2017-09-06 | 1 | -20/+0 |
| | | | | Introduce after the rebase I guess | ||||
* | Fix tests | Jeremy Benoist | 2017-09-06 | 1 | -1/+1 |
| | |||||
* | Multiple tag search was broken from API | Jeremy Benoist | 2017-09-06 | 2 | -6/+48 |
| | | | | | | | | | | First, the setParameter() were done on the same parameter which in fact just duplicated the condition in the SQL query (like `where t.label = 'test' and t.label = 'test'`. Changed the parameter doesn't help because the query was then wrong. Changing the way to match associated tags for an entry and it worked. | ||||
* | Merge pull request #3332 from nclsHart/better-txt-export | Nicolas Lœuillet | 2017-09-06 | 1 | -1/+3 |
|\ | | | | | Better entry txt export using html2text | ||||
| * | better entry txt export using html2text | Nicolas Hart | 2017-08-27 | 1 | -1/+3 |
| | | |||||
* | | Merge pull request #3337 from strobeltobias/patch-1 | Jérémy Benoist | 2017-09-04 | 1 | -90/+90 |
|\ \ | | | | | | | Add missing quotation marks and small fixes (2) | ||||
| * | | 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 | 3 | -59/+59 |
|\ \ \ | | | | | | | | | Update OC | ||||
| * | | | Update wallabag_user.oc.yml | Quent-in | 2017-08-30 | 1 | -2/+2 |
| | | | | |||||
| * | | | 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 | 2 | -2/+2 |
|\ \ \ | |/ / |/| | | Ignore tag's case | ||||
| * | | Tag: render tags case-insensitive by storing them in lowercase | Kevin Decherf | 2017-08-27 | 2 | -2/+2 |
| |/ | | | | | | | | | | | Fixes #2502 Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | | Merge pull request #3330 from franek/set-starred-date | Jérémy Benoist | 2017-08-30 | 4 | -7/+56 |
|\ \ | | | | | | | Add starred_at field which is set when an entry is starred | ||||
| * | | Set a starred_at field when an entry is starred. | François D | 2017-08-25 | 4 | -7/+56 |
| |/ | | | | | | | | | | | | | | | This date is used to sort starred entries. Can not use Entry::timestamps method otherwise starred_at will be updated each time entry is updated. Add an updateStar method into Entry class A migration script has been added in order to set starred_at field. | ||||
* | | Merge pull request #3294 from wallabag/export-tag-null | Jérémy Benoist | 2017-08-30 | 2 | -2/+2 |
|\ \ | |/ |/| | Empty currentTag should be null | ||||
| * | Empty currentTag should be null | Jeremy Benoist | 2017-07-28 | 2 | -2/+2 |
| | | | | | | | | And when a parameter is null, it won't appear in the url like `?tag=`. | ||||
* | | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-08-22 | 1 | -3/+3 |
|\ \ | |||||
| * | | Fix export links in baggy theme | Étienne Gilli | 2017-08-13 | 1 | -3/+3 |
| | | | |||||
* | | | 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 | 2 | -0/+107 |
| | | | |||||
* | | | 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 |
| |/ / / | |||||
* / / / | Update messages.pl.yml | Mateusz Rumiński | 2017-08-08 | 1 | -13/+13 |
|/ / / | | | | | | | add polish translation for credentials | ||||
* | | | 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. | ||||
* | | | add search argument and limit option to list users command | Nicolas Hart | 2017-07-31 | 2 | -2/+33 |
| | | |