]> git.immae.eu Git - github/wallabag/wallabag.git/log
github/wallabag/wallabag.git
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 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 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 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

7 years agoLock deps for FOSUser 2429/head
Jeremy Benoist [Tue, 11 Oct 2016 16:59:08 +0000 (18:59 +0200)] 
Lock deps for FOSUser

We’ll wait until the final release will be out and other related project will be update to support it.
Meanwhile we can safely lock to a previous version.

7 years agoMerge pull request #2422 from wallabag/typo-doc
Nicolas Lœuillet [Tue, 11 Oct 2016 13:03:46 +0000 (15:03 +0200)] 
Merge pull request #2422 from wallabag/typo-doc

Fixed display for note in installation page

7 years agoMerge pull request #2426 from wallabag/fix-doc
Nicolas Lœuillet [Tue, 11 Oct 2016 13:00:59 +0000 (15:00 +0200)] 
Merge pull request #2426 from wallabag/fix-doc

Fix links on english documentation homepage

7 years agoFix links on english documentation homepage 2426/head
Nicolas Lœuillet [Tue, 11 Oct 2016 12:59:32 +0000 (14:59 +0200)] 
Fix links on english documentation homepage

7 years agoMerge pull request #2420 from wallabag/redis-tests
Nicolas Lœuillet [Mon, 10 Oct 2016 17:02:05 +0000 (19:02 +0200)] 
Merge pull request #2420 from wallabag/redis-tests

Avoid error when Redis isn't here in tests

7 years agoFixed display for note in installation page 2422/head
Nicolas Lœuillet [Mon, 10 Oct 2016 16:51:20 +0000 (18:51 +0200)] 
Fixed display for note in installation page

7 years agoMerge pull request #2403 from wallabag/cleanup-install-process-in-doc
Jeremy Benoist [Mon, 10 Oct 2016 14:58:15 +0000 (16:58 +0200)] 
Merge pull request #2403 from wallabag/cleanup-install-process-in-doc

Cleaned up documentation for installation process

7 years agoAvoid error when Redis isn't here in tests 2420/head
Jeremy Benoist [Mon, 10 Oct 2016 14:34:57 +0000 (16:34 +0200)] 
Avoid error when Redis isn't here in tests

7 years agoMerge pull request #2419 from wallabag/fix-twitter-cards
Nicolas Lœuillet [Mon, 10 Oct 2016 14:09:52 +0000 (16:09 +0200)] 
Merge pull request #2419 from wallabag/fix-twitter-cards

Fixed Twitter Cards by adding a description tag

7 years agoFixed Twitter Cards by adding a description tag 2419/head
Nicolas Lœuillet [Mon, 10 Oct 2016 14:05:06 +0000 (16:05 +0200)] 
Fixed Twitter Cards by adding a description tag

7 years agoAdded steps about Redis/RabbitMQ activation 2403/head
Nicolas Lœuillet [Mon, 10 Oct 2016 13:38:49 +0000 (15:38 +0200)] 
Added steps about Redis/RabbitMQ activation

7 years agoFixed links on import page
Nicolas Lœuillet [Mon, 10 Oct 2016 13:38:42 +0000 (15:38 +0200)] 
Fixed links on import page

7 years agoMerge pull request #2418 from wallabag/add-twitter-cards
Nicolas Lœuillet [Mon, 10 Oct 2016 13:20:06 +0000 (15:20 +0200)] 
Merge pull request #2418 from wallabag/add-twitter-cards

Added support of Twitter Cards for public articles

7 years agoAdded support of Twitter Cards for public articles 2418/head
Nicolas Lœuillet [Mon, 10 Oct 2016 12:29:11 +0000 (14:29 +0200)] 
Added support of Twitter Cards for public articles

7 years agoUse table for parameters.yml
Jeremy Benoist [Mon, 10 Oct 2016 11:42:50 +0000 (13:42 +0200)] 
Use table for parameters.yml

