]> git.immae.eu Git - github/wallabag/wallabag.git/log
github/wallabag/wallabag.git
7 years agoMerge remote-tracking branch 'origin/master' into 2.2
Jeremy Benoist [Mon, 24 Oct 2016 10:03:17 +0000 (12:03 +0200)] 
Merge remote-tracking branch 'origin/master' into 2.2

7 years agoMerge pull request #2401 from wallabag/reset-account
Jeremy Benoist [Mon, 24 Oct 2016 09:57:51 +0000 (11:57 +0200)] 
Merge pull request #2401 from wallabag/reset-account

Reset account

7 years agoSQLite should use utf8, not utf8mb4 2401/head
Jeremy Benoist [Mon, 24 Oct 2016 08:10:38 +0000 (10:10 +0200)] 
SQLite should use utf8, not utf8mb4

7 years agoMerge pull request #1890 from wallabag/v2-api-annotation-switched
Nicolas Lœuillet [Mon, 24 Oct 2016 08:06:12 +0000 (10:06 +0200)] 
Merge pull request #1890 from wallabag/v2-api-annotation-switched

bring annotations to API

7 years agoFix migrations
Jeremy Benoist [Sun, 23 Oct 2016 10:35:57 +0000 (12:35 +0200)] 
Fix migrations

7 years agoMerge pull request #2486 from wallabag/translate-backup-doc
Jeremy Benoist [Sat, 22 Oct 2016 20:23:15 +0000 (22:23 +0200)] 
Merge pull request #2486 from wallabag/translate-backup-doc

Added :fr: documentation for wallabag backup

7 years agoTranslate backup.rst to German 2486/head
Julian Oster [Sat, 22 Oct 2016 19:11:20 +0000 (21:11 +0200)] 
Translate backup.rst to German

7 years agoAdded :fr: documentation for wallabag backup
Nicolas Lœuillet [Sat, 22 Oct 2016 12:16:17 +0000 (14:16 +0200)] 
Added :fr: documentation for wallabag backup

7 years agoLowercase wallabag
Jeremy Benoist [Sat, 22 Oct 2016 12:05:59 +0000 (14:05 +0200)] 
Lowercase wallabag

7 years agoAdd migration for MySQL utf8mb4
Jeremy Benoist [Sat, 22 Oct 2016 12:01:58 +0000 (14:01 +0200)] 
Add migration for MySQL utf8mb4

7 years agoMerge pull request #2484 from bmillemathias/fix_2479
Nicolas Lœuillet [Sat, 22 Oct 2016 11:55:46 +0000 (13:55 +0200)] 
Merge pull request #2484 from bmillemathias/fix_2479

Document what to backup in Wallabag

7 years agoAdd verification check for MySQL version
Jeremy Benoist [Sat, 22 Oct 2016 11:41:03 +0000 (13:41 +0200)] 
Add verification check for MySQL version

Must now be >= 5.5.4

7 years agoMerge pull request #2485 from bmillemathias/fix_android_documentation
Jeremy Benoist [Sat, 22 Oct 2016 11:31:14 +0000 (13:31 +0200)] 
Merge pull request #2485 from bmillemathias/fix_android_documentation

Fix missing words in Android application documentation

7 years agoMerge pull request #2456 from wallabag/use-new-pdf
Jeremy Benoist [Sat, 22 Oct 2016 11:29:58 +0000 (13:29 +0200)] 
Merge pull request #2456 from wallabag/use-new-pdf

use new tcpdf library version

7 years agoAdd missing words in the documentation 2485/head
Baptiste Mille-Mathias [Sat, 22 Oct 2016 11:21:53 +0000 (13:21 +0200)] 
Add missing words in the documentation

7 years agoUse statements & update translation
Jeremy Benoist [Tue, 11 Oct 2016 19:45:43 +0000 (21:45 +0200)] 
Use statements & update translation

7 years agoCS
Jeremy Benoist [Sat, 8 Oct 2016 09:14:09 +0000 (11:14 +0200)] 
CS

