Commit graph

2096 commits

Author SHA1 Message Date
goofy-bz
5d0f104bf0 minor typofix + missing quotes
Added quotes to be reviewed
2016-02-29 21:55:06 +01:00
Jeremy Benoist
8808b79230 Merge pull request #1736 from wallabag/v2-update-capistrano-gem
Update Capistrano libraries with last versions
2016-02-29 18:55:33 +01:00
Nicolas Lœuillet
8edf89b29e Update Capistrano libraries with last versions 2016-02-29 17:20:20 +01:00
Nicolas Lœuillet
1e18360cc7 Merge pull request #1734 from wallabag/v2-todo
Remove extra definition
2016-02-29 17:19:39 +01:00
Jeremy Benoist
3c39f5ac41 Skipping all Posgres test for wallabag:install
We already faced this problem but we are facing it again.
d502762598

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.
2016-02-29 16:23:36 +01:00
Jeremy Benoist
dfad9ba0f9 Defining Github token is now useless
We are using it differently with .composer-auth.json file
2016-02-29 15:41:43 +01:00
Jeremy Benoist
bb0efca468 Fix postgres database creation
Test database was renamed in https://github.com/wallabag/wallabag/pull/1639 but the travis configuration was missed
2016-02-29 09:49:50 +01:00
Jeremy Benoist
a19a371ae7 Remove extra definition
Since Symfony 3.0.3 has been released
2016-02-29 09:23:15 +01:00
Jeremy Benoist
30e5174ea7 Merge pull request #1732 from mjjzf/v2
Adding Danish translations to Wallabag v2
2016-02-28 00:38:10 +01:00
Morten Juhl-Johansen Zölde-Fejér
8249b988cc added newline 2016-02-27 17:19:17 +01:00
Morten Juhl-Johansen Zölde-Fejér
449df236ac Fixed indentation issue 2016-02-27 16:33:16 +01:00
Morten Juhl-Johansen Zölde-Fejér
8ccc306468 config.yml edit to include Danish 2016-02-27 16:16:32 +01:00
Morten Juhl-Johansen Zölde-Fejér
2b788cadab Adding Danish translations to Wallabag v2 2016-02-27 16:00:19 +01:00
Jeremy Benoist
2481da00dc Merge pull request #1731 from wallabag/v2-fix-travis-auth
Fix: #1703: authentication for PR by external contributors
2016-02-27 15:21:35 +01:00
Nicolas Lœuillet
f06e268fc9 Replace token by a no scope one 2016-02-27 14:07:04 +01:00
Nicolas Lœuillet
6daadb6c44 Fix authentication for PR by external contributors 2016-02-27 11:26:09 +01:00
Nicolas Lœuillet
162954763e Merge pull request #1653 from wallabag/v2-annotator-comments
V2 annotator comments
2016-02-26 18:17:37 +01:00
Nicolas Lœuillet
b07c7dfe78 Regenerate Annotator with idAnnotation instead of idComment 2016-02-26 18:14:50 +01:00
Nicolas Lœuillet
4dc872238a Rename CommentBundle with AnnotationBundle 2016-02-26 18:14:42 +01:00
Thomas Citharel
9eab365e28 changed french translation from commentaire to annotation 2016-02-26 18:14:42 +01:00
Thomas Citharel
a772d16b12 display how much comments there are for an entry 2016-02-26 18:14:42 +01:00
Thomas Citharel
2b6e65a5e3 Move annotatorjs to the bottom of the body
So that the "article" tag is loaded before
2016-02-26 18:14:27 +01:00
Nicolas Lœuillet
7720cca532 Add annotator in baggy theme
+ Documentation about annotations
2016-02-26 18:14:12 +01:00
Thomas Citharel
f38e03dc02 Comment work with annotator v2
- add missing annotator.js file and fix typo
- edit & delete routes, started tests
- basic tests
2016-02-26 18:13:17 +01:00
Jeremy Benoist
d3f1a9dc1a Merge pull request #1728 from wallabag/v2-change-delete-tag-icon
Fix #1717: Change remove tag icon in entry view with material theme
2016-02-26 10:27:57 +01:00
Nicolas Lœuillet
575e6907e5 Change remove tag icon in entry view with material theme 2016-02-26 08:58:36 +01:00
Jeremy Benoist
74932af231 Merge pull request #1723 from shtrom/v2-lang-fix
Make English welcome message more natural
2016-02-25 08:01:00 +01:00
Olivier Mehani
ef186de38a Make English welcome message more natural
sed -i "s/Welcome on wallabag/Welcome to wallabag/"

