]> git.immae.eu Git - github/wallabag/wallabag.git/log
github/wallabag/wallabag.git
8 years agoMerge pull request #1763 from wallabag/v2-prepare-beta2
Jeremy Benoist [Fri, 11 Mar 2016 12:43:57 +0000 (13:43 +0100)] 
Merge pull request #1763 from wallabag/v2-prepare-beta2

Prepare files for 2.0.0-beta.2

8 years agogit clone with prefer-dist option 1763/head
Nicolas Lœuillet [Thu, 10 Mar 2016 12:04:56 +0000 (13:04 +0100)] 
git clone with prefer-dist option

8 years agoFinally back to composer create-project but with --keep-vcs option
Nicolas Lœuillet [Thu, 10 Mar 2016 11:41:45 +0000 (12:41 +0100)] 
Finally back to composer create-project but with --keep-vcs option

8 years agoAdd -o option in composer install command
Nicolas Lœuillet [Tue, 8 Mar 2016 11:08:41 +0000 (12:08 +0100)] 
Add -o option in composer install command

8 years agoFrench documentation for new installation
Nicolas Lœuillet [Tue, 8 Mar 2016 10:42:11 +0000 (11:42 +0100)] 
French documentation for new installation

8 years agoPrepare files for 2.0.0-beta.2
Nicolas Lœuillet [Tue, 8 Mar 2016 10:40:37 +0000 (11:40 +0100)] 
Prepare files for 2.0.0-beta.2

8 years agoMerge pull request #1771 from wallabag/docker-timezone
Nicolas Lœuillet [Wed, 9 Mar 2016 09:42:15 +0000 (10:42 +0100)] 
Merge pull request #1771 from wallabag/docker-timezone

Docker timezone

8 years agoAdd comment about timezone definition 1771/head
djay [Thu, 3 Mar 2016 18:21:37 +0000 (19:21 +0100)] 
Add comment about timezone definition

8 years agoAdd the timezone as an argument in the docker-compose.
djay [Wed, 2 Mar 2016 12:31:53 +0000 (13:31 +0100)] 
Add the timezone as an argument in the docker-compose.

For that, need to use v2 of docker-compose (with version >= 1.6.0)

8 years agoAdd the timezone for PHP docker container
djay [Thu, 25 Feb 2016 20:56:33 +0000 (21:56 +0100)] 
Add the timezone for PHP docker container

8 years agoMerge pull request #1766 from wallabag/v2-add-wallabag-in-title
Jeremy Benoist [Tue, 8 Mar 2016 14:49:13 +0000 (15:49 +0100)] 
Merge pull request #1766 from wallabag/v2-add-wallabag-in-title

Fix #1756: Added 'wallabag' in page title

8 years agoAdded 'wallabag' in page title 1766/head
Nicolas Lœuillet [Tue, 8 Mar 2016 14:22:35 +0000 (15:22 +0100)] 
Added 'wallabag' in page title

8 years agoMerge pull request #1762 from wallabag/v2-fix-quickstart-links
Jeremy Benoist [Tue, 8 Mar 2016 11:00:59 +0000 (12:00 +0100)] 
Merge pull request #1762 from wallabag/v2-fix-quickstart-links

Change documentation links in quickstart

8 years agoChange documentation links in quickstart 1762/head
Nicolas Lœuillet [Tue, 8 Mar 2016 10:21:40 +0000 (11:21 +0100)] 
Change documentation links in quickstart

8 years agoMerge pull request #1761 from wallabag/v2-API-version
Nicolas Lœuillet [Tue, 8 Mar 2016 09:09:57 +0000 (10:09 +0100)] 
Merge pull request #1761 from wallabag/v2-API-version

V2 api version

8 years agoMerge pull request #1675 from wallabag/v2-create-api-client
Nicolas Lœuillet [Tue, 8 Mar 2016 09:09:39 +0000 (10:09 +0100)] 
Merge pull request #1675 from wallabag/v2-create-api-client

