Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1807 from nikaro/patch-1 | Jeremy Benoist | 2016-03-21 | 1 | -1/+1 |
|\ | | | | | fix typo diaspora* share | ||||
| * | fix type diaspora* share | Nicolas | 2016-03-21 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1806 from wallabag/v2-translation-flash-baggy | Jeremy Benoist | 2016-03-21 | 1 | -1/+1 |
|\ | | | | | Translate flash message in baggy theme | ||||
| * | Translate flash message in baggy theme | Nicolas Lœuillet | 2016-03-21 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1774 from wallabag/v2-key-translation | Nicolas Lœuillet | 2016-03-21 | 115 | -2322/+4704 |
|\ | | | | | Switch to keys in translated files | ||||
| * | Update docs about translation | Jeremy Benoist | 2016-03-21 | 2 | -2/+2 |
| | | |||||
| * | Add reading time translation | Jeremy Benoist | 2016-03-21 | 12 | -7/+78 |
| | | |||||
| * | Put more validations on travis | Jeremy Benoist | 2016-03-21 | 3 | -1/+9 |
| | | | | | | | | | | Run php-cs-fixer to avoid CS on commits Add a check on translation message using the built-in yaml validator. It'll avoid typo in translation yaml files. | ||||
| * | Convert more languages | Jeremy Benoist | 2016-03-20 | 14 | -1064/+2851 |
| | | |||||
| * | Translation typos | Jeremy Benoist | 2016-03-20 | 1 | -3/+3 |
| | | | | | | | | Fix #1793 | ||||
| * | Add missing developer page | Jeremy Benoist | 2016-03-20 | 12 | -74/+176 |
| | | |||||
| * | Convert french translation | Jeremy Benoist | 2016-03-20 | 2 | -269/+346 |
| | | |||||
| * | CS | Jeremy Benoist | 2016-03-20 | 1 | -0/+2 |
| | | |||||
| * | Add flashes messages | Jeremy Benoist | 2016-03-20 | 11 | -40/+94 |
| | | |||||
| * | Improve test failure readability | Jeremy Benoist | 2016-03-20 | 3 | -16/+18 |
| | | | | | | | | | | If the response content isn't the one expected, instead of checking into the whole DOM (with node tag, etc ..) we only check the text. So if it fails, phpunit will display only the text, not all node tag. It'll be easier to read. | ||||
| * | Convert english translation file | Jeremy Benoist | 2016-03-20 | 80 | -864/+1141 |
| | | | | | | | | | | | | | | - convert english translation to translate key - remove baggy template for login (never used since user isn't logged in and it'll use the default theme: material) - fix tests about text in response (now checking translation key instead of translated text) - remove all ugly `<div class="hidden">{{ form_rest(form) }}</div>` | ||||
| * | Disable translation in test | Jeremy Benoist | 2016-03-20 | 1 | -0/+2 |
|/ | | | | We don't want to test translation in test | ||||
* | Revert "Transferring API Description file from Apiary.io" | Nicolas Lœuillet | 2016-03-18 | 1 | -80/+0 |
| | | | | This reverts commit 169d60abc7e0ee191bfb66ecb1fbbac14ab88095. | ||||
* | Transferring API Description file from Apiary.io | Nicolas Lœuillet | 2016-03-18 | 1 | -0/+80 |
| | |||||
* | Merge pull request #1767 from wallabag/v2-setting-for-reading-time | Jeremy Benoist | 2016-03-18 | 15 | -7/+103 |
|\ | | | | | Setting for reading time | ||||
| * | Improved tests | Nicolas Lœuillet | 2016-03-18 | 3 | -7/+18 |
| | | |||||
| * | Fix documentation and add help message in Baggy | Nicolas Lœuillet | 2016-03-18 | 3 | -4/+3 |
| | | |||||
| * | Replace slider with select | Nicolas Lœuillet | 2016-03-14 | 5 | -7/+14 |
| | | |||||
| * | Translation and documentation | Nicolas Lœuillet | 2016-03-14 | 3 | -0/+13 |
| | | |||||
| * | Fix default value and add baggy implementation | Nicolas Lœuillet | 2016-03-14 | 2 | -1/+10 |
| | | |||||
| * | Fixed fixtures for config | Nicolas Lœuillet | 2016-03-14 | 1 | -0/+3 |
| | | |||||
| * | Added setting to have a personal reading time | Nicolas Lœuillet | 2016-03-14 | 9 | -2/+56 |
| | | |||||
* | | Merge pull request #1799 from wallabag/v2-fix-tabs-display-material | Nicolas Lœuillet | 2016-03-18 | 1 | -0/+11 |
|\ \ | | | | | | | fix tabs display on mobile view | ||||
| * | | fix tabs display on mobile view | Thomas Citharel | 2016-03-16 | 1 | -0/+11 |
| | | | |||||
* | | | Merge pull request #1791 from wallabag/v2-fix-api-entry-properties | Jeremy Benoist | 2016-03-16 | 4 | -25/+98 |
|\ \ \ | |/ / |/| | | fix api properties and typo | ||||
| * | | add check | Thomas Citharel | 2016-03-16 | 1 | -2/+6 |
| | | | |||||
| * | | fix updating entry status through API | Thomas Citharel | 2016-03-16 | 1 | -6/+2 |
| | | | |||||
| * | | check if archive/star parameters without quotes work | Thomas Citharel | 2016-03-16 | 1 | -0/+49 |
| | | | |||||
| * | | use integers for archived/starred status | Thomas Citharel | 2016-03-16 | 3 | -22/+46 |
| | | | |||||
| * | | fix api properties and typo | Thomas Citharel | 2016-03-16 | 3 | -5/+5 |
|/ / | |||||
* | | Merge pull request #1797 from wallabag/v2-fix-adding-entry-API | Jeremy Benoist | 2016-03-16 | 2 | -4/+26 |
|\ \ | | | | | | | Don't add entry through API if it already exists | ||||
| * | | Don't add entry through API if it already exists | Thomas Citharel | 2016-03-16 | 2 | -4/+26 |
|/ / | |||||
* | | Merge pull request #1792 from wallabag/v2-add-tests-for-api-user | Jeremy Benoist | 2016-03-16 | 1 | -0/+6 |
|\ \ | |/ |/| | add tests on user in API responses | ||||
| * | add tests on user in API responses | Thomas Citharel | 2016-03-15 | 1 | -0/+6 |
|/ | |||||
* | Merge pull request #1786 from wallabag/v2-restrict-user-infos | Nicolas Lœuillet | 2016-03-14 | 1 | -0/+32 |
|\ | | | | | API shows just what needed for user | ||||
| * | API shows just what needed for user | Thomas Citharel | 2016-03-13 | 1 | -0/+32 |
| | | |||||
* | | Merge pull request #1784 from wallabag/v2-add-refresh-token | Nicolas Lœuillet | 2016-03-14 | 1 | -1/+1 |
|\ \ | |/ |/| | add refresh-token grant-type | ||||
| * | add refresh-token grant-type | Thomas Citharel | 2016-03-13 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1775 from wallabag/v2-few-fixes | Nicolas Lœuillet | 2016-03-12 | 6 | -16/+68 |
|\ | | | | | Some fixes | ||||
| * | Fix hazardous bug with Postgres | Jeremy Benoist | 2016-03-12 | 2 | -1/+2 |
| | | | | | | | | Instead of retrieving a random annotation, sort them to be sure they are all the same no matter the database used | ||||
| * | Improve tests | Jeremy Benoist | 2016-03-11 | 5 | -15/+66 |
| | | | | | | | | | | | | - add more tests for coverage - add a test on annotation deletion - fix post annontation with ranges | ||||
| * | Use --prefer-dist to improve CI perf | Jeremy Benoist | 2016-03-11 | 1 | -1/+1 |
| | | | | | | | | https://twitter.com/seldaek/status/708236348281495552 | ||||
* | | Merge pull request #1776 from wallabag/v2-doc-clarify-php7 | Nicolas Lœuillet | 2016-03-11 | 2 | -2/+2 |
|\ \ | |/ |/| | clarify that wllbg is compatible php 7 | ||||
| * | clarify that wllbg is compatible php 7 | Thomas Citharel | 2016-03-11 | 2 | -2/+2 |
|/ | |||||
* | Merge pull request #1763 from wallabag/v2-prepare-beta2 | Jeremy Benoist | 2016-03-11 | 4 | -7/+17 |
|\ | | | | | Prepare files for 2.0.0-beta.2 |