aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * git clone with prefer-dist optionNicolas Lœuillet2016-03-103-5/+14
| |
| * Finally back to composer create-project but with --keep-vcs optionNicolas Lœuillet2016-03-103-15/+4
| |
| * Add -o option in composer install commandNicolas Lœuillet2016-03-103-3/+3
| |
| * French documentation for new installationNicolas Lœuillet2016-03-101-1/+5
| |
| * Prepare files for 2.0.0-beta.2Nicolas Lœuillet2016-03-103-4/+12
|/
* Merge pull request #1771 from wallabag/docker-timezoneNicolas Lœuillet2016-03-092-42/+53
|\ | | | | Docker timezone
| * Add comment about timezone definitiondjay2016-03-092-0/+2
| |
| * Add the timezone as an argument in the docker-compose.djay2016-03-092-43/+50
| | | | | | | | For that, need to use v2 of docker-compose (with version >= 1.6.0)
| * Add the timezone for PHP docker containerdjay2016-03-091-0/+2
|/
* Merge pull request #1766 from wallabag/v2-add-wallabag-in-titleJeremy Benoist2016-03-084-4/+4
|\ | | | | Fix #1756: Added 'wallabag' in page title
| * Added 'wallabag' in page titleNicolas Lœuillet2016-03-084-4/+4
|/
* Merge pull request #1762 from wallabag/v2-fix-quickstart-linksJeremy Benoist2016-03-082-10/+10
|\ | | | | Change documentation links in quickstart
| * Change documentation links in quickstartNicolas Lœuillet2016-03-082-10/+10
|/
* Merge pull request #1761 from wallabag/v2-API-versionNicolas Lœuillet2016-03-083-0/+27
|\ | | | | V2 api version
| * typos & csThomas Citharel2016-03-082-5/+7
| |