mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-30 04:51:01 +00:00
Code Issues Projects Releases Wiki Activity
2114 commits 12 branches 100 tags 171 MiB
Commit graph

2114 commits

This branch
This branch
All branches
Author SHA1 Message Date
Juanjo Benages
348e2b4852 Spanish translation 2016-03-01 22:24:34 +01:00
Juanjo Benages
bd5b3ea8ea Spanish translation 2016-03-01 22:20:42 +01:00
Juanjo Benages
9c5cfd2823 Merge remote-tracking branch 'upstream/v2' into v2 2016-03-01 21:02:13 +01:00
Juanjo Benages
0e576d2163 Start of the spanish translation 2016-03-01 21:00:35 +01:00
Jeremy Benoist
646df062df Merge pull request #1743 from wallabag/v2-releasing-documentation 
Releasing documentation
 2016-03-01 20:49:54 +01:00
Nicolas Lœuillet
6b6f725182 Add steps in RELEASE_PROCESS 2016-03-01 20:21:18 +01:00
Nicolas Lœuillet
461a171467 Releasing documentation 2016-03-01 20:10:26 +01:00
Nicolas Lœuillet
f8b835f537 Merge pull request #1615 from bdunogier/release_process_doc 
Added RELEASE_PROCESS document
 2016-03-01 20:06:44 +01:00
Nicolas Lœuillet
df814148c3 Merge pull request #1740 from goofy-bz/patch-6 
minor typofix again
 2016-03-01 17:00:49 +01:00
goofy-bz
7b70feb9d2 fixing previous stuff and more 2016-03-01 16:12:15 +01:00
goofy-bz
9adfede511 minor fix 
adding non-breaking spaces here and there + small piece of translation and relevant French link
 2016-03-01 16:09:50 +01:00
Jeremy Benoist
244ee24764 Merge pull request #1742 from wallabag/v2-issue-template-package 
Add the way to install (package or composer)
 2016-03-01 13:23:39 +01:00
Nicolas Lœuillet
a6a971d45f Add the way to install (package or composer) 2016-03-01 12:01:42 +01:00
Jeremy Benoist
4be43814e2 Merge pull request #1738 from wallabag/v2-prepare-beta1 
Prepare wallabag for first beta 🚀
 2016-03-01 09:00:42 +01:00
Nicolas Lœuillet
2ebbbb26ae Merge pull request #1739 from goofy-bz/patch-5 
minor typofix + missing quotes
 2016-03-01 06:15:49 +01:00
goofy-bz
c273b3a5c1 minor typofix again 2016-02-29 22:04:32 +01:00
goofy-bz
5d0f104bf0 minor typofix + missing quotes 
Added quotes to be reviewed
 2016-02-29 21:55:06 +01:00
Nicolas Lœuillet
6e3d65ccb0 Prepare wallabag for first beta 🚀 2016-02-29 21:34:36 +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
Bertrand Dunogier
923a7e8d68 Added RELEASE_PROCESS document 2016-02-27 23:32:26 +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