Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into 2.1 | Jeremy Benoist | 2016-09-19 | 1 | -1/+1 |
|\ | |||||
| * | Prepare wallabag 2.0.8 | Nicolas Lœuillet | 2016-09-07 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1941 from wallabag/v2-asynchronous-jobs | Jeremy Benoist | 2016-09-19 | 17 | -11/+217 |
|\ \ | | | | | | | Use asynchronous jobs for imports | ||||
| * | | Missing some migrations | Jeremy Benoist | 2016-09-16 | 1 | -0/+2 |
| | | | | | | | | | | | | and CS | ||||
| * | | Moved Pocket token to user config | Jeremy Benoist | 2016-09-16 | 12 | -10/+75 |
| | | | |||||
| * | | AMPQ -> AMQP | Jeremy Benoist | 2016-09-14 | 1 | -4/+4 |
| | | | |||||
| * | | Add missing translations | Jeremy Benoist | 2016-09-13 | 10 | -1/+20 |
| | | | |||||
| * | | Display how many messages are queue | Jeremy Benoist | 2016-09-13 | 1 | -0/+42 |
| | | | | | | | | | | | | | | | - update the docker-composer to add Redis - add migrations | ||||
| * | | Enable Redis async import | Jeremy Benoist | 2016-09-11 | 2 | -4/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | - using javibravo/simpleue - internal config value are now `import_with_redis` & `import_with_rabbit` which are more clear - if both option are enable rabbit will be choosen - services imports related to async are now splitted into 2 files: `redis.yml` & `rabbit.yml` - | ||||
| * | | Add test for RabbitMQ | Jeremy Benoist | 2016-09-11 | 1 | -1/+1 |
| | | | | | | | | | | | | Also update Symfony deps | ||||
| * | | Convert other imports to Rabbit | Jeremy Benoist | 2016-09-11 | 1 | -2/+41 |
| | | | |||||
| * | | Send every imported item to the queue | Jeremy Benoist | 2016-09-11 | 2 | -15/+11 |
| | | | | | | | | | | | | | | | Instead of queing real Entry to process, we queue all the item to import from Pocket in a raw format. Then, the worker retrieve that information, find / create the entry and save it. | ||||
| * | | Replace RabbitMQ injection with CraueConfiguration | Nicolas Lœuillet | 2016-09-11 | 1 | -0/+1 |
| | | | |||||
| * | | 1st draft for rabbitMQ | Nicolas Lœuillet | 2016-09-11 | 3 | -0/+38 |
| | | | |||||
* | | | Remove footer part | Nicolas Lœuillet | 2016-09-13 | 1 | -1/+1 |
|/ / | |||||
* | | Added tags counter in sidebar (material theme) | Nicolas Lœuillet | 2016-09-04 | 1 | -0/+2 |
| | | |||||
* | | Merge pull request #2002 from wallabag/feature-display-itemsNumber | Jeremy Benoist | 2016-09-03 | 4 | -0/+16 |
|\ \ | | | | | | | Feature display items number | ||||
| * | | Store cache lifetime in config | Nicolas Lœuillet | 2016-09-03 | 2 | -0/+9 |
| | | | |||||
| * | | Display entries number for each category | Nicolas Lœuillet | 2016-08-23 | 2 | -0/+7 |
| | | | |||||
* | | | Fixed different font-size for labels in config screen | Nicolas Lœuillet | 2016-09-02 | 1 | -0/+4 |
| | | | | | | | | | | | | Fix #1788 | ||||
* | | | Merge pull request #2252 from wallabag/fix-last-merge | Nicolas Lœuillet | 2016-09-02 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fixed last merge who caused CSS/JS bugs | ||||
| * | | | Fixed last merge who caused CSS/JS bugs | Nicolas Lœuillet | 2016-08-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #2242 from wallabag/fix-minor-css | Jeremy Benoist | 2016-09-01 | 2 | -2/+17 |
|\ \ \ \ | |/ / / |/| | | | Fix print / article views | ||||
| * | | | CSS indentation | Nicolas Lœuillet | 2016-09-01 | 1 | -2/+2 |
| | | | | |||||
| * | | | Fixed print view for baggy theme | Nicolas Lœuillet | 2016-08-26 | 1 | -1/+3 |
| | | | | |||||
| * | | | Fix print / article views | Nicolas Lœuillet | 2016-08-26 | 1 | -1/+14 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'origin/master' into 2.1 | Jeremy Benoist | 2016-08-28 | 1 | -0/+11 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
* | | | Add icon for public share link | Nicolas Lœuillet | 2016-08-25 | 1 | -0/+4 |
| | | | |||||
* | | | Merge pull request #1904 from wallabag/feature-public-mode | Jeremy Benoist | 2016-08-25 | 13 | -4/+93 |
|\ \ \ | | | | | | | | | Share entry with a public URL | ||||
| * | | | Handle share_entry | Jeremy Benoist | 2016-08-24 | 11 | -0/+27 |
| | | | | | | | | | | | | | | | | | | | | - share_entry needs to be in the migration too - and it needs a translation | ||||
| * | | | Handle table prefix in migration | Jeremy Benoist | 2016-08-24 | 2 | -7/+29 |
| | | | | | | | | | | | | | | | | and fix migration for name field in oauth table | ||||
| * | | | Change share entry behavior | Nicolas Lœuillet | 2016-08-23 | 1 | -12/+0 |
| | | | | |||||
| * | | | Improve migration | Nicolas Lœuillet | 2016-08-23 | 1 | -9/+7 |
| | | | | |||||
| * | | | Add test and fix migration | Nicolas Lœuillet | 2016-08-23 | 1 | -4/+31 |
| | | | | |||||
| * | | | Add migration | Nicolas Lœuillet | 2016-08-23 | 1 | -0/+26 |
| | | | | |||||
| * | | | Share entry with a public URL | Nicolas Lœuillet | 2016-08-23 | 1 | -0/+1 |
| | |/ | |/| | |||||
* | | | Proper parameter name, simplify logic & phpdoc | Thomas Citharel | 2016-08-23 | 1 | -1/+1 |
| | | | |||||
* | | | Add option to disable registration | Thomas Citharel | 2016-08-23 | 2 | -0/+4 |
|/ / | |||||
* | | Merge remote-tracking branch 'origin/master' into 2.1 | Jeremy Benoist | 2016-08-22 | 3 | -4/+9 |
|\| | |||||
| * | Prepare wallabag 2.0.7 | Nicolas Lœuillet | 2016-08-22 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #2220 from Rurik19/master | Jeremy Benoist | 2016-08-18 | 1 | -1/+1 |
| |\ | | | | | | | Enable PATCH method for CORS in API part | ||||
| | * | Enable PATCH method for CORS in API part | Rurik19 | 2016-08-18 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #2216 from Rurik19/master | Nicolas Lœuillet | 2016-08-16 | 1 | -0/+5 |
| |\| | | | | | | | Enable CORS headers for OAUTH part | ||||
| | * | Enable CORS headers for OAUTH part | Rurik19 | 2016-08-12 | 1 | -0/+5 |
| | | | |||||
| * | | Prepare release 2.0.6 | Nicolas Lœuillet | 2016-08-10 | 1 | -1/+1 |
| | | | |||||
* | | | Added name on client | Thomas Citharel | 2016-08-22 | 1 | -0/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | - Fix typos in field name - Added migration for name field in API client table Manually cherry-picked from PR https://github.com/wallabag/wallabag/pull/2171 | ||||
* | | | Merge remote-tracking branch 'origin/master' into 2.1 | Jeremy Benoist | 2016-07-20 | 6 | -42/+48 |
|\| | | |||||
| * | | Change the way to login user in tests | Jeremy Benoist | 2016-06-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using a HTTP request we just login user like FOSUser does. It allows us to mock service in container for functional tests. Also, fix a bad config name in fos_user for firewall And finally, add functional test to PocketImport | ||||
| * | | Remove useless spaces | Jeremy Benoist | 2016-06-24 | 6 | -42/+48 |
| | | | |||||
* | | | Bring tags on entries view to baggy | Thomas Citharel | 2016-07-01 | 2 | -74/+126 |
| | | | | | | | | | | | | Also, a couple of UI improvement and CSS fixing |