7 years agoMerge pull request #2417 from wallabag/version-dev
Nicolas Lœuillet [Mon, 10 Oct 2016 11:03:34 +0000 (13:03 +0200)] 
Merge pull request #2417 from wallabag/version-dev

Define a dev version for the master

7 years agoAdded page about parameters.yml
Nicolas Lœuillet [Mon, 10 Oct 2016 11:01:14 +0000 (13:01 +0200)] 
Added page about parameters.yml

7 years agoAdd -dev version
Jeremy Benoist [Mon, 10 Oct 2016 09:39:42 +0000 (11:39 +0200)] 
Add -dev version

Following https://github.com/wallabag/wallabag/pull/2417

7 years agoTypos in upgrade doc
Nicolas Lœuillet [Mon, 10 Oct 2016 09:35:32 +0000 (11:35 +0200)] 
Typos in upgrade doc

7 years agoDefine a dev version for the master 2417/head
Jeremy Benoist [Mon, 10 Oct 2016 09:31:57 +0000 (11:31 +0200)] 
Define a dev version for the master

This is to be sure that user testing wallabag from the master will have the version defined as dev.

7 years agoUpdate upgrade documentation
Nicolas Lœuillet [Mon, 10 Oct 2016 09:21:20 +0000 (11:21 +0200)] 
Update upgrade documentation

7 years agoUpdate documentation
Nicolas Lœuillet [Mon, 10 Oct 2016 08:20:32 +0000 (10:20 +0200)] 
Update documentation

7 years agoAdded documentation about testsuite
Nicolas Lœuillet [Mon, 10 Oct 2016 07:15:53 +0000 (09:15 +0200)] 
Added documentation about testsuite
Fix #2415

7 years agoUpdate RELEASE_PROCESS.md
Jeremy Benoist [Mon, 10 Oct 2016 07:12:24 +0000 (09:12 +0200)] 
Update RELEASE_PROCESS.md

7 years agoUpdate README.md
Jeremy Benoist [Mon, 10 Oct 2016 07:11:26 +0000 (09:11 +0200)] 
Update README.md

7 years agoMerge pull request #2411 from wallabag/fix-entities
Nicolas Lœuillet [Mon, 10 Oct 2016 06:02:25 +0000 (08:02 +0200)] 
Merge pull request #2411 from wallabag/fix-entities

Fix entities definition

7 years agoMerge pull request #2414 from szafranek/bugfix-bookmarklet
Jeremy Benoist [Mon, 10 Oct 2016 05:11:01 +0000 (07:11 +0200)] 
Merge pull request #2414 from szafranek/bugfix-bookmarklet

Remove automatic closing of the window from bookmarklet

7 years agoMerge pull request #2413 from wallabag/sub-command-verbose
Jeremy Benoist [Mon, 10 Oct 2016 05:09:45 +0000 (07:09 +0200)] 
Merge pull request #2413 from wallabag/sub-command-verbose

When a sub command fail, display error message

7 years agoRemove automatic closing of the window from bookmarklet 2414/head
Krzysztof Szafranek [Sun, 9 Oct 2016 20:40:55 +0000 (22:40 +0200)] 
Remove automatic closing of the window from bookmarklet

7 years agoWhen a sub command fail, display error message 2413/head
Jeremy Benoist [Sun, 9 Oct 2016 20:39:43 +0000 (22:39 +0200)] 
When a sub command fail, display error message

We often got issue with message “The command "doctrine:database:create" terminated with an error code: 1.”.

Using the `BufferedOutput` we can store the output and only display it if an error occurs.

7 years agoChanged the default command when we launch make
Nicolas Lœuillet [Sun, 9 Oct 2016 20:01:24 +0000 (22:01 +0200)] 
Changed the default command when we launch make

7 years agoCreated scripts folder to store update/install/release process
Nicolas Lœuillet [Sun, 9 Oct 2016 19:50:15 +0000 (21:50 +0200)] 
Created scripts folder to store update/install/release process