7 years agoAdd baggy reset part
Jeremy Benoist [Sat, 8 Oct 2016 09:13:55 +0000 (11:13 +0200)] 
Add baggy reset part

7 years agoAvoid orphan tags
Jeremy Benoist [Sat, 8 Oct 2016 09:05:03 +0000 (11:05 +0200)] 
Avoid orphan tags

7 years agoCleanup subscriber / listener definition
Jeremy Benoist [Sat, 8 Oct 2016 08:57:57 +0000 (10:57 +0200)] 
Cleanup subscriber / listener definition

7 years agoAdd custom doctrine subscriber for SQLite
Jeremy Benoist [Sat, 1 Oct 2016 12:01:13 +0000 (14:01 +0200)] 
Add custom doctrine subscriber for SQLite

Since SQLite doesn’t handle cascade remove by default, we need to handle it manually.

Also some refacto

7 years agoFix emoji insertion in MySQL
Jeremy Benoist [Sat, 1 Oct 2016 08:52:13 +0000 (10:52 +0200)] 
Fix emoji insertion in MySQL

Switch to utf8mb4 instead of utf8 because f*** MySQL
See https://github.com/doctrine/dbal/pull/851

7 years agoAdd ability to reset some datas
Jeremy Benoist [Sat, 1 Oct 2016 07:26:32 +0000 (09:26 +0200)] 
Add ability to reset some datas

- annotations
- tags
- entries

7 years agouse new tcpdf library version 2456/head
Thomas Citharel [Sat, 15 Oct 2016 17:39:56 +0000 (19:39 +0200)] 
use new tcpdf library version

7 years agoAdd test on /api/annotations 1890/head
Jeremy Benoist [Sat, 22 Oct 2016 10:09:20 +0000 (12:09 +0200)] 
Add test on /api/annotations

Fix controller forward in WallabagRestController.
Update PHPDoc so it is sorted the same way as others one
Duplicate all annotations test to use both api & normal way
Also, make annotation tests independent to each other

7 years agoCS
Jeremy Benoist [Sat, 22 Oct 2016 07:17:01 +0000 (09:17 +0200)] 
CS

7 years agoDocument what to backup in Wallabag 2484/head
Baptiste Mille-Mathias [Sat, 22 Oct 2016 07:14:07 +0000 (09:14 +0200)] 
Document what to backup in Wallabag

Fixes issue #2479

7 years agoAdded a missing namespace
Nicolas Lœuillet [Fri, 14 Oct 2016 13:00:42 +0000 (15:00 +0200)] 
Added a missing namespace

7 years agoPHP CS
Nicolas Lœuillet [Fri, 14 Oct 2016 12:36:08 +0000 (14:36 +0200)] 
PHP CS

7 years agofix cs and phpdoc
Thomas Citharel [Sun, 9 Oct 2016 12:01:28 +0000 (14:01 +0200)] 
fix cs and phpdoc

7 years agocs
Thomas Citharel [Thu, 6 Oct 2016 09:40:14 +0000 (11:40 +0200)] 
cs

7 years agomove code
Thomas Citharel [Wed, 5 Oct 2016 17:16:57 +0000 (19:16 +0200)] 
move code

7 years agocs
Thomas Citharel [Fri, 18 Mar 2016 21:23:49 +0000 (22:23 +0100)] 
cs

7 years agobring annotations to API
Thomas Citharel [Fri, 18 Mar 2016 15:41:23 +0000 (16:41 +0100)] 
bring annotations to API

7 years agoMerge pull request #2453 from wallabag/fix-api-export
Nicolas Lœuillet [Fri, 21 Oct 2016 13:22:11 +0000 (15:22 +0200)] 
Merge pull request #2453 from wallabag/fix-api-export

Fix API export

7 years agoMerge pull request #2481 from wallabag/some-fixes
Nicolas Lœuillet [Fri, 21 Oct 2016 13:15:41 +0000 (15:15 +0200)] 
Merge pull request #2481 from wallabag/some-fixes

Some fixes

