Commit Graph

2248 Commits

Author SHA1 Message Date
Nicolas Lœuillet
bd46de6b25 Revert "Transferring API Description file from Apiary.io"
This reverts commit 169d60abc7.
2016-03-18 16:28:45 +01:00
Nicolas Lœuillet
169d60abc7 Transferring API Description file from Apiary.io 2016-03-18 16:24:05 +01:00
Jeremy Benoist
f39e94ace3 Merge pull request #1767 from wallabag/v2-setting-for-reading-time
Setting for reading time
2016-03-18 14:30:38 +01:00
Nicolas Lœuillet
1b64a84b78 Improved tests 2016-03-18 14:01:50 +01:00
Nicolas Lœuillet
ec7c67badc Merge pull request #1799 from wallabag/v2-fix-tabs-display-material
fix tabs display on mobile view
2016-03-18 12:52:40 +01:00
Nicolas Lœuillet
78becd5401 Fix documentation and add help message in Baggy 2016-03-18 12:36:52 +01:00
Jeremy Benoist
1978d0e3b6 Merge pull request #1791 from wallabag/v2-fix-api-entry-properties
fix api properties and typo
2016-03-16 23:23:42 +01:00
Thomas Citharel
bc2b947cd5 add check 2016-03-16 22:47:12 +01:00
Thomas Citharel
0cd0d6eb8c fix updating entry status through API 2016-03-16 22:43:32 +01:00
Thomas Citharel
2f60e5ea75 check if archive/star parameters without quotes work 2016-03-16 22:22:12 +01:00
Thomas Citharel
189ef6342a use integers for archived/starred status 2016-03-16 22:22:12 +01:00
Thomas Citharel
0d3043a29c fix api properties and typo 2016-03-16 22:22:12 +01:00
Thomas Citharel
2cc7de1e93 fix tabs display on mobile view 2016-03-16 22:15:01 +01:00
Jeremy Benoist
3500d4099f Merge pull request #1797 from wallabag/v2-fix-adding-entry-API
Don't add entry through API if it already exists
2016-03-16 21:40:36 +01:00
Thomas Citharel
3107f92acb Don't add entry through API if it already exists 2016-03-16 21:07:01 +01:00
Jeremy Benoist
17051137ec Merge pull request #1792 from wallabag/v2-add-tests-for-api-user
add tests on user in API responses
2016-03-16 10:45:09 +01:00
Thomas Citharel
bc44aa5784 add tests on user in API responses 2016-03-15 19:31:31 +01:00
Nicolas Lœuillet
6432b9277e Replace slider with select 2016-03-14 13:49:47 +01:00
Nicolas Lœuillet
37b371726b Translation and documentation 2016-03-14 13:01:32 +01:00
Nicolas Lœuillet
db1d4b1e19 Fix default value and add baggy implementation 2016-03-14 13:01:31 +01:00
Nicolas Lœuillet
889c1cf328 Fixed fixtures for config 2016-03-14 13:01:31 +01:00
Nicolas Lœuillet
bca5485946 Added setting to have a personal reading time 2016-03-14 13:01:31 +01:00
Nicolas Lœuillet
17b3d026fd Merge pull request #1786 from wallabag/v2-restrict-user-infos
API shows just what needed for user
2016-03-14 06:15:46 +01:00
Nicolas Lœuillet
5cc9b5151f Merge pull request #1784 from wallabag/v2-add-refresh-token
add refresh-token grant-type
2016-03-14 06:14:22 +01:00
Thomas Citharel
7d1fdab2bb API shows just what needed for user 2016-03-13 20:17:52 +01:00
Thomas Citharel
c9c8345a4a add refresh-token grant-type 2016-03-13 17:53:56 +01:00
Nicolas Lœuillet
6ab56c7b2c Merge pull request #1775 from wallabag/v2-few-fixes
Some fixes
2016-03-12 11:10:21 +01:00
Jeremy Benoist
b95ffda2a1 Fix hazardous bug with Postgres
Instead of retrieving a random annotation, sort them to be sure they are all the same no matter the database used
2016-03-12 10:45:14 +01:00
Nicolas Lœuillet
55e61971f3 Merge pull request #1776 from wallabag/v2-doc-clarify-php7
clarify that wllbg is compatible php 7
2016-03-11 20:39:48 +01:00
Thomas Citharel
d6dba929a1 clarify that wllbg is compatible php 7 2016-03-11 20:14:14 +01:00
Jeremy Benoist
09d8bb6fa2 Improve tests
- add more tests for coverage
- add a test on annotation deletion
- fix post annontation with ranges
2016-03-11 17:59:42 +01:00
Jeremy Benoist
66e2be2371 Use --prefer-dist to improve CI perf
https://twitter.com/seldaek/status/708236348281495552
2016-03-11 17:59:42 +01:00
Jeremy Benoist
6aed6d69a5 Merge pull request #1763 from wallabag/v2-prepare-beta2
Prepare files for 2.0.0-beta.2
2016-03-11 13:43:57 +01:00
Nicolas Lœuillet
c118131317 git clone with prefer-dist option 2016-03-10 13:04:56 +01:00
Nicolas Lœuillet
24c16007bb Finally back to composer create-project but with --keep-vcs option 2016-03-10 12:43:03 +01:00
Nicolas Lœuillet
4c51979595 Add -o option in composer install command 2016-03-10 12:43:03 +01:00
Nicolas Lœuillet
0f4e919100 French documentation for new installation 2016-03-10 12:43:03 +01:00
Nicolas Lœuillet
83be3dc097 Prepare files for 2.0.0-beta.2 2016-03-10 12:43:03 +01:00
Nicolas Lœuillet
e7931dbdf8 Merge pull request #1771 from wallabag/docker-timezone
Docker timezone
2016-03-09 10:42:15 +01:00
djay
b80841f23c Add comment about timezone definition 2016-03-09 09:04:31 +01:00
djay
612f5f1ec7 Add the timezone as an argument in the docker-compose.
For that, need to use v2 of docker-compose (with version >= 1.6.0)
2016-03-09 09:04:19 +01:00
djay
125460345f Add the timezone for PHP docker container 2016-03-09 09:02:06 +01:00
Jeremy Benoist
d460a7377a Merge pull request #1766 from wallabag/v2-add-wallabag-in-title
Fix #1756: Added 'wallabag' in page title
2016-03-08 15:49:13 +01:00
Nicolas Lœuillet
cebb42234c Added 'wallabag' in page title 2016-03-08 15:22:35 +01:00
Jeremy Benoist
f4109a9bbf Merge pull request #1762 from wallabag/v2-fix-quickstart-links
Change documentation links in quickstart
2016-03-08 12:00:59 +01:00
Nicolas Lœuillet
3b32c122ab Change documentation links in quickstart 2016-03-08 11:21:40 +01:00
Nicolas Lœuillet
d442cf4a92 Merge pull request #1761 from wallabag/v2-API-version
V2 api version
2016-03-08 10:09:57 +01:00
Nicolas Lœuillet
807037884f Merge pull request #1675 from wallabag/v2-create-api-client
Ability to create new client for the API
2016-03-08 10:09:39 +01:00
Thomas Citharel
6f8310b445 typos & cs 2016-03-08 09:22:25 +01:00
Vincent
9761bfa18e write test for version 2016-03-07 15:16:27 +01:00