7 years agoFix PostgreSQL migrations 2412/head
Jeremy Benoist [Sun, 9 Oct 2016 19:35:04 +0000 (21:35 +0200)] 
Fix PostgreSQL migrations

7 years agoMerge pull request #2410 from wallabag/tag-optim
Nicolas Lœuillet [Sun, 9 Oct 2016 19:27:47 +0000 (21:27 +0200)] 
Merge pull request #2410 from wallabag/tag-optim

Optimize tag list display

7 years agoUpdate Makefile
Nicolas Lœuillet [Sun, 9 Oct 2016 19:15:57 +0000 (21:15 +0200)] 
Update Makefile

7 years agoUpdate Makefile
Nicolas Lœuillet [Sun, 9 Oct 2016 19:06:26 +0000 (21:06 +0200)] 
Update Makefile

7 years agoFix entities definition 2411/head
Jeremy Benoist [Sun, 9 Oct 2016 18:51:37 +0000 (20:51 +0200)] 
Fix entities definition

As per Doctrine said in the debug tool bar:

- The field Wallabag\ApiBundle\Entity\Client#refreshTokens is on the inverse side of a bi-directional relationship, but the specified mappedBy association on the target-entity Wallabag\ApiBundle\Entity\RefreshToken#client does not contain the required 'inversedBy="refreshTokens"' attribute.

- The field Wallabag\ApiBundle\Entity\Client#accessTokens is on the inverse side of a bi-directional relationship, but the specified mappedBy association on the target-entity Wallabag\ApiBundle\Entity\AccessToken#client does not contain the required 'inversedBy="accessTokens"' attribute.

7 years agoFirst draft for Makefile
Nicolas Lœuillet [Sun, 9 Oct 2016 18:21:02 +0000 (20:21 +0200)] 
First draft for Makefile

7 years agoCS 2410/head
Jeremy Benoist [Sun, 9 Oct 2016 17:35:27 +0000 (19:35 +0200)] 
CS

7 years agoOptimize the way tag list is rendered
Jeremy Benoist [Sun, 9 Oct 2016 16:41:19 +0000 (18:41 +0200)] 
Optimize the way tag list is rendered

Instead of retrieve all informations about entries of a tag to just count them, we’ll count them before with a fastest query.

Also change the layout of the tag list in material design

7 years agoAvoid tag duplication when tagging all articles
Jeremy Benoist [Sun, 9 Oct 2016 16:32:17 +0000 (18:32 +0200)] 
Avoid tag duplication when tagging all articles

Mostly when the tag doesn’t yet exist.
It was created each time it matche the rule… glups.

7 years agoAdd more log to tag:all
Jeremy Benoist [Sun, 9 Oct 2016 16:31:30 +0000 (18:31 +0200)] 
Add more log to tag:all

7 years agoMerge pull request #2406 from szafranek/bugfix-number-of-annotations
Jeremy Benoist [Sun, 9 Oct 2016 12:11:20 +0000 (14:11 +0200)] 
Merge pull request #2406 from szafranek/bugfix-number-of-annotations

Show number of annotations instead of nbAnnotations placeholder

7 years agoMerge pull request #2405 from szafranek/cleanup-fix-invalid-html
Nicolas Lœuillet [Sun, 9 Oct 2016 05:46:09 +0000 (07:46 +0200)] 
Merge pull request #2405 from szafranek/cleanup-fix-invalid-html

Fix few invalid HTML tags

7 years agoShow number of annotations instead of nbAnnotations placeholder 2406/head
Krzysztof Szafranek [Sun, 9 Oct 2016 02:59:04 +0000 (04:59 +0200)] 
Show number of annotations instead of nbAnnotations placeholder

When there was more than one annotation, a placeholder was displayed in both themes, instead of actual number.