7 years agoMerge pull request #2482 from wallabag/avoid-bad-refresh
Nicolas Lœuillet [Fri, 21 Oct 2016 13:12:29 +0000 (15:12 +0200)] 
Merge pull request #2482 from wallabag/avoid-bad-refresh

If reload content failed, don’t update it

7 years agoUpdate Twitter cards description 2481/head
Jeremy Benoist [Fri, 21 Oct 2016 08:51:20 +0000 (10:51 +0200)] 
Update Twitter cards description

7 years agoUpdate translation for piwik_host
Jeremy Benoist [Fri, 21 Oct 2016 08:45:39 +0000 (10:45 +0200)] 
Update translation for piwik_host

7 years agoFix missing translations
Jeremy Benoist [Fri, 21 Oct 2016 05:52:55 +0000 (07:52 +0200)] 
Fix missing translations

7 years agoThis test doesn’t require an internet connection 2482/head
Jeremy Benoist [Thu, 20 Oct 2016 21:26:16 +0000 (23:26 +0200)] 
This test doesn’t require an internet connection

7 years agoFix test
Jeremy Benoist [Thu, 20 Oct 2016 21:03:37 +0000 (23:03 +0200)] 
Fix test

7 years agoIf reload content failed, don’t update it
Jeremy Benoist [Thu, 20 Oct 2016 20:49:46 +0000 (22:49 +0200)] 
If reload content failed, don’t update it

In case user wants a fresh version of the current one and the website isn’t available, don’t erase it with a boring message saying wallabag wasn’t able to refresh the content.

7 years agoRequeue depending on producer
Jeremy Benoist [Thu, 20 Oct 2016 19:17:45 +0000 (21:17 +0200)] 
Requeue depending on producer

Browser import can requeue message from `parseEntry` but we should take care of the way import are handled (depending on the producer)

7 years agoAvoid RabbitMQ consumer to loop
Jeremy Benoist [Thu, 20 Oct 2016 19:17:03 +0000 (21:17 +0200)] 
Avoid RabbitMQ consumer to loop

When the `parseEntry` returns null it means the entry already exists in the database. Sending `false` as return, will requeue the message which will then loop forever.

7 years agoTranslate date
Jeremy Benoist [Thu, 20 Oct 2016 19:16:01 +0000 (21:16 +0200)] 
Translate date

I use a kind of hacky way to convert the user locale (defined with 2 letters, like `fr`) into a local with 5 letters (like `fr_FR`). I guess it should work on most of the case..

7 years agoFix french translation
Jeremy Benoist [Thu, 20 Oct 2016 19:14:46 +0000 (21:14 +0200)] 
Fix french translation

7 years agoMerge pull request #2467 from wallabag/version-213dev
Jeremy Benoist [Mon, 17 Oct 2016 09:57:52 +0000 (11:57 +0200)] 
Merge pull request #2467 from wallabag/version-213dev

Update wallabag version for master branch

7 years agoUpdate wallabag version for master branch 2467/head
Nicolas Lœuillet [Mon, 17 Oct 2016 09:56:29 +0000 (11:56 +0200)] 
Update wallabag version for master branch

7 years agoMerge pull request #2466 from wallabag/fix-update-doc
Nicolas Lœuillet [Mon, 17 Oct 2016 09:40:03 +0000 (11:40 +0200)] 
Merge pull request #2466 from wallabag/fix-update-doc

Removed MD5 hash in documentation

7 years agoRemoved MD5 hash in documentation 2466/head
Nicolas Lœuillet [Mon, 17 Oct 2016 09:35:42 +0000 (11:35 +0200)] 
Removed MD5 hash in documentation

7 years agoMerge pull request #2452 from wallabag/prepare-212
Nicolas Lœuillet [Mon, 17 Oct 2016 09:04:20 +0000 (11:04 +0200)] 
Merge pull request #2452 from wallabag/prepare-212

Prepare wallabag 2.1.2 :rocket:

