Commit Graph

  • e56983af1f Fix bad redirection when adding a new user Jeremy Benoist 2016-01-21 16:36:30 +01:00
  • 27ea492cf7 Add tests on TagAllCommand Jeremy Benoist 2016-01-21 16:36:17 +01:00
  • 7a0e6970b4 Use PHP7 random_bytes to generate RSS Token Jeremy Benoist 2016-01-21 16:35:41 +01:00
  • 9aa66d6244 Merge pull request #1565 from wallabag/v2-2fa-html Nicolas Lœuillet 2016-01-21 12:27:47 +01:00
  • abd454c456 Update HTML 2FA template Jeremy Benoist 2016-01-20 17:43:10 +01:00
  • 5f736213af #1490 HTML in E-Mails Alexandr Danilov 2016-01-19 18:22:59 +03:00
  • d1f1333f48 CS Jeremy Benoist 2016-01-10 13:01:00 +01:00
  • 7ce895bf5e Use HTML email for 2FA Jeremy Benoist 2016-01-10 12:49:43 +01:00
  • e72a943ad2 Merge pull request #1610 from wallabag/v2-composer-lock-release Nicolas Lœuillet 2016-01-21 11:02:18 +01:00
  • 3ee1582e60 Disable xdebug all the time Jeremy Benoist 2016-01-21 08:59:58 +01:00
  • eff6a406f3 Merge pull request #1606 from wallabag/v2-tag-cascade Nicolas Lœuillet 2016-01-21 08:38:37 +01:00
  • ff1c7d16be Merge pull request #1607 from wallabag/v2-composer-lock Nicolas Lœuillet 2016-01-21 08:28:52 +01:00
  • 173629a400 Ignore composer.lock Jeremy Benoist 2016-01-20 18:49:45 +01:00
  • 7e80861588 Remove tag relation when removing an entry Jeremy Benoist 2016-01-20 18:35:57 +01:00
  • 6785f4aa74 [#1590] Add JSON import from wallabag v2 Nicolas Lœuillet 2016-01-20 14:37:01 +01:00
  • d481f42b7d Merge pull request #1599 from wallabag/v2-fix-pt-documentation Nicolas Lœuillet 2016-01-20 13:00:43 +01:00
  • acc0160c29 Add configuration for portuguese documentation Nicolas Lœuillet 2016-01-20 12:54:19 +01:00
  • 3a59d13fd1 Merge pull request #1594 from araujo0205/patch-1 Nicolas Lœuillet 2016-01-20 12:09:18 +01:00
  • e1101bee83 Create index.rst araujo0205 2016-01-19 16:01:28 -02:00
  • 3080a4afa4 Merge pull request #1587 from wallabag/v2-translator Nicolas Lœuillet 2016-01-18 09:16:01 +01:00
  • f744ca2799 Merge pull request #1588 from juanjobe/dev Jeremy Benoist 2016-01-17 20:42:34 +01:00
  • 9c0f0ec5c5 Merge remote-tracking branch 'upstream/dev' into dev Juanjo Benages 2016-01-17 19:31:49 +01:00
  • 23aed1cd4c Add caffereggio.net Juanjo Benages 2016-01-17 18:49:17 +01:00
  • e678c4752a Use translator interface instead of final class Jeremy Benoist 2016-01-17 12:52:30 +01:00
  • 3bcc4d4cb2 Merge pull request #1584 from wallabag/v2-cleanup Jeremy Benoist 2016-01-15 16:29:06 +01:00
  • 160e2d8f0b some cleanup: * move capistrano config files * remove useless files Nicolas Lœuillet 2016-01-15 16:07:57 +01:00
  • f902d78153 Merge pull request #1564 from wallabag/v2-remove-flattr Jeremy Benoist 2016-01-15 16:01:13 +01:00
  • 86719c63bf Merge pull request #1583 from wallabag/v2-fix-delete Nicolas Lœuillet 2016-01-15 15:47:13 +01:00
  • b91465c067 remove flattr on about page Nicolas Lœuillet 2016-01-15 15:09:43 +01:00
  • 1930c19d82 Merge pull request #1524 from wallabag/sf2.8 Nicolas Lœuillet 2016-01-15 15:38:31 +01:00
  • 7883367246 Fix findOneByUrl side effect in tests Jeremy Benoist 2016-01-15 15:28:22 +01:00
  • 790573d458 Merge pull request #1560 from wallabag/v2-quickstart Jeremy Benoist 2016-01-15 15:21:43 +01:00
  • 5c072d2b57 Quickstart for beginners Nicolas Lœuillet 2016-01-09 14:34:49 +01:00
  • e462972e18 Merge pull request #1582 from simark/patch-2 Jeremy Benoist 2016-01-15 14:08:51 +01:00
  • 4f158d9450 Fix grammatical typo Simon Marchi 2016-01-15 08:05:40 -05:00
  • 131eaa3e94 Update graby stuff Jeremy Benoist 2016-01-15 11:05:51 +01:00
  • c7f622d369 Update readme & fix console permission Jeremy Benoist 2016-01-15 09:34:09 +01:00
  • 1fc8ed8794 Last deps update Jeremy Benoist 2016-01-15 07:55:18 +01:00
  • d8dbe76bf5 Add assets config Jeremy Benoist 2016-01-14 18:35:59 +01:00
  • ccf50a9fd8 Update path in build file Jeremy Benoist 2016-01-14 18:27:36 +01:00
  • 31e33fc42e Update to Symfony 3.0.x Jeremy Benoist 2016-01-14 18:23:03 +01:00
  • 73cd160bfc Switch to Symfony 3 structure Jeremy Benoist 2016-01-14 18:15:07 +01:00
  • 1d405d0e62 Remove some commented code Jeremy Benoist 2016-01-14 14:10:33 +01:00
  • c38d27d421 Update to friendsofsymfony/oauth-server-bundle@1.5.0-BETA Jeremy Benoist 2016-01-14 13:46:30 +01:00
  • 27e475a941 Fix Pocket generateUrl parameters Jeremy Benoist 2016-01-13 22:53:36 +01:00
  • 6108b0f26c Update deps Jeremy Benoist 2016-01-13 22:34:54 +01:00
  • 1d76102a24 Fix recent update Jeremy Benoist 2016-01-09 18:38:40 +01:00
  • 8ba854c068 TwoFactorBundle -> 2.0 Jeremy Benoist 2015-12-31 18:51:35 +01:00
  • b4faefc04d Switch to psr-4 Jeremy Benoist 2015-12-22 13:09:10 +01:00
  • 5c895a7fd1 Update bundle & stock file Jeremy Benoist 2015-12-22 13:00:37 +01:00
  • 619cc45359 Symfony Upgrade Fixer FTW Jeremy Benoist 2015-12-22 10:16:34 +01:00
  • 516022d60e Improve composer.json Jeremy Benoist 2015-12-22 09:34:32 +01:00
  • bd2c8b4677 Wallabag now require PHP >= 5.5 Jeremy Benoist 2015-12-06 16:14:47 +01:00
  • 30a40b0298 Remove weak deprecation 💥 Jeremy Benoist 2015-12-06 15:00:26 +01:00
  • e23edfd287 Update deps Jeremy Benoist 2015-12-06 14:39:01 +01:00
  • 9ee44a109a Merge pull request #1574 from jjanvier/readme Jeremy Benoist 2016-01-14 07:50:55 +01:00
  • 6663d49329 Fix typo and set version in the README Julien Janvier (jjanvier) 2016-01-14 00:41:08 +01:00
  • 0aafb8dfcb Merge pull request #1561 from FabienM/docker-compose Nicolas Lœuillet 2016-01-11 09:08:39 +01:00
  • 8b909e7ea7 Add documentation to run docker-compose Fabien MEURILLON 2016-01-09 19:02:24 +01:00
  • 1d41effebc Add Docker configuration for Postgres and MariaDB Fabien MEURILLON 2016-01-09 17:27:21 +01:00
  • 540ef5e084 Add basic docker-compose configuration Fabien MEURILLON 2016-01-09 14:47:32 +01:00
  • 4aa2997106 Merge pull request #1563 from wallabag/v2-fix-1394 Jeremy Benoist 2016-01-10 10:20:16 +01:00
  • c60b549313 Merge pull request #1562 from wallabag/v2-add-import-baggy Jeremy Benoist 2016-01-10 10:17:27 +01:00
  • 6c9bad13e1 Fixed 'mark as read' and 'mark as unread' links Nicolas Lœuillet 2016-01-09 22:20:19 +01:00
  • da82839bf8 add import link on baggy theme Nicolas Lœuillet 2016-01-09 20:33:09 +01:00
  • 5ad863c63a Merge pull request #1558 from wallabag/v2-documentation Nicolas Lœuillet 2016-01-09 17:33:27 +01:00
  • 1caf557de7 Merge pull request #1559 from wallabag/v2-doctrine-migrations Jeremy Benoist 2016-01-09 14:43:06 +01:00
  • e1b9f4fb37 Update deps Jeremy Benoist 2016-01-09 14:24:09 +01:00
  • a42938f42c documentation cleaning Nicolas Lœuillet 2016-01-08 15:02:51 +01:00
  • 292c1324e9 Installation & configuration of Doctrine Migrations Nicolas Lœuillet 2016-01-08 16:27:29 +01:00
  • 39643c6b76 Merge pull request #1493 from wallabag/v2-pocket-import 2.0.0-alpha.1 1770591172107110295/tmp_refs/tags/2.0.0-alpha.1 1770224188402081296/tmp_refs/tags/2.0.0-alpha.1 1769730765679703528/tmp_refs/tags/2.0.0-alpha.1 Jeremy Benoist 2016-01-07 22:15:08 +01:00
  • b88cf91fc8 updated tests Nicolas Lœuillet 2016-01-06 06:34:57 +01:00
  • 488a468e3e Merge pull request #1553 from wallabag/v2-hide-export-button Jeremy Benoist 2016-01-06 21:25:41 +01:00
  • 10b2411c10 Hide export button if we are not on entries list Nicolas Lœuillet 2016-01-06 07:47:09 +01:00
  • d1af8ad4db Added french translations Nicolas Lœuillet 2016-01-05 22:38:09 +01:00
  • 8eedc8cfac Few phpDoc fix Jeremy Benoist 2016-01-03 10:59:55 +01:00
  • c5c7f90a81 Fix tag related test for Pocket Jeremy Benoist 2016-01-03 10:32:56 +01:00
  • 5b2b5858fe Update deps Jeremy Benoist 2016-01-02 23:31:41 +01:00
  • 6d7c7a6e3f Remove real consumer key Jeremy Benoist 2015-12-31 11:25:04 +01:00
  • 7019c7cf6c Add tagged services for import Jeremy Benoist 2015-12-31 11:24:46 +01:00
  • b1d05721cf Rewrote Wallabag v1 import Jeremy Benoist 2015-12-30 13:26:30 +01:00
  • 252ebd6071 Rewrote Pocket Import Jeremy Benoist 2015-12-30 12:23:51 +01:00
  • b4b592a0c0 Fix the way to check for an existing entry Jeremy Benoist 2015-12-30 12:19:15 +01:00
  • 77a7752a59 Update after previous merge Jeremy Benoist 2015-12-30 10:06:45 +01:00
  • 7ec2897ee0 First test on PocketImport Jeremy Benoist 2015-12-24 15:24:18 +01:00
  • 0aa344dc24 Update url & service name Jeremy Benoist 2015-12-24 15:22:56 +01:00
  • 5a4bbcc9a7 Change the way to check for an existing entry Jeremy Benoist 2015-12-24 15:19:50 +01:00
  • 27a8708b67 Update deps Jeremy Benoist 2015-12-24 14:06:55 +01:00
  • 303768dfe9 - remove importers configuration - add check on userId for findOneByURL for entries Nicolas Lœuillet 2015-10-26 15:49:44 +01:00
  • dda57bb944 fix #1502 avoid duplicate entry and store pocket url in config Nicolas Lœuillet 2015-10-26 14:38:24 +01:00
  • 87f23b005c assign tags to entries and add lastPocketImport attribute to user Nicolas Lœuillet 2015-10-26 10:55:35 +01:00
  • d51b38ed30 create ImportController to list importers Nicolas Lœuillet 2015-10-23 14:45:50 +02:00
  • 557e549db7 service call Nicolas Lœuillet 2015-10-23 14:09:19 +02:00
  • 9c9c23cf08 forgot test parameters Nicolas Lœuillet 2015-10-23 14:04:43 +02:00
  • ff7b031d57 refactor pocket import Nicolas Lœuillet 2015-10-23 14:01:27 +02:00
  • 1f4408de9e 1st draft for Pocket import via API Nicolas Lœuillet 2015-10-20 13:58:13 +02:00
  • 10b40f85d6 add docs for Import feature Nicolas Lœuillet 2015-10-23 10:14:22 +02:00
  • d275bdf4d3 form to upload file Nicolas Lœuillet 2015-10-22 16:57:56 +02:00
  • 8c3c77c1bd create controller to launch import command Nicolas Lœuillet 2015-09-30 15:10:46 +02:00
  • a1bb1b3c2a userId is now set in parameters Nicolas Lœuillet 2015-09-30 14:22:38 +02:00