7 years agoFix few invalid HTML tags 2405/head
Krzysztof Szafranek [Sun, 9 Oct 2016 01:37:21 +0000 (03:37 +0200)] 
Fix few invalid HTML tags

7 years agoupdate German installation.rst
Strubbl [Sat, 8 Oct 2016 18:28:18 +0000 (20:28 +0200)] 
update German installation.rst

7 years agoupdate German installation.rst
Strubbl [Sat, 8 Oct 2016 18:25:48 +0000 (20:25 +0200)] 
update German installation.rst

7 years agoChmoded install.sh
Nicolas Lœuillet [Sat, 8 Oct 2016 13:14:45 +0000 (15:14 +0200)] 
Chmoded install.sh

7 years agoCleaned up documentation for installation process
Nicolas Lœuillet [Sat, 8 Oct 2016 13:10:56 +0000 (15:10 +0200)] 
Cleaned up documentation for installation process

7 years agoMerge pull request #2402 from wallabag/remove-1x-changelog
Jeremy Benoist [Sat, 8 Oct 2016 12:07:35 +0000 (14:07 +0200)] 
Merge pull request #2402 from wallabag/remove-1x-changelog

Removed 1.x stuff in CHANGELOG

7 years agoRemoved 1.x stuff in CHANGELOG 2402/head
Nicolas Lœuillet [Sat, 8 Oct 2016 12:05:07 +0000 (14:05 +0200)] 
Removed 1.x stuff in CHANGELOG

7 years agoMerge pull request #2351 from wallabag/fix-api-client-deletion
Nicolas Lœuillet [Sat, 8 Oct 2016 11:31:54 +0000 (13:31 +0200)] 
Merge pull request #2351 from wallabag/fix-api-client-deletion

Changed relation between API client and refresh token

7 years agoMerge pull request #2393 from wallabag/api-urls-exist
Nicolas Lœuillet [Sat, 8 Oct 2016 11:31:31 +0000 (13:31 +0200)] 
Merge pull request #2393 from wallabag/api-urls-exist

Ability to check multiple urls in API

7 years agoMerge pull request #2397 from wallabag/api-orphan-tags
Nicolas Lœuillet [Sat, 8 Oct 2016 11:31:08 +0000 (13:31 +0200)] 
Merge pull request #2397 from wallabag/api-orphan-tags

Ensure orphan tag are remove in API

7 years agoMerge pull request #2399 from wallabag/use-locale-for-config
Jeremy Benoist [Sat, 8 Oct 2016 08:34:08 +0000 (10:34 +0200)] 
Merge pull request #2399 from wallabag/use-locale-for-config

Use default locale for user config

7 years agoMerge pull request #2400 from wallabag/doc-env-prod
Jeremy Benoist [Sat, 8 Oct 2016 08:33:52 +0000 (10:33 +0200)] 
Merge pull request #2400 from wallabag/doc-env-prod

Set env to prod in documentation

7 years agoSet env to prod in documentation 2400/head
Jeremy Benoist [Sat, 8 Oct 2016 07:39:07 +0000 (09:39 +0200)] 
Set env to prod in documentation

7 years agoUse default locale for user config 2399/head
Jeremy Benoist [Sat, 8 Oct 2016 07:33:55 +0000 (09:33 +0200)] 
Use default locale for user config

When creating a user, we set the language config “en” by default. We should use the defined locale (from `parameters.yml`) instead

7 years agoEnsure access_token are removed 2351/head
Jeremy Benoist [Fri, 7 Oct 2016 22:02:22 +0000 (00:02 +0200)] 
Ensure access_token are removed

When we remove the client, we should ensure that access_token are also removed.

To ensure that, I created a test that generated an access_token. So when we remove the client, this association should be cascaded and shouldn’t generate an error.

Also I moved some Api related stuff to the ApiBundle (like the developer controler and ClientType form)

7 years agoEnsure orphan tag are remove in API 2397/head
Jeremy Benoist [Fri, 7 Oct 2016 21:31:53 +0000 (23:31 +0200)] 
Ensure orphan tag are remove in API

