6663d49329
Fix typo and set version in the README
2016-01-14 00:47:17 +01:00
0aafb8dfcb
Merge pull request #1561 from FabienM/docker-compose
...
Add basic docker-compose configuration
2016-01-11 09:08:39 +01:00
8b909e7ea7
Add documentation to run docker-compose
2016-01-10 15:01:20 +01:00
1d41effebc
Add Docker configuration for Postgres and MariaDB
2016-01-10 15:01:11 +01:00
540ef5e084
Add basic docker-compose configuration
2016-01-10 14:41:42 +01:00
4aa2997106
Merge pull request #1563 from wallabag/v2-fix-1394
...
#1394 Fixed 'mark as read' and 'mark as unread' links
2016-01-10 10:20:16 +01:00
c60b549313
Merge pull request #1562 from wallabag/v2-add-import-baggy
...
add import link on baggy theme
2016-01-10 10:17:27 +01:00
6c9bad13e1
Fixed 'mark as read' and 'mark as unread' links
2016-01-09 22:20:19 +01:00
da82839bf8
add import link on baggy theme
2016-01-09 20:33:09 +01:00
5ad863c63a
Merge pull request #1558 from wallabag/v2-documentation
...
[v2] documentation cleaning
2016-01-09 17:33:27 +01:00
1caf557de7
Merge pull request #1559 from wallabag/v2-doctrine-migrations
...
Installation & configuration of Doctrine Migrations
2016-01-09 14:43:06 +01:00
e1b9f4fb37
Update deps
...
Changelogs summary:
- doctrine/dbal updated from v2.5.3 to v2.5.4
See changes: https://github.com/doctrine/dbal/compare/v2.5.3...v2.5.4
Release notes: https://github.com/doctrine/dbal/releases/tag/v2.5.4
- doctrine/orm updated from v2.5.3 to v2.5.4
See changes: https://github.com/doctrine/doctrine2/compare/v2.5.3...v2.5.4
Release notes: https://github.com/doctrine/doctrine2/releases/tag/v2.5.4
- nelmio/api-doc-bundle updated from 2.11.1 to 2.11.2
See changes: https://github.com/nelmio/NelmioApiDocBundle/compare/2.11.1...2.11.2
Release notes: https://github.com/nelmio/NelmioApiDocBundle/releases/tag/2.11.2
- friendsofsymfony/user-bundle updated from dev-master to dev-master
See changes: e5e7a2b...6ccff96
2016-01-09 14:24:09 +01:00
a42938f42c
documentation cleaning
2016-01-09 13:50:45 +01:00
292c1324e9
Installation & configuration of Doctrine Migrations
2016-01-08 16:27:29 +01:00
39643c6b76
Merge pull request #1493 from wallabag/v2-pocket-import
...
v2 – 1st draft for Pocket import via API & Wallabag v1 import
2016-01-07 22:15:08 +01:00
b88cf91fc8
updated tests
2016-01-07 21:00:04 +01:00
488a468e3e
Merge pull request #1553 from wallabag/v2-hide-export-button
...
Hide export button if we are not on entries list
2016-01-06 21:25:41 +01:00
10b2411c10
Hide export button if we are not on entries list
2016-01-06 07:47:09 +01:00
d1af8ad4db
Added french translations
2016-01-05 22:38:09 +01:00
8eedc8cfac
Few phpDoc fix
...
And some little mistakes
2016-01-03 11:15:44 +01:00
c5c7f90a81
Fix tag related test for Pocket
2016-01-03 10:32:56 +01:00
5b2b5858fe
Update deps
2016-01-02 23:31:41 +01:00
6d7c7a6e3f
Remove real consumer key
...
We should never commit them :)
2016-01-02 23:27:41 +01:00
7019c7cf6c
Add tagged services for import
...
- list services in /import
- add url to import service
- ImportBundle routing are now prefixed by /import
- optimize flush in each import (flushing each 20 contents)
- improve design of each import
- add more tests
2016-01-02 23:27:41 +01:00
b1d05721cf
Rewrote Wallabag v1 import
2016-01-02 23:27:41 +01:00
252ebd6071
Rewrote Pocket Import
...
For the moment, we won't do a queue system, just a plain synchronous import.
We also use ContentProxy to grab content for each article from Pocket.
Error from Pocket are now logged using the logger.
The ImportInterface need to be simple and not related to oAuth (not all import will use that method).
2016-01-02 23:27:41 +01:00
b4b592a0c0
Fix the way to check for an existing entry
...
Instead of requiring more than 1 entry (> 1) we have to check for at least one entry (> 0)
2016-01-02 23:27:41 +01:00
77a7752a59
Update after previous merge
...
PR #1443 was merged into this branch to handle all import type in the same place.
2016-01-02 23:27:41 +01:00
7ec2897ee0
First test on PocketImport
...
Giving ability to define the Client add abitliy to easliy test the import.
2016-01-02 23:27:41 +01:00
0aa344dc24
Update url & service name
...
Prefix ur with service namel: [service]_[route name]
Add comment in Interface
2016-01-02 23:27:41 +01:00
5a4bbcc9a7
Change the way to check for an existing entry
...
The repository method return the entry found or false if nothing exists.
2016-01-02 23:27:41 +01:00
27a8708b67
Update deps
2016-01-02 23:27:41 +01:00
303768dfe9
- remove importers configuration
...
- add check on userId for findOneByURL for entries
2016-01-02 23:27:41 +01:00
dda57bb944
fix #1502 avoid duplicate entry and store pocket url in config
2016-01-02 23:24:17 +01:00
87f23b005c
assign tags to entries and add lastPocketImport attribute to user
2016-01-02 23:24:17 +01:00
d51b38ed30
create ImportController to list importers
2016-01-02 23:24:17 +01:00
557e549db7
service call
2016-01-02 23:24:17 +01:00
9c9c23cf08
forgot test parameters
2016-01-02 23:24:17 +01:00
ff7b031d57
refactor pocket import
2016-01-02 23:24:17 +01:00
1f4408de9e
1st draft for Pocket import via API
2016-01-02 23:24:17 +01:00
10b40f85d6
add docs for Import feature
2016-01-02 23:24:17 +01:00
d275bdf4d3
form to upload file
2016-01-02 23:24:17 +01:00
8c3c77c1bd
create controller to launch import command
2016-01-02 23:24:17 +01:00
a1bb1b3c2a
userId is now set in parameters
2016-01-02 23:24:17 +01:00
56ea1de99b
first draft for json import, needed for wallabag v1 migration
2016-01-02 23:24:17 +01:00
dad1c546a5
Merge pull request #1545 from wallabag/v2-user-tag
...
v2 – Remove user reference in tag
2016-01-02 12:46:52 +01:00
5432f61509
Merge pull request #1546 from wallabag/v2-reload-content
...
v2 – Ability to reload an entry
2016-01-02 12:46:09 +01:00
00a051add4
Merge pull request #1547 from wallabag/v2-mistakes
...
v2 – Fix wrong if when deleting an entry
2016-01-02 12:45:08 +01:00
e82160e5e9
Fix wrong if when deleting an entry
...
Bad condition when deleting an entry returned `true` instead of the referer url
2015-12-30 11:32:53 +01:00
0cf434c00f
Backport all icomoon from v1
...
And add a reload icon
2015-12-30 09:53:52 +01:00