7 years agoChange release title in changelog 2452/head
Nicolas Lœuillet [Mon, 17 Oct 2016 08:27:07 +0000 (10:27 +0200)] 
Change release title in changelog

7 years agoUpdate release process
Nicolas Lœuillet [Mon, 17 Oct 2016 08:23:34 +0000 (10:23 +0200)] 
Update release process

7 years agoUpdate changelog
Nicolas Lœuillet [Mon, 17 Oct 2016 08:22:51 +0000 (10:22 +0200)] 
Update changelog

7 years agoPrepare wallabag 2.1.2 :rocket:
Nicolas Lœuillet [Sat, 15 Oct 2016 13:52:05 +0000 (15:52 +0200)] 
Prepare wallabag 2.1.2 :rocket:

7 years agoMerge pull request #2464 from wallabag/fix-settings-translation
Nicolas Lœuillet [Mon, 17 Oct 2016 07:23:15 +0000 (09:23 +0200)] 
Merge pull request #2464 from wallabag/fix-settings-translation

Fixed hardcoded title for internal settings

7 years agoFixed hardcoded title for internal settings 2464/head
Nicolas Lœuillet [Mon, 17 Oct 2016 07:14:05 +0000 (09:14 +0200)] 
Fixed hardcoded title for internal settings
Fix #2458

7 years agoMerge pull request #2455 from wallabag/fix-material-config-tabs
Jeremy Benoist [Sun, 16 Oct 2016 19:06:23 +0000 (21:06 +0200)] 
Merge pull request #2455 from wallabag/fix-material-config-tabs

Fix tabs on material

7 years agoMerge pull request #2454 from wallabag/fix-baggy-small-width
Jeremy Benoist [Sun, 16 Oct 2016 19:05:30 +0000 (21:05 +0200)] 
Merge pull request #2454 from wallabag/fix-baggy-small-width

Fix baggy display on small screens

7 years agoMerge pull request #2459 from wallabag/improve-german-translation
Thomas Citharel [Sun, 16 Oct 2016 10:06:42 +0000 (12:06 +0200)] 
Merge pull request #2459 from wallabag/improve-german-translation

German: improve existing and add missing translation

7 years agoMerge pull request #2457 from wallabag/link-german-docu
Thomas Citharel [Sun, 16 Oct 2016 08:54:19 +0000 (10:54 +0200)] 
Merge pull request #2457 from wallabag/link-german-docu

add link to German documentation in about page

7 years agoGerman: improve existing and add missing translation 2459/head
Sven Fischer [Sun, 16 Oct 2016 08:45:51 +0000 (10:45 +0200)] 
German: improve existing and add missing translation

7 years agoadd link to German documentation in about page 2457/head
Sven Fischer [Sun, 16 Oct 2016 07:23:58 +0000 (09:23 +0200)] 
add link to German documentation in about page

7 years agoFix tabs on material 2455/head
Thomas Citharel [Sat, 15 Oct 2016 17:26:38 +0000 (19:26 +0200)] 
Fix tabs on material

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
7 years agoFix baggy on small screens 2454/head
Thomas Citharel [Sat, 15 Oct 2016 17:04:53 +0000 (19:04 +0200)] 
Fix baggy on small screens

7 years agoCS 2453/head
Jeremy Benoist [Sat, 15 Oct 2016 16:00:08 +0000 (18:00 +0200)] 
CS

7 years agoApiDoc & Route annotation were conflicted
Jeremy Benoist [Sat, 15 Oct 2016 14:46:42 +0000 (16:46 +0200)] 
ApiDoc & Route annotation were conflicted

The generated error was “Unable to guess how to get a Doctrine instance from the request information.”.

I haven’t checked deeper in Doctrine (I know it was coming from the DoctrineParamConverter).

Anyway, I check for FosRest possiblity to add extra format without allowing them for every route (like it was done in the first place).

I finally found a way but it then seems all request goes to the FormatListener of FosRest so I needed to add a custom rules to match all request to be sure we don’t get  a 406 error from FosRest.

Should be ok now …