Ability to create new client for the API

8 years agotypos & cs 1761/head
Thomas Citharel [Tue, 8 Mar 2016 08:22:25 +0000 (09:22 +0100)] 
typos & cs

8 years agowrite test for version
Vincent [Mon, 7 Mar 2016 14:16:27 +0000 (15:16 +0100)] 
write test for version

8 years agoAdd version in API
Vincent [Mon, 7 Mar 2016 14:00:03 +0000 (15:00 +0100)] 
Add version in API

8 years agoFix translations mistake 1675/head
Jeremy Benoist [Mon, 7 Mar 2016 10:05:14 +0000 (11:05 +0100)] 
Fix translations mistake

In Material template, move the developer link in the left menu (like in baggy)

8 years agoTranslate "how to" page
Jeremy Benoist [Mon, 7 Mar 2016 08:20:20 +0000 (09:20 +0100)] 
Translate "how to" page

8 years agoUse external js & css
Jeremy Benoist [Mon, 7 Mar 2016 07:58:08 +0000 (08:58 +0100)] 
Use external js & css

8 years agoAdd translations
Jeremy Benoist [Sat, 5 Mar 2016 21:29:58 +0000 (22:29 +0100)] 
Add translations

8 years agoAdd listing clients
Jeremy Benoist [Sat, 5 Mar 2016 20:44:39 +0000 (21:44 +0100)] 
Add listing clients

Rename route to be more consistive (ie: prefixed with developer_)

8 years agoCleanup form
Jeremy Benoist [Sat, 5 Mar 2016 19:04:19 +0000 (20:04 +0100)] 
Cleanup form

- Avoid too much hidden data in the form (instead of manually define the submit button and hide the default, use the default one !)
- Fix HTML syntax in client_parameters
- Add developer link in baggy menu
- Fix space between link in material footer

8 years agoUpdate filters picture in documentation
Nicolas Lœuillet [Fri, 4 Mar 2016 15:20:04 +0000 (16:20 +0100)] 
Update filters picture in documentation

8 years agoMerge pull request #1750 from wallabag/v2-quickstart-documentation
Jeremy Benoist [Fri, 4 Mar 2016 15:14:39 +0000 (16:14 +0100)] 
Merge pull request #1750 from wallabag/v2-quickstart-documentation

Documentation about filters / Quickstart changes

8 years agoMerge pull request #1670 from wallabag/v2-mark-imported-articles-as-read
Nicolas Lœuillet [Fri, 4 Mar 2016 15:12:45 +0000 (16:12 +0100)] 
Merge pull request #1670 from wallabag/v2-mark-imported-articles-as-read

Mark all imported articles as read

8 years agoupdate picture 1750/head
Nicolas Lœuillet [Fri, 4 Mar 2016 14:45:45 +0000 (15:45 +0100)] 
update picture

8 years agoMerge pull request #1754 from wallabag/v2-api-new-properties-light
Nicolas Lœuillet [Fri, 4 Mar 2016 11:31:27 +0000 (12:31 +0100)] 
Merge pull request #1754 from wallabag/v2-api-new-properties-light

Add starred & archive properties to API

8 years agoRemove 'content' from API 1754/head
Jeremy Benoist [Fri, 4 Mar 2016 10:40:48 +0000 (11:40 +0100)] 
Remove 'content' from API

Waiting to find a good solution to avoid side problem since user can no define the content

8 years agouse booleans instead of empty
Thomas Citharel [Tue, 9 Feb 2016 13:18:55 +0000 (14:18 +0100)] 
use booleans instead of empty

8 years agoadd more properties for entries #1634
Thomas Citharel [Mon, 8 Feb 2016 21:00:38 +0000 (22:00 +0100)] 
add more properties for entries #1634

8 years agoAdding test 1670/head
Jeremy Benoist [Fri, 4 Mar 2016 09:04:51 +0000 (10:04 +0100)] 
Adding test

