aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
Commit message (Expand)AuthorAgeFilesLines
* #1490 HTML in E-MailsAlexandr Danilov2016-01-211-3/+97
* CSJeremy Benoist2016-01-212-9/+6
* Use HTML email for 2FAJeremy Benoist2016-01-216-39/+62
* Remove tag relation when removing an entryJeremy Benoist2016-01-201-1/+1
* Use translator interface instead of final classJeremy Benoist2016-01-173-17/+14
* Merge pull request #1564 from wallabag/v2-remove-flattrJeremy Benoist2016-01-154-7/+1
|\
| * remove flattr on about pageNicolas Lœuillet2016-01-154-7/+1
* | Merge pull request #1583 from wallabag/v2-fix-deleteNicolas Lœuillet2016-01-158-18/+33
|\ \ | |/ |/|
| * Fix `findOneByUrl` side effect in testsJeremy Benoist2016-01-158-18/+33
* | Merge pull request #1524 from wallabag/sf2.8Nicolas Lœuillet2016-01-1550-170/+202
|\ \ | |/ |/|
| * Update readme & fix console permissionJeremy Benoist2016-01-151-2/+1
| * Fix Pocket generateUrl parametersJeremy Benoist2016-01-151-2/+2
| * Fix recent updateJeremy Benoist2016-01-158-19/+31
| * Update bundle & stock fileJeremy Benoist2016-01-1515-43/+40
| * Symfony Upgrade Fixer FTWJeremy Benoist2016-01-1541-112/+136
* | Quickstart for beginnersNicolas Lœuillet2016-01-1510-13/+212
|/
* Merge pull request #1563 from wallabag/v2-fix-1394Jeremy Benoist2016-01-102-2/+2
|\
| * Fixed 'mark as read' and 'mark as unread' linksNicolas Lœuillet2016-01-092-2/+2
* | add import link on baggy themeNicolas Lœuillet2016-01-091-0/+1
|/
* Merge pull request #1493 from wallabag/v2-pocket-import2.0.0-alpha.1Jeremy Benoist2016-01-0737-15/+1687
|\
| * updated testsNicolas Lœuillet2016-01-079-17/+10
| * Added french translationsNicolas Lœuillet2016-01-057-8/+28
| * Few phpDoc fixJeremy Benoist2016-01-036-16/+27
| * Fix tag related test for PocketJeremy Benoist2016-01-032-3/+6
| * Add tagged services for importJeremy Benoist2016-01-0224-42/+393
| * Rewrote Wallabag v1 importJeremy Benoist2016-01-0212-94/+404
| * Rewrote Pocket ImportJeremy Benoist2016-01-029-210/+357
| * Fix the way to check for an existing entryJeremy Benoist2016-01-021-2/+2
| * Update after previous mergeJeremy Benoist2016-01-0210-112/+83
| * First test on PocketImportJeremy Benoist2016-01-023-77/+202
| * Update url & service nameJeremy Benoist2016-01-026-13/+56
| * Change the way to check for an existing entryJeremy Benoist2016-01-024-12/+20
| * - remove importers configurationNicolas Lœuillet2016-01-026-37/+31
| * fix #1502 avoid duplicate entry and store pocket url in configNicolas Lœuillet2016-01-026-36/+79
| * assign tags to entries and add lastPocketImport attribute to userNicolas Lœuillet2016-01-023-12/+89
| * create ImportController to list importersNicolas Lœuillet2016-01-025-5/+49
| * service callNicolas Lœuillet2016-01-021-2/+2
| * refactor pocket importNicolas Lœuillet2016-01-027-105/+202
| * 1st draft for Pocket import via APINicolas Lœuillet2016-01-024-1/+174
| * add docs for Import featureNicolas Lœuillet2016-01-021-13/+20
| * form to upload fileNicolas Lœuillet2016-01-026-17/+108
| * create controller to launch import commandNicolas Lœuillet2016-01-023-8/+52
| * userId is now set in parametersNicolas Lœuillet2016-01-021-2/+10
| * first draft for json import, needed for wallabag v1 migrationNicolas Lœuillet2016-01-021-0/+112
* | Hide export button if we are not on entries listNicolas Lœuillet2016-01-061-0/+3
|/
* Merge pull request #1545 from wallabag/v2-user-tagNicolas Lœuillet2016-01-0213-103/+159
|\
| * Removed commentJeremy Benoist2015-12-291-9/+3
| * Fix the way to remove a tag from all user entriesJeremy Benoist2015-12-293-10/+53
| * Cleanup testsJeremy Benoist2015-12-292-6/+1
| * Fix parameters regarding documentationJeremy Benoist2015-12-291-2/+2