aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* PoC of rule-based taggingKévin Gomez2015-11-116-30/+855
* Merge pull request #1422 from wallabag/v2-ebookNicolas Lœuillet2015-11-0916-8/+1138
|\
| * Update depsJeremy Benoist2015-11-091-15/+15
| * Fix testsJeremy Benoist2015-11-092-1/+6
| * Fix route parametersJeremy Benoist2015-11-093-8/+108
| * use JMS SerializerThomas Citharel2015-11-092-13/+6
| * use the groups annotation instead of setIgnoredAttributesThomas Citharel2015-11-092-4/+42
| * improved functionThomas Citharel2015-11-091-10/+6
| * add json & xmlThomas Citharel2015-11-094-11/+102
| * Fix tests on pgsqlJeremy Benoist2015-11-091-1/+1
| * Rework on exportJeremy Benoist2015-11-0910-142/+348
| * Start work on exportThomas Citharel2015-11-098-14/+715
|/
* Merge pull request #1500 from wallabag/v2-quote-pgsqlNicolas Lœuillet2015-11-0923-150/+252
|\
| * Lock DoctrineBundle to 1.5.2Jeremy Benoist2015-11-082-14/+14
| * Remove duplicate commentsJeremy Benoist2015-11-071-7/+1
| * CSJeremy Benoist2015-11-072-5/+5
| * Skipping PostgreSQL test that drop databaseJeremy Benoist2015-11-073-30/+48
| * Re-enable test on doctrine commandJeremy Benoist2015-11-0711-18/+18
| * Add tests on TablePrefixSubscriberJeremy Benoist2015-11-072-2/+121
| * Quoted entity to avoid reserved keywordJeremy Benoist2015-11-078-90/+55
| * Fix database already exist detectionJeremy Benoist2015-11-071-0/+6
|/
* Merge pull request #1510 from wallabag/v2-sf3Nicolas Lœuillet2015-11-0714-148/+199
|\
| * CSJeremy Benoist2015-11-072-3/+3
| * Avoid other bundle deprecation to cancel the buildJeremy Benoist2015-11-071-0/+5
| * Fix form_enctype deprecationJeremy Benoist2015-11-073-19/+21
| * Fix security.context deprecationJeremy Benoist2015-11-074-12/+12
| * Fix pattern deprecationJeremy Benoist2015-11-071-5/+5
| * Fix deprecated helper in commandJeremy Benoist2015-11-062-63/+54
| * Update deps & add PHPUnit BridgeJeremy Benoist2015-11-062-47/+100
|/
* Merge pull request #1505 from wallabag/v2-graby-logJeremy Benoist2015-11-023-85/+101
|\
| * Update depsJeremy Benoist2015-10-302-85/+97
| * Enable graby logJeremy Benoist2015-10-241-0/+4
|/
* Merge pull request #1495 from wallabag/v2-docsNicolas Lœuillet2015-10-2258-0/+2643
|\
| * add docsNicolas Lœuillet2015-10-2158-0/+2643
* | Merge pull request #1496 from wallabag/v2-redirect-after-deletionJeremy Benoist2015-10-221-2/+2
|\ \ | |/ |/|
| * redirect on last page after deletionNicolas Lœuillet2015-10-211-2/+2
|/
* Merge pull request #1491 from jlnostr/v2-german-translationNicolas Lœuillet2015-10-192-0/+131
|\
| * Add language to config.ymlJulian Oster2015-10-181-0/+1
| * Add german translation.Julian Oster2015-10-181-0/+130
|/
* Merge pull request #1446 from wallabag/v2-language-configNicolas Lœuillet2015-10-1813-12/+283
|\
| * Add tests on listenersJeremy Benoist2015-10-164-0/+147
| * Language selection on config screenNicolas Lœuillet2015-10-1511-12/+136
|/
* Merge pull request #1484 from wallabag/v2-2factor-authJeremy Benoist2015-10-1515-111/+451
|\
| * forgot parameters for travisNicolas Lœuillet2015-10-153-0/+6
| * move 2factor activation in parametersNicolas Lœuillet2015-10-155-30/+43
| * add tests for 2factor authenticationNicolas Lœuillet2015-10-143-21/+59
| * 2factor authentication via emailNicolas Lœuillet2015-10-1311-111/+394
* | Merge pull request #1475 from modos189/v2_materialNicolas Lœuillet2015-10-146-18/+118
|\ \ | |/ |/|
| * Other improvementsAlexandr Danilov2015-10-092-1/+9
| * Icons in footerAlexandr Danilov2015-10-096-17/+109
|/