Reformat json file (thanks pro.jsonlint.com)

8 years agoMerge pull request #1753 from Horgix/v2-typo-doc-en
Nicolas Lœuillet [Fri, 4 Mar 2016 05:17:19 +0000 (06:17 +0100)] 
Merge pull request #1753 from Horgix/v2-typo-doc-en

Doc: fix typo in php-hash ext name

8 years agoDoc: fix typo in php-hash ext name 1753/head
Alexis 'Horgix' Chotard [Fri, 4 Mar 2016 00:07:45 +0000 (01:07 +0100)] 
Doc: fix typo in php-hash ext name

8 years agocs & tests for wllbg v1 import
Thomas Citharel [Sat, 13 Feb 2016 15:20:00 +0000 (16:20 +0100)] 
cs & tests for wllbg v1 import

8 years agofrench translation & pocket
Thomas Citharel [Sat, 13 Feb 2016 13:32:16 +0000 (14:32 +0100)] 
french translation & pocket

8 years agoMark all imported articles as read
Thomas Citharel [Fri, 12 Feb 2016 14:59:13 +0000 (15:59 +0100)] 
Mark all imported articles as read

8 years agoDocumentation about filters (and some fixes in french documentation
Nicolas Lœuillet [Thu, 3 Mar 2016 07:06:18 +0000 (08:06 +0100)] 
Documentation about filters (and some fixes in french documentation

8 years agoAdd new links in quickstart
Nicolas Lœuillet [Thu, 3 Mar 2016 06:30:05 +0000 (07:30 +0100)] 
Add new links in quickstart

8 years agoMerge pull request #1745 from benages/v2
Nicolas Lœuillet [Wed, 2 Mar 2016 08:06:46 +0000 (09:06 +0100)] 
Merge pull request #1745 from benages/v2

V2 spanish translation

8 years agoSpanish translation 1745/head
Juanjo Benages [Tue, 1 Mar 2016 22:26:03 +0000 (23:26 +0100)] 
Spanish translation

8 years agoSpanish translation
Juanjo Benages [Tue, 1 Mar 2016 21:36:21 +0000 (22:36 +0100)] 
Spanish translation

8 years agoSpanish translation
Juanjo Benages [Tue, 1 Mar 2016 21:33:55 +0000 (22:33 +0100)] 
Spanish translation

8 years agoSpanish translation
Juanjo Benages [Tue, 1 Mar 2016 21:24:34 +0000 (22:24 +0100)] 
Spanish translation

8 years agoSpanish translation
Juanjo Benages [Tue, 1 Mar 2016 21:20:42 +0000 (22:20 +0100)] 
Spanish translation

8 years agoMerge remote-tracking branch 'upstream/v2' into v2
Juanjo Benages [Tue, 1 Mar 2016 20:02:13 +0000 (21:02 +0100)] 
Merge remote-tracking branch 'upstream/v2' into v2

8 years agoStart of the spanish translation
Juanjo Benages [Tue, 1 Mar 2016 20:00:35 +0000 (21:00 +0100)] 
Start of the spanish translation

8 years agoMerge pull request #1743 from wallabag/v2-releasing-documentation
Jeremy Benoist [Tue, 1 Mar 2016 19:49:54 +0000 (20:49 +0100)] 
Merge pull request #1743 from wallabag/v2-releasing-documentation

Releasing documentation

8 years agoAdd steps in RELEASE_PROCESS 1743/head
Nicolas Lœuillet [Tue, 1 Mar 2016 19:21:18 +0000 (20:21 +0100)] 
Add steps in RELEASE_PROCESS

8 years agoReleasing documentation
Nicolas Lœuillet [Tue, 1 Mar 2016 14:39:22 +0000 (15:39 +0100)] 
Releasing documentation

8 years agoMerge pull request #1615 from bdunogier/release_process_doc
Nicolas Lœuillet [Tue, 1 Mar 2016 19:06:44 +0000 (20:06 +0100)] 
Merge pull request #1615 from bdunogier/release_process_doc

Added RELEASE_PROCESS document

8 years agoMerge pull request #1740 from goofy-bz/patch-6
Nicolas Lœuillet [Tue, 1 Mar 2016 16:00:49 +0000 (17:00 +0100)] 
Merge pull request #1740 from goofy-bz/patch-6

minor typofix again

8 years agofixing previous stuff and more 1740/head
goofy-bz [Tue, 1 Mar 2016 15:12:15 +0000 (16:12 +0100)] 
fixing previous stuff and more

8 years agominor fix
goofy-bz [Tue, 1 Mar 2016 15:09:50 +0000 (16:09 +0100)] 
minor fix

adding non-breaking spaces here and there + small piece of translation and relevant French link

8 years agoMerge pull request #1742 from wallabag/v2-issue-template-package
Jeremy Benoist [Tue, 1 Mar 2016 12:23:39 +0000 (13:23 +0100)] 
Merge pull request #1742 from wallabag/v2-issue-template-package

Add the way to install (package or composer)

8 years agoAdd the way to install (package or composer) 1742/head
Nicolas Lœuillet [Tue, 1 Mar 2016 11:01:42 +0000 (12:01 +0100)] 
Add the way to install (package or composer)

8 years agoMerge pull request #1738 from wallabag/v2-prepare-beta1
Jeremy Benoist [Tue, 1 Mar 2016 08:00:42 +0000 (09:00 +0100)] 
Merge pull request #1738 from wallabag/v2-prepare-beta1

Prepare wallabag for first beta :rocket:

8 years agoMerge pull request #1739 from goofy-bz/patch-5
Nicolas Lœuillet [Tue, 1 Mar 2016 05:15:49 +0000 (06:15 +0100)] 
Merge pull request #1739 from goofy-bz/patch-5

minor typofix + missing quotes

8 years agominor typofix again
goofy-bz [Mon, 29 Feb 2016 21:04:32 +0000 (22:04 +0100)] 
minor typofix again

8 years agominor typofix + missing quotes 1739/head
goofy-bz [Mon, 29 Feb 2016 20:55:06 +0000 (21:55 +0100)] 
minor typofix + missing quotes

Added quotes to be reviewed

8 years agoPrepare wallabag for first beta :rocket: 1738/head
Nicolas Lœuillet [Mon, 29 Feb 2016 20:34:36 +0000 (21:34 +0100)] 
Prepare wallabag for first beta :rocket:

8 years agoRemove comments
Nicolas Lœuillet [Mon, 29 Feb 2016 20:28:37 +0000 (21:28 +0100)] 
Remove comments

8 years agoAdd password for auth
Thomas Citharel [Thu, 25 Feb 2016 15:06:13 +0000 (16:06 +0100)] 
Add password for auth

8 years agoadd tests
Nicolas Lœuillet [Tue, 16 Feb 2016 19:18:59 +0000 (20:18 +0100)] 
add tests

8 years agoEnhance documentation and create a form to create a new client
Nicolas Lœuillet [Tue, 16 Feb 2016 12:49:25 +0000 (13:49 +0100)] 
Enhance documentation and create a form to create a new client

8 years agoAPI: rename application to client
Nicolas Lœuillet [Tue, 16 Feb 2016 07:21:39 +0000 (08:21 +0100)] 
API: rename application to client

8 years agoAdded developer documentation
Nicolas Lœuillet [Tue, 16 Feb 2016 06:55:18 +0000 (07:55 +0100)] 
Added developer documentation

8 years agoFix #1597: first draft to create new client for the API
Nicolas Lœuillet [Mon, 15 Feb 2016 21:12:50 +0000 (22:12 +0100)] 
Fix #1597: first draft to create new client for the API

8 years agoMerge pull request #1736 from wallabag/v2-update-capistrano-gem
Jeremy Benoist [Mon, 29 Feb 2016 17:55:33 +0000 (18:55 +0100)] 
Merge pull request #1736 from wallabag/v2-update-capistrano-gem

Update Capistrano libraries with last versions

8 years agoUpdate Capistrano libraries with last versions 1736/head
Nicolas Lœuillet [Mon, 29 Feb 2016 14:31:43 +0000 (15:31 +0100)] 
Update Capistrano libraries with last versions

8 years agoMerge pull request #1734 from wallabag/v2-todo
Nicolas Lœuillet [Mon, 29 Feb 2016 16:19:39 +0000 (17:19 +0100)] 
Merge pull request #1734 from wallabag/v2-todo

Remove extra definition

8 years agoSkipping all Posgres test for wallabag:install 1734/head
Jeremy Benoist [Mon, 29 Feb 2016 15:22:30 +0000 (16:22 +0100)] 
Skipping all Posgres test for wallabag:install

We already faced this problem but we are facing it again.
https://github.com/wallabag/wallabag/commit/d502762598db68ec822078642df8f6a8214202f7

It seems we can drop a database properly using wallabag:install.

The server log keep saying:
ERROR:  source database "template1" is being accessed by other users
DETAIL:  There is 1 other session using the database.
STATEMENT:  CREATE DATABASE "wallabag_test"

Which means, it can't remove the database wallabag_test because one other person is using it.

8 years agoDefining Github token is now useless
Jeremy Benoist [Mon, 29 Feb 2016 14:41:26 +0000 (15:41 +0100)] 
Defining Github token is now useless

We are using it differently with .composer-auth.json file

8 years agoFix postgres database creation
Jeremy Benoist [Mon, 29 Feb 2016 08:49:05 +0000 (09:49 +0100)] 
Fix postgres database creation

Test database was renamed in https://github.com/wallabag/wallabag/pull/1639 but the travis configuration was missed

8 years agoRemove extra definition
Jeremy Benoist [Mon, 29 Feb 2016 08:22:53 +0000 (09:22 +0100)] 
Remove extra definition

Since Symfony 3.0.3 has been released

8 years agoMerge pull request #1732 from mjjzf/v2
Jeremy Benoist [Sat, 27 Feb 2016 23:38:10 +0000 (00:38 +0100)] 
Merge pull request #1732 from mjjzf/v2

Adding Danish translations to Wallabag v2

8 years agoAdded RELEASE_PROCESS document 1615/head
Bertrand Dunogier [Fri, 22 Jan 2016 09:40:20 +0000 (10:40 +0100)] 
Added RELEASE_PROCESS document

8 years agoadded newline 1732/head
Morten Juhl-Johansen Zölde-Fejér [Sat, 27 Feb 2016 16:19:17 +0000 (17:19 +0100)] 
added newline

8 years agoFixed indentation issue
Morten Juhl-Johansen Zölde-Fejér [Sat, 27 Feb 2016 15:33:16 +0000 (16:33 +0100)] 
Fixed indentation issue

8 years agoconfig.yml edit to include Danish
Morten Juhl-Johansen Zölde-Fejér [Sat, 27 Feb 2016 15:16:32 +0000 (16:16 +0100)] 
config.yml edit to include Danish

8 years agoAdding Danish translations to Wallabag v2
Morten Juhl-Johansen Zölde-Fejér [Sat, 27 Feb 2016 15:00:19 +0000 (16:00 +0100)] 
Adding Danish translations to Wallabag v2

8 years agoMerge pull request #1731 from wallabag/v2-fix-travis-auth
Jeremy Benoist [Sat, 27 Feb 2016 14:21:35 +0000 (15:21 +0100)] 
Merge pull request #1731 from wallabag/v2-fix-travis-auth

Fix: #1703: authentication for PR by external contributors

8 years agoReplace token by a no scope one 1731/head
Nicolas Lœuillet [Sat, 27 Feb 2016 13:07:04 +0000 (14:07 +0100)] 
Replace token by a no scope one

8 years agoFix authentication for PR by external contributors
Nicolas Lœuillet [Sat, 27 Feb 2016 10:26:09 +0000 (11:26 +0100)] 
Fix authentication for PR by external contributors

8 years agoMerge pull request #1653 from wallabag/v2-annotator-comments
Nicolas Lœuillet [Fri, 26 Feb 2016 17:17:37 +0000 (18:17 +0100)] 
Merge pull request #1653 from wallabag/v2-annotator-comments

V2 annotator comments

8 years agoRegenerate Annotator with idAnnotation instead of idComment 1653/head
Nicolas Lœuillet [Fri, 26 Feb 2016 15:03:41 +0000 (16:03 +0100)] 
Regenerate Annotator with idAnnotation instead of idComment

8 years agoRename CommentBundle with AnnotationBundle
Nicolas Lœuillet [Fri, 26 Feb 2016 12:59:08 +0000 (13:59 +0100)] 
Rename CommentBundle with AnnotationBundle

8 years agochanged french translation from commentaire to annotation
Thomas Citharel [Wed, 24 Feb 2016 12:47:59 +0000 (13:47 +0100)] 
changed french translation from commentaire to annotation

8 years agodisplay how much comments there are for an entry
Thomas Citharel [Wed, 24 Feb 2016 12:36:08 +0000 (13:36 +0100)] 
display how much comments there are for an entry

8 years agoMove annotatorjs to the bottom of the body
Thomas Citharel [Wed, 24 Feb 2016 00:13:30 +0000 (01:13 +0100)] 
Move annotatorjs to the bottom of the body

So that the "article" tag is loaded before

8 years agoAdd annotator in baggy theme
Nicolas Lœuillet [Tue, 23 Feb 2016 10:32:48 +0000 (11:32 +0100)] 
Add annotator in baggy theme

+ Documentation about annotations

8 years agoComment work with annotator v2
Thomas Citharel [Sun, 7 Feb 2016 15:52:59 +0000 (16:52 +0100)] 
Comment work with annotator v2

- add missing annotator.js file and fix typo
- edit & delete routes, started tests
- basic tests

8 years agoMerge pull request #1728 from wallabag/v2-change-delete-tag-icon
Jeremy Benoist [Fri, 26 Feb 2016 09:27:57 +0000 (10:27 +0100)] 
Merge pull request #1728 from wallabag/v2-change-delete-tag-icon

Fix #1717: Change remove tag icon in entry view with material theme

8 years agoChange remove tag icon in entry view with material theme 1728/head
Nicolas Lœuillet [Fri, 26 Feb 2016 07:58:36 +0000 (08:58 +0100)] 
Change remove tag icon in entry view with material theme

8 years agoMerge pull request #1723 from shtrom/v2-lang-fix
Jeremy Benoist [Thu, 25 Feb 2016 07:01:00 +0000 (08:01 +0100)] 
Merge pull request #1723 from shtrom/v2-lang-fix

Make English welcome message more natural

8 years agoMake English welcome message more natural 1723/head
Olivier Mehani [Thu, 25 Feb 2016 00:32:40 +0000 (11:32 +1100)] 
Make English welcome message more natural

    sed -i "s/Welcome on wallabag/Welcome to wallabag/"

Signed-off-by: Olivier Mehani <shtrom@ssji.net>
8 years agoMerge pull request #1712 from wallabag/v2-contributing
Jeremy Benoist [Wed, 24 Feb 2016 18:47:56 +0000 (19:47 +0100)] 
Merge pull request #1712 from wallabag/v2-contributing

Fix #1711: Update CONTRIBUTING file

8 years agofixes 1712/head
Nicolas Lœuillet [Wed, 24 Feb 2016 18:45:42 +0000 (19:45 +0100)] 
fixes