Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Changed tests | Nicolas Lœuillet | 2016-10-08 | 3 | -4/+4 |
| | |||||
* | Added tests | Nicolas Lœuillet | 2016-10-08 | 1 | -0/+85 |
| | |||||
* | Added check if there is only one user | Nicolas Lœuillet | 2016-10-08 | 17 | -1/+50 |
| | | | | Added translations and documentation | ||||
* | CS | Thomas Citharel | 2016-10-08 | 2 | -13/+13 |
| | |||||
* | work | Thomas Citharel | 2016-10-08 | 14 | -1/+65 |
| | |||||
* | Merge pull request #2399 from wallabag/use-locale-for-config | Jeremy Benoist | 2016-10-08 | 1 | -1/+1 |
|\ | | | | | Use default locale for user config | ||||
| * | Use default locale for user config | Jeremy Benoist | 2016-10-08 | 1 | -1/+1 |
| | | | | | | | | When creating a user, we set the language config “en” by default. We should use the defined locale (from `parameters.yml`) instead | ||||
* | | Merge pull request #2400 from wallabag/doc-env-prod | Jeremy Benoist | 2016-10-08 | 9 | -51/+51 |
|\ \ | |/ |/| | Set env to prod in documentation | ||||
| * | Set env to prod in documentation | Jeremy Benoist | 2016-10-08 | 9 | -51/+51 |
|/ | |||||
* | Merge pull request #2396 from wallabag/mruminski-patch-1 | Nicolas Lœuillet | 2016-10-07 | 1 | -1/+1 |
|\ | | | | | Update messages.pl.yml | ||||
| * | Update messages.pl.yml | Mateusz Rumiński | 2016-10-07 | 1 | -1/+1 |
| | | | | | | translated shared_by_wallabag to polish | ||||
* | | Merge pull request #2395 from wallabag/socket-connection | Nicolas Lœuillet | 2016-10-07 | 3 | -1/+6 |
|\ \ | |/ |/| | Add ability to use socket | ||||
| * | Add ability to use socket | Jeremy Benoist | 2016-10-07 | 3 | -1/+6 |
|/ | | | | For Redis & MySQL | ||||
* | Merge pull request #2386 from wallabag/update-changelog | Nicolas Lœuillet | 2016-10-07 | 2 | -240/+2438 |
|\ | | | | | Changed Changelog by using github-changelog-generator from @skywinder | ||||
| * | Update release process | Nicolas Lœuillet | 2016-10-07 | 1 | -0/+1 |
| | | |||||
| * | Changed Changelog by using github-changelog-generator from @skywinder | Nicolas Lœuillet | 2016-10-07 | 1 | -240/+2437 |
| | | |||||
* | | Merge pull request #2389 from wallabag/add-info-publich-articles | Nicolas Lœuillet | 2016-10-07 | 2 | -0/+3 |
|\ \ | | | | | | | Added default picture if preview picture is null | ||||
| * | | Added default picture if preview picture is null | Nicolas Lœuillet | 2016-10-07 | 2 | -0/+3 |
| | | | |||||
* | | | Merge pull request #2388 from wallabag/fix-2factor-user-admin | Nicolas Lœuillet | 2016-10-07 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | Fixed two-factor checkbox display in user admin panel | ||||
| * | | | Fixed two-factor checkbox display in user admin panel | Nicolas Lœuillet | 2016-10-07 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | Fix #2380 | ||||
* | | | | Merge pull request #2385 from wallabag/add-doc-about-siteconfig | Jeremy Benoist | 2016-10-07 | 2 | -6/+30 |
|\ \ \ \ | |/ / / |/| | | | Added documentation about siteconfig fix | ||||
| * | | | Fixed review | Nicolas Lœuillet | 2016-10-07 | 1 | -2/+2 |
| | | | | |||||
| * | | | Added link to fivefilters website | Nicolas Lœuillet | 2016-10-07 | 2 | -5/+5 |
| | | | | |||||
| * | | | Fixed review | Nicolas Lœuillet | 2016-10-07 | 2 | -3/+3 |
| | | | | |||||
| * | | | Added documentation about siteconfig fix | Nicolas Lœuillet | 2016-10-07 | 2 | -6/+30 |
| | |/ | |/| | | | | | | | Found in #2358, thank you @j0k3r | ||||
* | | | Merge pull request #2383 from wallabag/add-info-publich-articles | Nicolas Lœuillet | 2016-10-07 | 13 | -3/+35 |
|\ \ \ | |/ / |/| / | |/ | Added OpenGraph support for public articles | ||||
| * | Added test for OpenGraph | Nicolas Lœuillet | 2016-10-07 | 1 | -1/+4 |
| | | |||||
| * | Fixed review | Nicolas Lœuillet | 2016-10-07 | 12 | -21/+21 |
| | | |||||
| * | Added OpenGraph support for public articles | Nicolas Lœuillet | 2016-10-07 | 12 | -2/+31 |
| | | | | | | | | Fix #2289 | ||||
* | | Merge pull request #2332 from wallabag/tags-export | Jeremy Benoist | 2016-10-07 | 17 | -42/+84 |
|\ \ | |/ |/| | Fix relations export for Entry | ||||
| * | Fix tag test | Jeremy Benoist | 2016-10-07 | 3 | -13/+16 |
| | | |||||
| * | Fix bad translation key | Jeremy Benoist | 2016-10-07 | 11 | -11/+11 |
| | | | | | | | | `entry_reload_failed` instead of `entry_reloaded_failed` | ||||
| * | Fix relations export for Entry | Jeremy Benoist | 2016-10-07 | 5 | -19/+58 |
|/ | | | | | Tags & Annotations weren’t really well exported. This is now fixed (+ tests) | ||||
* | Merge pull request #2377 from wallabag/fix-exists-api | Thomas Citharel | 2016-10-05 | 2 | -1/+8 |
|\ | | | | | Fix exists API call | ||||
| * | Fix typo & add test | Jeremy Benoist | 2016-10-05 | 2 | -1/+8 |
| | | |||||
| * | Fix exists API call | Thomas Citharel | 2016-10-05 | 1 | -1/+1 |
| | | | | | | Boo | ||||
* | | Merge pull request #2374 from wallabag/clickable-tags | Jeremy Benoist | 2016-10-05 | 10 | -14/+40 |
|\ \ | | | | | | | Clickable tags | ||||
| * | | better tags on material | Thomas Citharel | 2016-10-05 | 5 | -7/+17 |
| | | | |||||
| * | | better tags on baggy | Thomas Citharel | 2016-10-04 | 5 | -7/+23 |
| | | | |||||
* | | | Merge pull request #2375 from wallabag/upgrade-nodejs | Thomas Citharel | 2016-10-05 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | try to reduce assets build npm connection failing by updating nodejs | ||||
| * | | try to reduce assets build npm connection failing by updating nodejs | Thomas Citharel | 2016-10-05 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #2363 from wallabag/clean-composer | Nicolas Lœuillet | 2016-10-04 | 1 | -4/+1 |
|\ \ | | | | | | | Remove mouf/nodejs-installer from composer | ||||
| * | | Remove mouf/nodejs-installer from composer | Jeremy Benoist | 2016-10-04 | 1 | -4/+1 |
|/ / | |||||
* / | Update md5 hash for package | Nicolas Lœuillet | 2016-10-04 | 5 | -5/+5 |
|/ | |||||
* | Merge pull request #2349 from wallabag/prepare-211 | Nicolas Lœuillet | 2016-10-04 | 9 | -13/+29 |
|\ | | | | | Prepare wallabag 2.1.1 | ||||
| * | Update CHANGELOG.md | Nicolas Lœuillet | 2016-10-04 | 1 | -1/+1 |
| | | |||||
| * | Typo | Jeremy Benoist | 2016-10-04 | 1 | -1/+1 |
| | | |||||
| * | Update CHANGELOG | Jeremy Benoist | 2016-10-04 | 1 | -2/+5 |
| | | |||||
| * | Prepare wallabag 2.1.1 | Nicolas Lœuillet | 2016-10-04 | 9 | -11/+24 |
|/ | |||||
* | Merge pull request #2353 from wallabag/assets-fix | Thomas Citharel | 2016-10-04 | 103 | -147/+130247 |
|\ | | | | | Basically, fix everything |