7 years agoMerge pull request #2451 from wallabag/add-dev-make
Thomas Citharel [Sat, 15 Oct 2016 13:40:20 +0000 (15:40 +0200)] 
Merge pull request #2451 from wallabag/add-dev-make

Bring make dev

7 years agoMerge pull request #2450 from wallabag/new-improvement-view
Thomas Citharel [Sat, 15 Oct 2016 13:38:49 +0000 (15:38 +0200)] 
Merge pull request #2450 from wallabag/new-improvement-view

View improvements

7 years agofix stylelint 2450/head
Thomas Citharel [Sat, 15 Oct 2016 13:25:46 +0000 (15:25 +0200)] 
fix stylelint

7 years agoBring make dev 2451/head
Thomas Citharel [Sat, 15 Oct 2016 13:16:35 +0000 (15:16 +0200)] 
Bring make dev

7 years agoImproved side menu, reduced the font size on small screens, fixed a form to add links...
Alexandr Danilov [Sat, 15 Oct 2016 08:17:55 +0000 (11:17 +0300)] 
Improved side menu, reduced the font size on small screens, fixed a form to add links on small screens

7 years agoMerge pull request #2412 from wallabag/fix-postgres-migration
Thomas Citharel [Sat, 15 Oct 2016 12:42:46 +0000 (14:42 +0200)] 
Merge pull request #2412 from wallabag/fix-postgres-migration

Fix PostgreSQL migrations

7 years agoMerge pull request #2446 from wallabag/fix-taggingrules-doc
Nicolas Lœuillet [Sat, 15 Oct 2016 09:47:13 +0000 (11:47 +0200)] 
Merge pull request #2446 from wallabag/fix-taggingrules-doc

Added information about tagging rules in documentation

7 years agodocs/de/user/configuration.rst: German fix for tagging rules docu 2446/head
Sven Fischer [Fri, 14 Oct 2016 21:48:50 +0000 (23:48 +0200)] 
docs/de/user/configuration.rst: German fix for tagging rules docu

7 years agodocs/de/user/configuration.rst: German fix for tagging rules docu
Sven Fischer [Fri, 14 Oct 2016 21:47:37 +0000 (23:47 +0200)] 
docs/de/user/configuration.rst: German fix for tagging rules docu

7 years agoMerge pull request #2447 from wallabag/fix-fr-de-doc-homepage
Nicolas Lœuillet [Fri, 14 Oct 2016 13:45:13 +0000 (15:45 +0200)] 
Merge pull request #2447 from wallabag/fix-fr-de-doc-homepage

Fixed french and german doc homepages

7 years agoFixed french and german doc homepages 2447/head
Nicolas Lœuillet [Fri, 14 Oct 2016 12:55:45 +0000 (14:55 +0200)] 
Fixed french and german doc homepages

7 years agoAdded information about tagging rules in documentation
Nicolas Lœuillet [Fri, 14 Oct 2016 12:45:32 +0000 (14:45 +0200)] 
Added information about tagging rules in documentation
Fix #2060

7 years agoMerge pull request #2444 from Kaligule/master
Nicolas Lœuillet [Fri, 14 Oct 2016 07:57:34 +0000 (09:57 +0200)] 
Merge pull request #2444 from Kaligule/master

Mention example instance in docs

7 years agoMerge pull request #1 from Kaligule/Documentation 2444/head
Kaligule [Fri, 14 Oct 2016 07:15:14 +0000 (09:15 +0200)] 
Merge pull request #1 from Kaligule/Documentation

Mention example instance

7 years agoMention example instance
Kaligule [Fri, 14 Oct 2016 07:09:28 +0000 (09:09 +0200)] 
Mention example instance

Namely http://v2.wallabag.org/api/doc, so api methods can be looked up without installing wallabag first.

7 years agoMerge pull request #2435 from wallabag/french-upgrade-doc
Nicolas Lœuillet [Thu, 13 Oct 2016 14:56:37 +0000 (16:56 +0200)] 
Merge pull request #2435 from wallabag/french-upgrade-doc