Signed-off-by: Olivier Mehani <shtrom@ssji.net>
2016-02-25 11:32:40 +11:00
Jeremy Benoist
b60bff0c2a Merge pull request #1712 from wallabag/v2-contributing
Fix #1711: Update CONTRIBUTING file
2016-02-24 19:47:56 +01:00
Nicolas Lœuillet
3174b764bc fixes 2016-02-24 19:45:42 +01:00
Jeremy Benoist
f2fcb65b44 Fix wrong variable name
> The variable $requirement does not exist.
2016-02-24 14:49:51 +01:00
Jeremy Benoist
f83125d2f5 Merge pull request #1716 from wallabag/v2-enhance-requirements-installation
Fix #1603: Enhance requirements in InstallCommand
2016-02-24 14:47:35 +01:00
Jeremy Benoist
7af794e525 Remove gettext & lowerize 2016-02-24 14:19:47 +01:00
Jeremy Benoist
fd3fd481a6 Exclude v1 branches from Travis
Instead of allowing only v2.
Branches which didn't target v2 BUT related to v2 weren't tested on Travis
2016-02-24 13:50:29 +01:00
Jeremy Benoist
7447461352 Add namespace prefix for psr-4
> Defining autoload.psr-4 with an empty namespace prefix is a bad idea for performance
2016-02-24 13:43:02 +01:00
Jeremy Benoist
d7cc16c8b5 Merge pull request #1710 from wallabag/v2-message-graby-fails
Fix #811: Display a human message when graby fails to fetch articles
2016-02-24 08:43:17 +01:00
Jeremy Benoist
b091b1b330 Merge pull request #1715 from wallabag/v2-add-contributors-libraries
Fix #1694 #1669 #1684: Add contributors and 3rd party libraries
2016-02-24 08:39:17 +01:00
Thomas Citharel
0a7e695975 remove unused functions & clean composer.json 2016-02-23 23:29:25 +01:00
Thomas Citharel
db847ca0b7 add composer extensions check & function_exists checks 2016-02-23 19:06:37 +01:00
Nicolas Lœuillet
fc6020b2c8 Enhance requirements in InstallCommand 2016-02-23 16:41:38 +01:00
Nicolas Lœuillet
ff94ee94a6 Update issue template 2016-02-23 16:28:07 +01:00
Nicolas Lœuillet
ecb266d0ec replace contributors with a link to github 2016-02-23 16:18:13 +01:00
Nicolas Lœuillet
4a2c089c68 Add contributors and 3rd party libraries 2016-02-23 16:04:01 +01:00
Nicolas Lœuillet
754cb2abc0 Merge pull request #1714 from wallabag/v2-install-admin
Change wording for create a new user
2016-02-23 15:37:00 +01:00
Jeremy Benoist
90280df080 Change wording for create a new user 2016-02-23 14:38:42 +01:00
Nicolas Lœuillet
bb17ddea61 changed error message 2016-02-22 22:14:56 +01:00
Nicolas Lœuillet
0504f5660e Update CONTRIBUTING file 2016-02-22 22:10:26 +01:00
Nicolas Lœuillet
924ef7cacd Added documentation about errors during fetching 2016-02-22 22:00:52 +01:00
Nicolas Lœuillet
2aadeea8cd Merge pull request #1683 from wallabag/v2-demo
Demonstration mode to prevent password changes
2016-02-22 14:18:34 +01:00
Jeremy Benoist
2b71f68c95 Merge pull request #1701 from wallabag/v2-maintenance
Fix #1351: add maintenance mode
2016-02-22 13:40:15 +01:00