aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1807 from nikaro/patch-1Jeremy Benoist2016-03-211-1/+1
|\ | | | | fix typo diaspora* share
| * fix type diaspora* shareNicolas2016-03-211-1/+1
|/
* Merge pull request #1806 from wallabag/v2-translation-flash-baggyJeremy Benoist2016-03-211-1/+1
|\ | | | | Translate flash message in baggy theme
| * Translate flash message in baggy themeNicolas Lœuillet2016-03-211-1/+1
|/
* Merge pull request #1774 from wallabag/v2-key-translationNicolas Lœuillet2016-03-21115-2322/+4704
|\ | | | | Switch to keys in translated files
| * Update docs about translationJeremy Benoist2016-03-212-2/+2
| |
| * Add reading time translationJeremy Benoist2016-03-2112-7/+78
| |
| * Put more validations on travisJeremy Benoist2016-03-213-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 languagesJeremy Benoist2016-03-2014-1064/+2851
| |
| * Translation typosJeremy Benoist2016-03-201-3/+3
| | | | | | | | Fix #1793
| * Add missing developer pageJeremy Benoist2016-03-2012-74/+176
| |
| * Convert french translationJeremy Benoist2016-03-202-269/+346
| |
| * CSJeremy Benoist2016-03-201-0/+2
| |
| * Add flashes messagesJeremy Benoist2016-03-2011-40/+94
| |
| * Improve test failure readabilityJeremy Benoist2016-03-203-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 fileJeremy Benoist2016-03-2080-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 testJeremy Benoist2016-03-201-0/+2
|/ | | | We don't want to test translation in test
* Revert "Transferring API Description file from Apiary.io"Nicolas Lœuillet2016-03-181-80/+0
| | | | This reverts commit 169d60abc7e0ee191bfb66ecb1fbbac14ab88095.
* Transferring API Description file from Apiary.ioNicolas Lœuillet2016-03-181-0/+80
|
* Merge pull request #1767 from wallabag/v2-setting-for-reading-timeJeremy Benoist2016-03-1815-7/+103
|\ | | | | Setting for reading time
| * Improved testsNicolas Lœuillet2016-03-183-7/+18
| |
| * Fix documentation and add help message in BaggyNicolas Lœuillet2016-03-183-4/+3
| |
| * Replace slider with selectNicolas Lœuillet2016-03-145-7/+14
| |
| * Translation and documentationNicolas Lœuillet2016-03-143-0/+13
| |
| * Fix default value and add baggy implementationNicolas Lœuillet2016-03-142-1/+10
| |
| * Fixed fixtures for configNicolas Lœuillet2016-03-141-0/+3
| |
| * Added setting to have a personal reading timeNicolas Lœuillet2016-03-149-2/+56
| |
* | Merge pull request #1799 from wallabag/v2-fix-tabs-display-materialNicolas Lœuillet2016-03-181-0/+11
|\ \ | | | | | | fix tabs display on mobile view
| * | fix tabs display on mobile viewThomas Citharel2016-03-161-0/+11
| | |
* | | Merge pull request #1791 from wallabag/v2-fix-api-entry-propertiesJeremy Benoist2016-03-164-25/+98
|\ \ \ | |/ / |/| | fix api properties and typo
| * | add checkThomas Citharel2016-03-161-2/+6
| | |
| * | fix updating entry status through APIThomas Citharel2016-03-161-6/+2
| | |
| * | check if archive/star parameters without quotes workThomas Citharel2016-03-161-0/+49
| | |
| * | use integers for archived/starred statusThomas Citharel2016-03-163-22/+46
| | |
| * | fix api properties and typoThomas Citharel2016-03-163-5/+5
|/ /
* | Merge pull request #1797 from wallabag/v2-fix-adding-entry-APIJeremy Benoist2016-03-162-4/+26
|\ \ | | | | | | Don't add entry through API if it already exists
| * | Don't add entry through API if it already existsThomas Citharel2016-03-162-4/+26
|/ /
* | Merge pull request #1792 from wallabag/v2-add-tests-for-api-userJeremy Benoist2016-03-161-0/+6
|\ \ | |/ |/| add tests on user in API responses
| * add tests on user in API responsesThomas Citharel2016-03-151-0/+6
|/
* Merge pull request #1786 from wallabag/v2-restrict-user-infosNicolas Lœuillet2016-03-141-0/+32
|\ | | | | API shows just what needed for user
| * API shows just what needed for userThomas Citharel2016-03-131-0/+32
| |
* | Merge pull request #1784 from wallabag/v2-add-refresh-tokenNicolas Lœuillet2016-03-141-1/+1
|\ \ | |/ |/| add refresh-token grant-type
| * add refresh-token grant-typeThomas Citharel2016-03-131-1/+1
|/
* Merge pull request #1775 from wallabag/v2-few-fixesNicolas Lœuillet2016-03-126-16/+68
|\ | | | | Some fixes
| * Fix hazardous bug with PostgresJeremy Benoist2016-03-122-1/+2
| | | | | | | | Instead of retrieving a random annotation, sort them to be sure they are all the same no matter the database used
| * Improve testsJeremy Benoist2016-03-115-15/+66
| | | | | | | | | | | | - add more tests for coverage - add a test on annotation deletion - fix post annontation with ranges
| * Use --prefer-dist to improve CI perfJeremy Benoist2016-03-111-1/+1
| | | | | | | | https://twitter.com/seldaek/status/708236348281495552
* | Merge pull request #1776 from wallabag/v2-doc-clarify-php7Nicolas Lœuillet2016-03-112-2/+2
|\ \ | |/ |/| clarify that wllbg is compatible php 7
| * clarify that wllbg is compatible php 7Thomas Citharel2016-03-112-2/+2
|/
* Merge pull request #1763 from wallabag/v2-prepare-beta2Jeremy Benoist2016-03-114-7/+17
|\ | | | | Prepare files for 2.0.0-beta.2