When the association between a tag and an entry is removed, if the tag doesn’t have other entries, we can remove it.

Also add more tests for that part and ensure TagControllerTest is isolated from the rest of the test suite (finally!)

7 years agoMerge pull request #2396 from wallabag/mruminski-patch-1
Nicolas Lœuillet [Fri, 7 Oct 2016 20:20:51 +0000 (22:20 +0200)] 
Merge pull request #2396 from wallabag/mruminski-patch-1

Update messages.pl.yml

7 years agoMerge pull request #2395 from wallabag/socket-connection
Nicolas Lœuillet [Fri, 7 Oct 2016 20:20:37 +0000 (22:20 +0200)] 
Merge pull request #2395 from wallabag/socket-connection

Add ability to use socket

7 years agoUpdate messages.pl.yml 2396/head
Mateusz Rumiński [Fri, 7 Oct 2016 19:32:27 +0000 (21:32 +0200)] 
Update messages.pl.yml

translated shared_by_wallabag to polish

7 years agoAdd ability to use socket 2395/head
Jeremy Benoist [Fri, 7 Oct 2016 19:00:13 +0000 (21:00 +0200)] 
Add ability to use socket

For Redis & MySQL

7 years agoAbility to check multiple urls in API 2393/head
Jeremy Benoist [Fri, 7 Oct 2016 18:37:01 +0000 (20:37 +0200)] 
Ability to check multiple urls in API

7 years agoMerge pull request #2386 from wallabag/update-changelog
Nicolas Lœuillet [Fri, 7 Oct 2016 15:35:57 +0000 (17:35 +0200)] 
Merge pull request #2386 from wallabag/update-changelog

Changed Changelog by using github-changelog-generator from @skywinder

7 years agoMerge pull request #2389 from wallabag/add-info-publich-articles
Nicolas Lœuillet [Fri, 7 Oct 2016 14:35:32 +0000 (16:35 +0200)] 
Merge pull request #2389 from wallabag/add-info-publich-articles

Added default picture if preview picture is null

7 years agoMerge pull request #2388 from wallabag/fix-2factor-user-admin
Nicolas Lœuillet [Fri, 7 Oct 2016 14:35:01 +0000 (16:35 +0200)] 
Merge pull request #2388 from wallabag/fix-2factor-user-admin

Fixed two-factor checkbox display in user admin panel

7 years agoMerge pull request #2385 from wallabag/add-doc-about-siteconfig
Jeremy Benoist [Fri, 7 Oct 2016 14:02:03 +0000 (16:02 +0200)] 
Merge pull request #2385 from wallabag/add-doc-about-siteconfig

Added documentation about siteconfig fix

7 years agoUpdate release process 2386/head
Nicolas Lœuillet [Fri, 7 Oct 2016 13:30:25 +0000 (15:30 +0200)] 
Update release process

7 years agoFixed review 2385/head
Nicolas Lœuillet [Fri, 7 Oct 2016 13:27:05 +0000 (15:27 +0200)] 
Fixed review

7 years agoAdded default picture if preview picture is null 2389/head
Nicolas Lœuillet [Fri, 7 Oct 2016 13:21:31 +0000 (15:21 +0200)] 
Added default picture if preview picture is null

7 years agoAdded link to fivefilters website
Nicolas Lœuillet [Fri, 7 Oct 2016 13:14:15 +0000 (15:14 +0200)] 
Added link to fivefilters website

7 years agoFixed two-factor checkbox display in user admin panel 2388/head
Nicolas Lœuillet [Fri, 7 Oct 2016 12:56:26 +0000 (14:56 +0200)] 
Fixed two-factor checkbox display in user admin panel
Fix #2380

7 years agoFixed review
Nicolas Lœuillet [Fri, 7 Oct 2016 12:40:32 +0000 (14:40 +0200)] 
Fixed review