aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1813 from wallabag/v2-translation-deJeremy Benoist2016-03-243-225/+256
|\
| * Complete messages.de.ymlJulian Oster2016-03-241-225/+225
| * Translate FOSUserBundle to german.Julian Oster2016-03-241-0/+2
| * Translate CraueConfigBundle to german.Julian Oster2016-03-241-0/+29
|/
* Merge pull request #1807 from nikaro/patch-1Jeremy Benoist2016-03-211-1/+1
|\
| * 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 themeNicolas Lœuillet2016-03-211-1/+1
|/
* Merge pull request #1774 from wallabag/v2-key-translationNicolas Lœuillet2016-03-21115-2322/+4704
|\
| * 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
| * Convert more languagesJeremy Benoist2016-03-2014-1064/+2851
| * Translation typosJeremy Benoist2016-03-201-3/+3
| * 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
| * Convert english translation fileJeremy Benoist2016-03-2080-864/+1141
| * Disable translation in testJeremy Benoist2016-03-201-0/+2
|/
* Revert "Transferring API Description file from Apiary.io"Nicolas Lœuillet2016-03-181-80/+0
* 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
|\
| * 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 viewThomas Citharel2016-03-161-0/+11
* | | Merge pull request #1791 from wallabag/v2-fix-api-entry-propertiesJeremy Benoist2016-03-164-25/+98
|\ \ \ | |/ / |/| |
| * | 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 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 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 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-typeThomas Citharel2016-03-131-1/+1
|/
* Merge pull request #1775 from wallabag/v2-few-fixesNicolas Lœuillet2016-03-126-16/+68
|\
| * Fix hazardous bug with PostgresJeremy Benoist2016-03-122-1/+2
| * Improve testsJeremy Benoist2016-03-115-15/+66