Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | typo and build on test | Thomas Citharel | 2016-10-04 | 3 | -3/+3 |
| | | |||||
| * | use airbnb base rules and update eslint | Thomas Citharel | 2016-10-04 | 8 | -11/+21 |
| | | |||||
| * | Fix icon position | Thomas Citharel | 2016-10-04 | 7 | -37/+40 |
| | | |||||
| * | Fixed calendar icon position with baggy theme | Nicolas Lœuillet | 2016-10-04 | 1 | -1/+2 |
| | | |||||
| * | Fixed icon position in share menu | Nicolas Lœuillet | 2016-10-04 | 8 | -43/+45 |
| | | |||||
| * | fix icons | Thomas Citharel | 2016-10-04 | 4 | -11/+10 |
| | | |||||
| * | Add eslint & stylelint tests (fix a few things) and move dependencies to dev | Thomas Citharel | 2016-10-04 | 14 | -82/+96 |
| | | |||||
| * | Update doc | Jeremy Benoist | 2016-10-04 | 9 | -13/+11 |
| | | | | | | | | Merge VALIDATE_TRANSLATION_FILE & ASSET build (less build on Travis) | ||||
| * | Fix font & Travis | Jeremy Benoist | 2016-10-04 | 80 | -54/+130001 |
| | | | | | | | | Grunt now copy fonts instead of symlink (node_modules won't exist for the end user) | ||||
| * | shaarli instead of Diaspora | Jeremy Benoist | 2016-10-04 | 1 | -1/+1 |
| | | |||||
| * | Update .travis.yml | Jeremy Benoist | 2016-10-04 | 1 | -1/+1 |
| | | |||||
| * | Fix grunt path | Thomas Citharel | 2016-10-04 | 1 | -1/+1 |
| | | |||||
| * | remove install scripts and tweak travis | Thomas Citharel | 2016-10-03 | 3 | -29/+3 |
| | | |||||
| * | Basically, fix everything | Thomas Citharel | 2016-10-03 | 88 | -56/+267 |
| | | | | | | | | | | | | * Remove install.sh * Assets are now provided * Icons font issues are fixed | ||||
* | | Merge pull request #2359 from wallabag/user-config | Nicolas Lœuillet | 2016-10-04 | 3 | -44/+0 |
|\ \ | | | | | | | Create config even if user is disabled | ||||
| * | | 👋 HHVM | Jeremy Benoist | 2016-10-04 | 1 | -20/+0 |
| | | | |||||
| * | | Create config even if user is disabled | Jeremy Benoist | 2016-10-04 | 2 | -24/+0 |
|/ / | | | | | | | | | When a user register itself AND the wallabag instance is configured to send a confirmation email, the user is disabled when the listener (which create the config) receive the event. There were a check (don't know why) if the user is enabled we create the config. But the user is disabled when confirmation email is actived. | ||||
* | | Merge pull request #2354 from Zayon/master | Nicolas Lœuillet | 2016-10-04 | 3 | -0/+3 |
|\ \ | |/ |/| | Add php-bcmath extension to requirements |