Added french documentation for upgrade

7 years agoAdded missing space 2435/head
Nicolas Lœuillet [Thu, 13 Oct 2016 14:56:03 +0000 (16:56 +0200)] 
Added missing space

7 years agoMerge pull request #2434 from wallabag/parameters-doc
Nicolas Lœuillet [Thu, 13 Oct 2016 14:53:13 +0000 (16:53 +0200)] 
Merge pull request #2434 from wallabag/parameters-doc

Added french documentation for parameters.yml

7 years agoMerge pull request #2439 from zertrin/minor-fix-docs-1
Nicolas Lœuillet [Thu, 13 Oct 2016 14:52:25 +0000 (16:52 +0200)] 
Merge pull request #2439 from zertrin/minor-fix-docs-1

Minor fixes in the english documentation

7 years agoMinor fixes in the english documentation 2439/head
zertrin [Wed, 12 Oct 2016 21:52:19 +0000 (23:52 +0200)] 
Minor fixes in the english documentation

7 years agoupdate German user/upgrade-2.1.x-2.1.y.rst
Sven Fischer [Wed, 12 Oct 2016 18:44:22 +0000 (20:44 +0200)] 
update German user/upgrade-2.1.x-2.1.y.rst

7 years agoupdate German user/upgrade-2.0.x-2.1.1
Sven Fischer [Wed, 12 Oct 2016 18:41:15 +0000 (20:41 +0200)] 
update German user/upgrade-2.0.x-2.1.1

7 years agotranslate to German: user/parameters 2434/head
Sven Fischer [Wed, 12 Oct 2016 18:33:55 +0000 (20:33 +0200)] 
translate to German: user/parameters

7 years agoMerge pull request #2438 from wallabag/mruminski-patch-1
Jeremy Benoist [Wed, 12 Oct 2016 18:01:13 +0000 (20:01 +0200)] 
Merge pull request #2438 from wallabag/mruminski-patch-1

Update messages.pl.yml

7 years agoUpdate messages.pl.yml 2438/head
Mateusz Rumiński [Wed, 12 Oct 2016 17:32:30 +0000 (19:32 +0200)] 
Update messages.pl.yml

translate delete section to polish

7 years agoMerge pull request #2372 from pmartin/api-get-entry-as-epub
Jeremy Benoist [Wed, 12 Oct 2016 12:06:33 +0000 (14:06 +0200)] 
Merge pull request #2372 from pmartin/api-get-entry-as-epub

API: ability to export entry in all available format (epub, pdf, etc...)

7 years agoAdded french documentation for upgrade
Nicolas Lœuillet [Wed, 12 Oct 2016 11:37:50 +0000 (13:37 +0200)] 
Added french documentation for upgrade

7 years agoAdded french documentation for parameters.yml
Nicolas Lœuillet [Wed, 12 Oct 2016 11:19:45 +0000 (13:19 +0200)] 
Added french documentation for parameters.yml

7 years agoMerge pull request #2432 from wallabag/issue-site-config
Nicolas Lœuillet [Wed, 12 Oct 2016 10:04:08 +0000 (12:04 +0200)] 
Merge pull request #2432 from wallabag/issue-site-config

Update ISSUE_TEMPLATE.md

7 years agoUpdate ISSUE_TEMPLATE.md 2432/head
Jeremy Benoist [Wed, 12 Oct 2016 09:22:11 +0000 (11:22 +0200)] 
Update ISSUE_TEMPLATE.md

7 years agoMerge remote-tracking branch 'origin/master' into 2.2
Jeremy Benoist [Tue, 11 Oct 2016 19:01:30 +0000 (21:01 +0200)] 
Merge remote-tracking branch 'origin/master' into 2.2

7 years agoMerge pull request #2429 from wallabag/lock-fos-user
Nicolas Lœuillet [Tue, 11 Oct 2016 17:32:22 +0000 (19:32 +0200)] 
Merge pull request #2429 from wallabag/lock-fos-user

Lock deps for FOSUser