Compare commits

...

4047 Commits
1.0.0 ... 2.3.4

Author SHA1 Message Date
2555c0a40f Release wallabag 2.3.4 2018-11-24 21:20:28 +01:00
bffe65478d Merge pull request #3775 from wallabag/prepare-2.3.4
Prepare 2.3.4 release
2018-11-24 21:13:03 +01:00
5a4cbf5b70 Create a custom swap to avoid error 2018-11-23 22:11:10 +01:00
ea60d76e60 Use latest bridge to avoid PHPUnit break
Because branch 4.8 & 5.7 have been removed
2018-11-23 22:11:10 +01:00
d470f817ac Use new Travis infra 2018-11-23 22:11:04 +01:00
dc90eab32b Prepare 2.3.4 release 2018-11-23 08:34:13 +01:00
e01b00298a Merge pull request #3774 from Simounet/feature/card-ui
Card no preview replaced by wallabag logo
2018-11-21 20:56:09 +01:00
2daae77094 Card no preview replaced by wallabag logo 2018-11-21 18:51:44 +01:00
59a31ed07f Merge pull request #3772 from techexo/patch-1
Update translation when marking as read
2018-11-16 14:34:41 +01:00
060f3ce34c Update messages.en.yml 2018-11-16 14:16:38 +01:00
ccc3b0a531 Update messages.fr.yml 2018-11-16 01:45:16 +01:00
0ddfb2956c Update messages.fr.yml
Modification pour éclaircir le sens de l'option
2018-11-16 01:37:53 +01:00
b3bcc6aa06 Merge pull request #3769 from burkemw3/patch-4
Add rel=noopener to target=_blank links
2018-11-09 16:08:27 +01:00
a22b8043b4 Add rel=noopener to target=_blank links
From https://developers.google.com/web/tools/lighthouse/audits/noopener:
- new pages will run in separate processes, avoiding any performance
  intermingling impacts
- new pages won't have access to current page's window object via JavaScript
2018-11-07 20:34:54 -05:00
078d54411b Merge pull request #3766 from merwan/patch-1
Fix link to wallabag requirements in documentation
2018-11-06 05:20:28 +00:00
c7e9610b3f Fix link to wallabag requirements in documentation 2018-11-05 10:17:50 +01:00
3a69628007 Merge pull request #3764 from shtrom/fix-matches-notmatches-language
Fix documentation wording for matches/notmatches tagging rules
2018-11-01 12:04:55 +01:00
3f0dd0f0bc fixup! fixup! Fix documentation wording for matches/notmatches tagging rules 2018-11-01 19:40:17 +11:00
da7b8e256f fixup! Fix documentation wording for matches/notmatches tagging rules 2018-11-01 19:26:06 +11:00
0452e869ec Fix documentation wording for matches/notmatches tagging rules
Signed-off-by: Olivier Mehani <shtrom@ssji.net>
2018-10-31 19:56:48 +11:00
385dac6d31 Merge pull request #3763 from wallabag/ghpr-template-update
Add note on GitHub PR template to auto-close issues
2018-10-27 06:15:03 +00:00
96823682f9 misc: add note on GitHub PR template to auto-close issues
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2018-10-26 23:50:55 +02:00
a6e4e83809 Merge pull request #3553 from wallabag/url-3529
Swap entry url with origin url if graby provides an updated one
2018-10-26 11:31:41 +02:00
1b220426e2 phpcs
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2018-10-24 22:33:32 +02:00
6059967951 updateOriginUrl: remove 'query string' case from ignore list
Two urls with a different query string may refer to two different pages
so keep them both.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2018-10-24 22:27:27 +02:00
44e63667d9 updateOriginUrl: add comment blocks for the parse_url diff check
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2018-10-24 22:13:03 +02:00
5ba5e22a09 updateOriginUrl: rewrite some if, resolving feedbacks from PR
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2018-10-24 21:54:09 +02:00
b49c87acf1 ignoreOriginUrl: add initial support of ignore lists
Add the ability to specify hosts and patterns lists to ignore the given
entry url and replace it with the fetched content url without touching
to origin_url.

This initial support should be reworked in the following months to move
the hardcoded ignore lists in the database.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2018-10-22 23:42:09 +02:00
fc040c749d updateOriginUrl: add behavior when diff is fragment and query
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2018-10-22 23:08:58 +02:00
e07fadea76 Refactor updateOriginUrl to include new behaviors behaviors
- Leave origin_url unchanged if difference is an ending slash
- Leave origin_url unchanged if difference is scheme
- Ignore (noop) if difference is query string or fragment

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2018-10-22 23:01:16 +02:00
781864b954 ContentProxy: swap entry url to origin_url and set new url according to graby content
Closes #3529

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2018-10-21 16:15:31 +02:00
4a81360efc ContentProxy: fix a corner case when entry.url is empty in updateEntry
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2018-10-21 16:13:20 +02:00
ae4f7dceec Merge pull request #3733 from Deuchnord/root-abort-update
Abort running install and update script if root
2018-10-17 11:26:12 +02:00
c2bd272cf3 Added argument to ignore the warning. 2018-10-16 20:34:28 +02:00
0658ce4f11 Merge pull request #3745 from burkemw3/patch-3
Add placeholder image to card-based gallery entries page
2018-10-16 07:45:22 +00:00
cefbe6a87f Add placeholder image to card-based gallery entries page for #3651
I referenced https://css-tricks.com/using-svg/ for using the SVG icon.
The icon has a black foreground and white background, which doesn't
look very good as a placeholder. So, using the background-image style
to show the svg and the inversion filter to make it white on gray.

With the image always present, there isn't much difference between
the with and without image preview templates, so I merged them.

Tested on Chrome, Firefox, and Safari on OSX.
2018-10-15 23:59:39 -04:00
fbdc665487 Merge pull request #3606 from mritzmann/master
add manifest.json for android pwa
2018-10-15 08:30:26 +00:00
0ebf595c11 Merge pull request #3706 from shtrom/fix/gnu-make-bash
Makefile fixes for non GNU systems
2018-10-14 20:07:42 +02:00
ba69c04c27 Merge pull request #3743 from burkemw3/patch-1
Show tags on non-image gallery preview card
2018-10-13 12:00:00 +00:00
78ef840eda Merge pull request #3734 from davidmohamedfr/fix-dockerfile-php72
Fix dockerfile php72
2018-10-13 06:30:10 +00:00
d73bfdbddb Show tags on non-image gallery preview card
Tags and images aren't coupled, so they shouldn't be coupled in
the UI, either. This also makes the titles and source domains show
up consistently for image and non-image entry cards.
2018-10-11 19:47:48 -04:00
f5c862640b libpng12-dev was rename as libpng-dev 2018-10-06 14:15:59 +02:00
9e83c3bdf0 remove mcrypt since openssl is included in php 7.2
mcrypt extension doesn't exist anymore
2018-10-06 14:15:01 +02:00
23aa47d828 Abort running install and update script if root (closes #3590) 2018-10-06 12:23:40 +02:00
0f5c15d543 Merge pull request #3725 from Tobi823/master
Bugfix: Sanitize the title of a saved webpage from invalid UTF-8 characters.
2018-09-24 18:34:16 +02:00
28cc645b93 Run php-cs-fixer for fixing coding standard issues (on ContentProxyTest) 2018-09-23 23:42:05 +02:00
83f1c3274f Run php-cs-fixer for fixing coding standard issues 2018-09-23 22:20:43 +02:00
d64139d812 Make helper methods strToHex and hexToStr in ContentProxyTest.php private
to prevent misusage (from outside this class)
2018-09-21 13:31:28 +02:00
7a65c2017b Override the value of the given parameter ($title) with the (hopefully)
correct (to UTF-8) converted PDF title
2018-09-21 13:23:39 +02:00
c01d953292 Add tests for logic
Try to translate the title of a PDF from UTF-8 (then UTF-16BE, then WINDOWS-1252) to UTF-8
2018-09-21 13:15:00 +02:00
f80f16dfc8 Try to detect the character encoding in PDFs and try to translate
the title from the PDF to UTF-8
2018-09-21 13:15:00 +02:00
8648f0c005 Remove type declaration for PHP 5 compatibility 2018-09-21 13:15:00 +02:00
d76a5a6d60 Bugfix: Sanitize the title of a saved webpage from invalid UTF-8 characters 2018-09-21 13:15:00 +02:00
759c91940b Merge pull request #3726 from wallabag/fix-tests
Liberation goes https
2018-09-21 08:16:27 +00:00
84b3bdaac0 Liberation goes https 2018-09-21 09:07:40 +02:00
8013f35d96 Merge pull request #3719 from wallabag/fix-sort-parameters
Fix sort parameters
2018-09-07 17:02:39 +02:00
c0b65ad1c9 Updating node to 6.10
Same as defined in .travis.yml
2018-09-07 15:18:00 +02:00
4408ebd40a Fix tests 2018-09-07 15:18:00 +02:00
8d109df851 Jump to the new Scrutinizer PHP analysis engine 2018-09-07 15:18:00 +02:00
17476f4d8d Add missing parameters
Parameters weren’t passed to the sub function.
2018-09-07 13:56:14 +02:00
495f83c925 Merge pull request #3712 from wallabag/refactor-entry-queries
Rename getBuilderByUser and refactor query for untagged entries
2018-09-07 11:43:07 +00:00
eb5e3f1d1d Merge pull request #3717 from wallabag/php-72
PHP 7.2 shouldn't fail
2018-09-06 11:28:57 +02:00
04f85fd9a8 PHP 7.2 shouldn't fail 2018-09-06 07:58:26 +02:00
b8115ff46b php-cs-fixer
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2018-09-05 18:44:08 +02:00
0636697289 EntryRepository: refactor getBuilderForUntaggedByUser
Improve SQL performance by replacing size(e.tags) with a left join and a
null condition

Move the QueryBuilder logic into getRawBuilderForUntaggedByUser

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2018-09-05 18:44:08 +02:00
b7c5fda512 EntryRepository: refactor getBuilderByUser
We refactor getBuilderByUser to separate QueryBuilder getter and the
orderBy(). The previous code of getBuilderByUser() has been moved to
getSortedQueryBuilderByUser(). getBuildByUser() now returns a
QueryBuilder without the call to orderBy().

A new method named sortQueryBuilder() returns a given QueryBuilder with
an orderBy() call using given sort parameters.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2018-09-05 18:44:08 +02:00
69b563948d AnnotationRepository: rename getBuilderByUser
We rename getBuilderByUser to getSortedQueryBuilderByUser as long as the
method currently returns a QueryBuilder with an orderBy()

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2018-09-05 18:44:08 +02:00
ada5d5b269 Merge pull request #3716 from wallabag/csfixer
php-cs-fixer: native_function_invocation
2018-09-05 16:38:20 +00:00
2a1ceb67b4 php-cs-fixer
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2018-09-05 14:25:32 +02:00
685a5d745e Merge pull request #3707 from wallabag/fix-test-de-at
Removing failing test from Travis
2018-08-19 18:15:11 +02:00
72efc80fdc Removing failing test from Travis 2018-08-19 16:38:48 +02:00
fea06d19f3 Merge pull request #3705 from wallabag/update-release
Update release script
2018-08-19 09:17:40 +02:00
681e04b060 Makefile fixes for non GNU systems
* Move `Makefile` to `GNUmakefile`, which GNU `make` picks first
* Add `Makefile` so other `make`s forward to `gmake`
* Set the `SHELL` variable and let `make` handle the shell

Signed-off-by: Olivier Mehani <shtrom@ssji.net>
2018-08-18 18:50:18 +10:00
2bf568ff46 Update release script 2018-08-17 14:40:06 +02:00
1421236800 Merge pull request #3702 from aleksandar-todorovic/patch-1
Fixes a typo
2018-08-16 14:45:23 +02:00
e0a9791412 Fixes another typo 2018-08-10 20:28:48 +02:00
7fd4ad6564 Fixes a typo 2018-08-10 20:15:46 +02:00
d29b18e82e Merge pull request #3690 from Simounet/fix/srcset-attribute
More robust srcset image attribute handling
2018-07-23 16:24:20 +00:00
e6f12c0734 More robust srcset image attribute handling
Linked to HTMLawed PR https://github.com/kesar/HTMLawed/pull/17
2018-07-12 14:29:30 +02:00
0f36a88e16 Merge pull request #3692 from Simounet/feature/svg-logo
Feature/svg logo
2018-07-12 11:31:30 +00:00
e93f37206a wallabag logo (side-nav) replaced by an SVG one 2018-07-11 21:57:53 +02:00
4c78612eb4 wallabag logo with typo replaced by an SVG one 2018-07-11 21:51:52 +02:00
2fdd512488 Fake wallabag logo data image replaced by real SVG 2018-07-11 21:25:46 +02:00
9b12f822e1 Merge pull request #3691 from Simounet/feature/login-username-autofocus
Autofocus the username field on the login page
2018-07-11 18:49:38 +00:00
d02e6850c2 Autofocus the username field on the login page 2018-07-11 20:10:51 +02:00
6337b46e80 Merge pull request #3678 from anmol26s/patch-1
Propose YunoHost badge for installing
2018-07-06 05:40:03 +00:00
9216bab8c9 Merge pull request #3683 from Simounet/fix/iframe-video-width-shared
Fix mobile viewport on big iframe and video elements
2018-07-06 05:38:39 +00:00
9bc086071a Merge pull request #3686 from wallabag/remove-trusted-proxies
Remove remaining deprecation notices
2018-07-06 05:38:02 +00:00
80336f77fd The 'framework.trusted_proxies' configuration key has been deprecated in Symfony 3.3 2018-07-05 21:01:45 +02:00
200392b462 Merge pull request #3685 from wallabag/fix-random-failing-test
Replace SO url by lemonde.fr to avoid random failing test
2018-07-05 13:37:28 +00:00
9c48053b14 Replace SO url by lemonde
Looks like we got a lot of random failing while grabing SO content, replacing it might fix the problem.
2018-07-05 14:50:27 +02:00
18167b9a24 Merge pull request #3684 from Simounet/fix/empty-image-download-error
Fix image downloading on null image path
2018-07-05 12:15:50 +00:00
3fbbe0d9f1 Fix image downloading on null image path 2018-07-05 11:40:51 +02:00
6cf7f21dcb Fix mobile viewport on big iframe and video elements 2018-06-28 15:22:51 +02:00
8d09f57c0d Propose YunoHost badge for installing
The YunoHost have working Wallabag package with working install,remove,update,backup and restore scripts. YunoHost makes self -hosting easy for the end users. Please add the this badge so that people can find this solution.
2018-06-22 02:43:43 +05:30
e586d65b64 Merge pull request #3675 from wallabag/prepare-2.3.3
Prepare 2.3.3 release
2018-06-19 07:44:48 +00:00
7ddba67745 Prepare 2.3.3 release 2018-06-19 06:50:13 +02:00
7ebd4bdcf7 Merge pull request #3538 from wallabag/fix-migrations-dash
Fixed migrations with dash into db names
2018-06-15 05:25:44 +00:00
49b4c87598 We should able to get the table name unescaped
When we want to perform complex queries to retrieve metadata from the database
2018-06-14 14:15:07 +02:00
bfe7a69226 Fixed migrations with dash into db name 2018-06-14 13:43:09 +02:00
36054f5dd4 Merge pull request #3636 from flozz/syntax-highlight
Highlight code in articles using highlight.js
2018-06-07 06:22:14 +00:00
c00a691019 Merge pull request #3668 from wallabag/fix-tests
Fix tests
2018-06-07 06:21:06 +00:00
778543311f Fix tests 2018-06-06 17:34:20 +02:00
a550a64c84 Merge pull request #3614 from comradekingu/patch-3
Spelling: GitHub, Log out, of the dev
2018-06-06 14:26:40 +00:00
def73759ae Merge pull request #3664 from Simounet/fix/entry-attributes-encoding
Fix authors and preview alt encoding display
2018-06-05 04:33:37 +00:00
03f2cacb58 Fix authors and preview alt encoding display 2018-06-04 12:04:37 +02:00
fea68d1a72 Merge pull request #3646 from Quenty31/master
[i18n] Occitan update
2018-06-01 14:53:49 +02:00
8fe73e076c Merge pull request #3661 from Simounet/fix/2981-srcset-image
Fix srcset attribute on images downloaded
2018-06-01 14:53:04 +02:00
c15bb5ad72 Fix srcset attribute on images downloaded 2018-06-01 13:49:16 +02:00
9707ac4661 Merge pull request #3653 from Simounet/fix/firefox-mobile-unneeded-resize
Fix/firefox mobile unneeded resize
2018-05-24 21:36:51 +02:00
53ec80be94 Fix missing generated CSS 2018-05-24 11:57:22 +02:00
f136d288d6 Fix Firefox mobile unneeded resize
Before that, on Firefox Mobile, when you were moving to the top or to
the bottom of the page, you were stopped before to go to the opposite
side.
2018-05-24 09:04:02 +02:00
1d770f9867 Merge pull request #3652 from Simounet/fix/overflow-wrap
Fix overflow wrap issue
2018-05-24 07:16:36 +02:00
a6e5637507 Fix overflow wrap issue 2018-05-21 19:47:28 +02:00
65f499b4ac Update wallabag_user.oc.yml 2018-05-06 12:36:55 +02:00
4745ca3fde Update CraueConfigBundle.oc.yml 2018-05-05 21:16:20 +02:00
7c3184376c Update wallabag_user.oc.yml
Mens dialectal, mai estandard
2018-05-05 21:15:01 +02:00
609adaca9b Update messages.oc.yml 2018-05-05 21:13:55 +02:00
9562a8aca8 Update CraueConfigBundle.oc.yml 2018-05-05 21:09:00 +02:00
b2e7b8b600 Highlight code in articles using highlight.js 2018-04-23 19:11:24 +02:00
11f15430ff Merge pull request #3615 from notFloran/3612-login-by-email
Allow login by email
2018-04-03 22:08:42 +02:00
a0f126b973 Merge pull request #3616 from notFloran/3404-bookmarklet-encoding
Better encoding of the URI for the bookmarklet
2018-04-03 22:07:52 +02:00
08d6bedcaa Allow login by email 2018-04-01 20:57:10 +02:00
8e5b91180e Better encoding of the URI for the bookmarklet 2018-04-01 20:55:45 +02:00
3b46d0f947 Merge pull request #3619 from notFloran/fix-tests
Fix tests
2018-04-01 11:12:32 +02:00
80d4260a8e Fix CS in UtilsTest.php 2018-03-31 12:55:27 +02:00
739a4024fa Replace zataz url 2018-03-30 23:09:03 +02:00
3be96dcb17 Use https instead of http for bild.de to fix tests 2018-03-29 22:58:40 +02:00
f400aa1281 GitHub, Log out, of the dev 2018-03-25 04:31:22 +02:00
ed148f6685 add 512x512 appicon 2018-03-20 08:43:46 +01:00
10f31ac572 change href link for manifest.json 2018-03-19 08:32:33 +01:00
35ce4d5e5f add manifest.json for android pwa 2018-03-18 19:58:34 +01:00
727880c950 Merge pull request #3597 from wallabag/fix-tests
Fix tests
2018-03-17 13:28:10 +01:00
2ff26deaf8 Merge pull request #3592 from Simounet/fix/html-entities-on-default-title
Fix title card HTML parsing
2018-02-24 22:24:24 +01:00
ad77c3451f Looked UserBundle again.
See https://github.com/FriendsOfSymfony/FOSUserBundle/compare/v2.0.2...v2.1.0#diff-8a79d0e62995dd549be4e463c35a8cc3

It generate an error about a variable called `registration_enabled` which can not be found.
So I guess we are in the case of “such usage” about BC in UserBundle. Don’t want to loose time finding how to fix it. Rollback to the working version.
2018-02-24 22:12:48 +01:00
bf283db8e6 20 Minutes is now https 2018-02-24 22:02:52 +01:00
228d317204 Merge pull request #3573 from shulard/fix/unknown-withremove-variable
Fix error when withRemove variable is not defined.
2018-02-24 21:52:56 +01:00
4d9128ded9 Fix title card HTML parsing 2018-02-12 22:19:15 +01:00
cc09434ea4 Fix error when withRemove variable is not defined.
Since the withRemove variable is a template flag, it can be undefined.

In the Entry\Card\_content.html.twig template for example, the withRemove variable is not defined.
2018-01-23 18:51:52 +01:00
f24e9bfab0 Merge pull request #3568 from wallabag/prepare-2.3.2
Prepare 2.3.2 release
2018-01-22 11:10:12 +01:00
ac1811f83e Prepare 2.3.2 release 2018-01-22 10:06:31 +01:00
fd637b9a5a Merge pull request #3541 from Simounet/feature/nav-label-replaced-by-buttons
Nav actions updated
2018-01-12 23:10:21 +01:00
5614df19cf Fixed tests 2018-01-12 11:19:11 +01:00
91f5992423 Close add entry and search nav JS action improved 2018-01-12 10:07:46 +01:00
2831e77cce Nav close button alignment and nav boxes improved 2018-01-12 10:07:46 +01:00
63771b9ae3 Fix nav new entry and search form alignment 2018-01-12 10:07:46 +01:00
f86c2b5fa6 Label replaced by a button on the nav search form 2018-01-12 10:07:46 +01:00
e9e3f93805 Label replaced by a button on the nav new entry form 2018-01-12 10:07:46 +01:00
99e8c2785b Merge pull request #3546 from Strubbl/fix-2957-abort-update-on-error
add `set -eu` to update.sh
2018-01-03 21:00:43 +01:00
410216f435 Merge pull request #3536 from wallabag/tag-link-3534
Fix broken link to remove tags from entries
2018-01-03 20:37:57 +01:00
f3e71b5dd5 add set -eu to update.sh
fixes #2957
2018-01-03 05:34:29 +01:00
b8568662bd php-cs
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-31 13:19:26 +01:00
e0a862b626 Add test to prevent regression for #3534
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-31 00:56:40 +01:00
2679eb9d84 Merge pull request #3539 from wallabag/wallabag/new-client-button
Replaced Create new client link with a button
2017-12-28 11:12:06 +01:00
8fa6d62197 Replaced Create new client link with a button 2017-12-28 10:21:28 +01:00
8e15ece7df Fix broken link to remove tags from entries
Fixes #3534

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-27 22:53:03 +01:00
3473e600b1 Merge pull request #3525 from Simounet/fix/empty-card-title-link
Fix empty card title link
2017-12-26 16:00:58 +01:00
c04bde29a3 Added default value for title on entry view 2017-12-26 15:40:38 +01:00
11ed735c09 Merge pull request #3532 from wallabag/prepare-231
Prepared wallabag 2.3.1
2017-12-26 10:13:11 +01:00
f83e9e32fc Prepared wallabag 2.3.1 2017-12-26 09:15:39 +01:00
8ffcee8aff Updated baggy theme for the no-title fix 2017-12-26 09:07:28 +01:00
5e0c44a2ac Using new 'entry.default_title' as translation key 2017-12-26 09:02:00 +01:00
49fb9e7cab Card tags template shared 2017-12-26 09:02:00 +01:00
a8541089be Useless span removed from the card's title 2017-12-26 09:00:33 +01:00
ac8489f5f7 Default card title 2017-12-26 08:55:23 +01:00
3c9548257c Content card template shared 2017-12-26 08:55:23 +01:00
726e2cf3c6 Merge pull request #3524 from wallabag/fix-assets-sub
Fix assets for subfolder install
2017-12-26 08:49:59 +01:00
0d9c8081fe cs-fixer
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-20 22:18:26 +01:00
575d1d03d9 Update prod assets
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-20 21:55:34 +01:00
e8694faad6 Remove fixed relative path for assets 2017-12-20 21:53:48 +01:00
887073dedc Merge pull request #3521 from wallabag/mruminski-patch-1
Update messages.pl.yml
2017-12-19 10:02:52 +01:00
a9d274424f Update messages.pl.yml
add polish translation for 'provided by' and 'origin url'
2017-12-18 21:01:22 +01:00
ef5c8a7d01 Merge pull request #3515 from wallabag/php-7.2
Add PHP 7.2 compatibility
2017-12-18 14:32:21 +01:00
01ea7f5855 Merge pull request #3348 from pmichelazzo/master
Update PT translations
2017-12-18 13:34:01 +01:00
ad880894a8 Update CHANGELOG 2017-12-18 13:30:03 +01:00
acc0a80179 Add missing assertion in tests 2017-12-18 13:29:34 +01:00
5661e8d42a Fix countable in tests 2017-12-18 13:29:34 +01:00
7185fbff62 Update dama/doctrine-test-bundle
Because:

PHP Fatal error:  Class 'PHPUnit_Framework_BaseTestListener' not found in /home/travis/build/wallabag/wallabag/vendor/dama/doctrine-test-bundle/src/DAMA/DoctrineTestBundle/PHPUnit/LegacyPHPUnitListener.php on line 7
2017-12-18 13:29:34 +01:00
4b6942d2d8 Add missing TestCase namespace 2017-12-18 13:29:33 +01:00
26e2f07419 Fix typo 2017-12-18 13:29:33 +01:00
eb3754509d Add missing parameter for test 2017-12-18 13:29:33 +01:00
bd91bd5c32 Use namespaced PHPUnit classes 2017-12-18 13:29:33 +01:00
3ccf086391 Merge pull request #3516 from wallabag/delete-id
api: copy entry object before sending, to keep id
2017-12-18 12:33:05 +01:00
9e89bf7aca Removed duplicated line 2017-12-17 21:20:23 +01:00
f5ea67e4cf api: copy entry object before sending, to keep id
Workaround for https://github.com/wallabag/android-app/issues/646

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-17 21:07:46 +01:00
a5849ac956 Update PT translations 2017-12-17 10:57:17 +01:00
d1f260e2d7 Merge pull request #3504 from aaa2000/fix-initial-migration-with-table-prefix
Fix initial migration when using custom table prefix
2017-12-16 22:24:06 +01:00
ccb52fb461 Use getTable() to retrieve prefixed table name 2017-12-16 22:08:00 +01:00
d1224bf9f6 Merge pull request #3513 from wallabag/icons-3437
material: replace exit_to_app, redo and autorenew icons
2017-12-16 21:35:32 +01:00
b10be65ec7 Merge pull request #3511 from wallabag/install-command-note
command: replace note regarding server:run --env=prod
2017-12-16 20:16:13 +01:00
65d885da00 material: replace exit_to_app, redo and autorenew icons
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-16 20:07:11 +01:00
f565e10817 command: replace note regarding server:run --env=prod
server:run --env=prod does not exist anymore
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-16 19:14:25 +01:00
64e7c90ae9 Merge pull request #3507 from wallabag/fix-lowercase-migration
Fixed lower case tags migration
2017-12-16 09:02:56 +01:00
9b606725fe Merge pull request #3510 from wallabag/update-robotstxt
Updated robots.txt to prevent crawling
2017-12-16 09:02:40 +01:00
e4ae6b976f Updated robots.txt to prevent crawling 2017-12-15 21:51:12 +01:00
caf719f163 Fixed lower case tags migration 2017-12-15 13:59:02 +01:00
f1f2cf2bce Fix initial migration when using custom table prefix
Fix #3503
2017-12-14 19:14:10 +01:00
a68a80f654 Merge pull request #3442 from wallabag/empty-entry
Fix empty title and domain_name when exception is thrown during fetch
2017-12-14 11:19:44 +01:00
b457d7bd32 Update CHANGELOG
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-13 22:52:30 +01:00
300f293cb1 Add test on EntryControllerTest for #3442
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-13 22:44:31 +01:00
af29e1bf07 Fix empty title and domain_name when exception is thrown during fetch
Add a new helper to set a default title when it's empty:
1/ use basename part of entry's path, if any
2/ or use domain name

Fixes #2053

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-13 22:44:31 +01:00
70265817ae Merge pull request #3488 from wallabag/pg-10
Add custom driver & schema manager for PostgreSQL 10
2017-12-13 13:50:15 +01:00
08d6497c9c Merge pull request #3495 from wallabag/wallabag/remove-make-run-readme
Removed "make run" in the README
2017-12-13 12:06:38 +01:00
cef72d87a6 Removed "make run" in the README 2017-12-12 20:52:05 +01:00
d80e9931f5 Merge pull request #3492 from bdunogier/fix-3484-disable_share_link
Fix 3484: hide the share toggle button if no service is enabled
2017-12-12 20:24:36 +01:00
71318d6103 Merge pull request #3490 from wallabag/fix-rss-unread-icon
Displayed the RSS icon on homepage route
2017-12-12 20:20:52 +01:00
1f198256ed Merge pull request #3487 from wallabag/initial-migration
Change the way to check for initial migration
2017-12-12 20:20:31 +01:00
0ef1ffbf71 Fix #3484: hide the share toggle button if no service is enabled 2017-12-12 18:36:24 +01:00
629f913b8d Displayed the RSS icon on homepage route 2017-12-12 15:42:49 +01:00
3fadf42a1c CS 2017-12-12 14:30:22 +01:00
ad46f2fb46 Use hasTable instead of try/catch 2017-12-12 13:41:44 +01:00
2e9747a59a Fix tests 2017-12-12 13:34:06 +01:00
a1661af17c Add custom driver & schema manager for PostgreSQL 10 2017-12-12 12:14:40 +01:00
43e1711eb6 Change the way to check for initial migration 2017-12-12 11:17:16 +01:00
f209798368 Merge pull request #3481 from wallabag/fix-make-run
Replaced env by dev for make run
2017-12-12 09:50:33 +01:00
60f53cf46f Replaced env by dev for make run
The symfony server:run command can only be used in dev environment
2017-12-12 08:55:18 +01:00
cabadf169b Merge pull request #3478 from odolbeau/patch-1
Update README.md
2017-12-12 07:42:53 +01:00
63e6ee1293 Update README.md
Be ready for next year!
2017-12-11 22:32:39 +00:00
bd527a9f4c Merge pull request #3474 from wallabag/update-changelog
Updated changelog for 2.3
2017-12-11 19:53:10 +01:00
42f4f11ef0 Updated changelog for 2.3 2017-12-11 19:52:21 +01:00
98869090f6 Merge pull request #3468 from wallabag/fix-migration-3139
Fix migration from #3139
2017-12-11 19:38:46 +01:00
c31daf4725 Merge pull request #3473 from cvergne/fix-rssall
Fix All RSS not accessible if not logged in + Tests
2017-12-11 19:38:21 +01:00
12e7599b35 Merge pull request #3471 from cvergne/fix-rssdate
Fix #3448 - pubDate now conformant to DateTime RFC822 specifications
2017-12-11 16:11:23 +01:00
a40a8038d3 Fix All RSS not accessible if not logged in + Tests 2017-12-11 16:04:06 +01:00
70d73bdd86 Fix #3448 - pubDate now conformant to Date and Time specifications defined by RFC822 2017-12-11 13:17:42 +01:00
40a63c8b11 migrations: fix duplicate violation during lowercase tag migration
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-10 19:31:30 +01:00
6c5904ba7f Replace raw query with named parameter
Fix possible issue with special chars on #3139

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-10 18:22:41 +01:00
e9a4231d4f Merge pull request #3465 from wallabag/fix-tests
Fix bad key matching
2017-12-10 13:33:23 +01:00
55bd59962c Merge pull request #3467 from Simounet/feat/nav-improved
Feat/nav improved
2017-12-10 13:33:06 +01:00
f072829ce3 More space for navbar actions on mobile 2017-12-08 21:10:36 +01:00
da2a5fe222 Toggle menu anchor replaced by a button 2017-12-08 21:01:44 +01:00
4ac0e65963 Fix bad key matching
I didn't try to find which package introduced a BC (might be user-bundle
or jms serializer)
2017-12-08 12:10:28 +01:00
e99be2c134 Merge pull request #3461 from Simounet/fix/rss-on-tag-list
Tag's list improved
2017-12-08 10:27:43 +01:00
7475924eac Border radius on every corner of tag's list 2017-12-08 10:20:58 +01:00
c235cb75cd Fix duplicated code removed 2017-12-08 10:18:49 +01:00
3e7d86b2c5 Tags list view improved
No text ellipsis so we can see the whole tag, better responsiveness, bigger
touch height on links.
2017-12-08 10:18:49 +01:00
77a53ea724 Merge pull request #3463 from Simounet/feature/footer-improved
Footer improved
2017-12-08 10:10:15 +01:00
93e3329c58 Fix nav title nowrap on mobile 2017-12-07 23:46:29 +01:00
a6beec1bd2 Footer's stats displayed on mobile 2017-12-06 22:46:24 +01:00
39217f3108 Fix line-height issue on the footer 2017-12-06 22:21:19 +01:00
613a8ec312 Merge pull request #3438 from strobeltobias/patch-1
Translate new strings
2017-12-05 17:46:40 +01:00
aeab8b342e Merge pull request #3459 from Simounet/fix/pagination
Pagination improved
2017-12-05 10:03:32 +01:00
1f84aa903d Fix wrong selected page number alignment on pagination 2017-12-04 22:46:35 +01:00
f836b98fa6 Fix pagination on list mode 2017-12-04 22:31:30 +01:00
b9be1cf1ee Merge pull request #3449 from Simounet/feature/share-page
Share page improved (mobile + header's padding)
2017-12-04 10:11:32 +01:00
2784f674ea Figure image and figcaption centered on share page 2017-12-03 14:41:15 +01:00
970e107524 Share page improved (mobile + header's padding) 2017-12-03 14:38:46 +01:00
e2ee70f477 Translate new validators string 2017-11-26 14:49:59 +01:00
ca8d3ed598 Translate new strings 2017-11-26 14:24:03 +01:00
1d91f14516 Merge pull request #3436 from wallabag/origin-shaarli
Add craue setting to enable sharing of origin url to Shaarli
2017-11-26 08:58:17 +01:00
893fd6434f Add craue setting to enable sharing of origin url to Shaarli
Also fix the field name used in the query string and add it to baggy
theme

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-25 17:07:55 +01:00
773ac5b0f7 Merge pull request #3419 from NatJNP/patch1
Add Thai language
2017-11-25 12:29:53 +01:00
ceff312db8 Merge pull request #3401 from aaa2000/migration-initial
Add an initial doctrine migration
2017-11-25 12:28:41 +01:00
2020b4456c Add all file thai Language for translate 2017-11-24 02:53:01 +07:00
f818f64145 Merge pull request #3431 from wallabag/disable-site-credentials
Disable controller access if feature disabled
2017-11-22 15:11:25 +01:00
ef2b4041fb Disable controller access if feature disabled
If `restricted_access` is disabled, accessing `/site-credentials/` must be disabled.
2017-11-22 10:00:45 +01:00
f4e7a0df0e Fix phpcs 2017-11-21 22:07:37 +01:00
e36c85eb79 Fix travis fold 2017-11-21 21:35:17 +01:00
4c0ac1d10b Remove data sql files 2017-11-21 21:35:17 +01:00
18865cec86 Implements down migration 2017-11-21 21:35:17 +01:00
2680b0bc8c Fix installation command 2017-11-21 21:35:17 +01:00
2054740fdb Fold travis make prepare 2017-11-21 21:35:16 +01:00
18fb777b89 Add an initial migration 2017-11-21 21:35:16 +01:00
d3d0defabc Merge pull request #3398 from wallabag/issue-1735
Replace ant with Makefile
2017-11-21 15:12:48 +01:00
95b7d92ea5 Merge pull request #3425 from wallabag/add-setting-for-headers
Added internal setting to enable/disable headers storage
2017-11-21 13:26:24 +01:00
fb258aeef0 Merge pull request #3426 from wallabag/fix-migration-3373
Fix MySQL issue on mig from #3373
2017-11-21 11:03:39 +01:00
709e21a3f4 Define storeArticleHeaders false by default
Fix tests which must use `$storeArticleHeaders`.
Fix CS
2017-11-21 10:37:36 +01:00
64a5a6cfc5 CS 2017-11-21 10:30:35 +01:00
b3d85e69e9 Fix MySQL issue on mig from #3373
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-20 22:39:33 +01:00
f4f7994c40 Merge pull request #3346 from Kdecherf/origin-property
Add originUrl property to Entry
2017-11-20 21:10:33 +01:00
16b1939827 Merge pull request #3423 from wallabag/composer
composer: update dependency versions to reduce memory footprint
2017-11-20 19:51:03 +01:00
8a21985474 Added internal setting to enable/disable headers storage 2017-11-20 18:47:48 +01:00
b495929c0d composer: update dependency versions to reduce memory footprint
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 21:00:27 +01:00
eae8138b33 Fix phpcs
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:26:13 +01:00
65152fcb89 Improve EntryRestControllerTest for origin_url
Ensure that origin_url is initially null
Ensure patching entry with origin_url=''
Ensure patching entry with origin_url=null

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:02:11 +01:00
97444566db Update EntryControllerTest to handle origin_url
Set an origin_url in testEditUpdate
Test origin_url deletion in testEditRemoveOriginUrl

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:02:11 +01:00
ecf41ab3fa Replace hardcoded 'Provided by' string with i18n string
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:02:11 +01:00
3b771f51a6 Improve origin_url field description and translations
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:02:11 +01:00
8425f5cc3d Form: move url and origin_url to UrlType 2017-11-19 15:02:11 +01:00
6de4cd35b5 Add support of originUrl field in baggy entry view 2017-11-19 15:02:11 +01:00
00f2368f7a Add some tests for OriginUrl in EntryRestController
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:02:11 +01:00
3198ea9682 Handle original_url querystring in Shaarli sharing link
This feature needs at least shaarli-plugin-via 0.2 from
https://github.com/Kdecherf/shaarli-plugin-via to work.

Shaarli will silently ignore this parameter if this plugin is missing.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:02:11 +01:00
f0f162b8d2 Add support of originUrl field in material entry view
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:02:11 +01:00
e50e45d6fa Twig: add removeSchemeAndWww filter
This twig filter removes scheme (only http and https are supported) and
pass the result to removeWww filter to also remove 'www.' at the
beginning of an url.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:02:11 +01:00
03b020eb20 Entry: handle originUrl in edit form, update translations
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:02:11 +01:00
e0ef1a1c8b Add originUrl property to Entry, handle that in EntryRestController, handle migration
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:02:11 +01:00
e585dde46c Merge pull request #3422 from wallabag/simpleue-2
Jump to Simpleue 2.0
2017-11-19 13:53:13 +01:00
8bde7de1ee Replace ant with Makefile
Fixes #1735

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 12:33:21 +01:00
f6988b5aa3 Merge pull request #3421 from comradekingu/patch-2
Spelling: diaspora, e-mail, moved ?, URL, sharing
2017-11-19 11:31:46 +01:00
00d66d39fc Merge pull request #3420 from comradekingu/patch-1
Spelling: Two-factor for wallabag connection
2017-11-19 11:31:26 +01:00
c8ac32cf17 Jump to Simpleue 2.0
The 1.3.0 tag is introducing BC so we jump to the 2.0
2017-11-18 16:28:54 +01:00
2c437e930c "for the public wallabag demo", paywalled websites, diaspora* 2017-11-18 04:55:33 +01:00
3c6b00dc28 Spelling: diaspora, e-mail, moved ?, URL, sharing 2017-11-18 04:52:28 +01:00
13e677648c Spelling: Two-factor for wallabag connection 2017-11-18 04:39:52 +01:00
d0c596461b Add CraueConfigBundle.th.yml 2017-11-18 01:27:51 +07:00
2a4a861b34 Merge pull request #3412 from aaa2000/fix-tests
Fix the tests
2017-11-12 11:33:18 +01:00
cc79712738 Fix phpcs 2017-11-11 23:55:13 +01:00
d81bf605af Fix tests 2017-11-11 23:37:57 +01:00
f39cfa4690 Merge pull request #3404 from wallabag/issue-2424
material: replace card activator with article link on card preview
2017-11-07 13:59:47 +01:00
2f510787e7 material: replace card activator with article link on card preview
Fixes #2424

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-06 20:49:41 +01:00
8abb6c1321 Merge pull request #3397 from wallabag/issue-1871
material: disable editing of entry url input when submitting new url
2017-11-06 20:43:48 +01:00
46ee68ea48 Update assets for #3397 2017-11-05 13:20:50 +01:00
3d46eeeb33 material: disable editing of entry url input when submitting new url
Fixes #1871

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-05 13:14:47 +01:00
b0f9e52b7e Merge pull request #3387 from Kdecherf/fix-assets-23
Fix assets for 2.3
2017-11-02 15:49:37 +02:00
dccec95401 Merge pull request #3399 from aaa2000/editorconfig-makefile
Update .editorconfig for makefile
2017-11-02 10:21:10 +02:00
5872cd191c Update .editorconfig for makefile 2017-11-01 14:47:06 +01:00
c20327fc72 Merge pull request #3395 from wallabag/issue-3393
views/config: fix overlaying drop down menu
2017-11-01 11:12:44 +01:00
8801764583 views/config: fix overlaying drop down menu
Fixes #3393
2017-10-31 23:16:15 +01:00
494b47f299 Merge pull request #3392 from mart-e/add-title-page-epub
add the title of article on the epub export
2017-10-31 15:10:41 +02:00
15a6402f75 Properly run php-cs-fixer 2017-10-28 20:16:43 +02:00
385e651684 php-cs-fixer
php bin/php-cs-fixer fix src/Wallabag/CoreBundle/Helper/EntriesExport.php
2017-10-28 17:17:22 +02:00
c779373f2c Set the title in a separated chapter
Set the export option on the same page, same as done in producePdf
Move the ToC at the end of the book so the title page is the first one
2017-10-28 14:49:14 +02:00
a6e9ad0b7d add a title page
The first page of the book is the title
2017-10-28 10:45:37 +02:00
efbbfe0135 Updating .gitignore
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-10-24 00:20:56 +02:00
0b3ab03782 Removing web/bundles/wallabagcore and adding prod assets in web/wallassets
baggy.css, baggy.js, material.css, material.js and public.js are seen as
new files, something changed in these files.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-10-24 00:19:00 +02:00
9ff628ca56 webpack & views: replace bundles/wallabagcore with wallassets
This change will prevent composer from removing wallabagcore assets when
installing assets.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-10-24 00:15:52 +02:00
1953a87293 Merge pull request #3011 from wallabag/2.3
wallabag 2.3.0
2017-10-23 11:09:17 +02:00
702f2d67d6 Merge pull request #3385 from wallabag/prepare-23
Prepare wallabag 2.3.0
2017-10-20 15:43:13 +02:00
b4da3ee8e5 Prepare wallabag 2.3.0 2017-10-20 14:17:37 +02:00
8a30241dc5 Merge pull request #3384 from wallabag/mruminski-patch-1
Update messages.pl.yml
2017-10-19 15:07:43 +02:00
3828f525e1 Update messages.pl.yml
add polish translation for export footer_template
2017-10-19 13:07:24 +02:00
1c5081cdc5 Merge pull request #3373 from wallabag/change-readingtime-notnull
Changed reading_time field to prevent null values
2017-10-18 11:33:30 +02:00
91f9bacf73 Merge pull request #3362 from sviande/fix_3361_api_warning
Fix #3361 check type for tags in entry repository
2017-10-18 11:16:50 +02:00
7f5d03a98d Merge pull request #3383 from Kdecherf/fix-webpack-and-login
Fix webpack and login screen
2017-10-16 09:02:47 +02:00
3f29386cb7 Update prod assets
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-10-16 00:07:12 +02:00
7a1e1247cb webpack: handle _global img folder
Fixes missing image files after composer cleaning assets

Source of requireAll(): https://stackoverflow.com/a/30652110

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-10-16 00:01:52 +02:00
ef7f187fa8 Fix non-centered login form
Fixes #3343

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-10-16 00:01:52 +02:00
3930201003 Merge pull request #3382 from nclsHart/replace-kernel-rootdir
Replace kernel.root_dir by kernel.project_dir
2017-10-15 09:24:32 +02:00
64f4112cae Merge pull request #3381 from nclsHart/webserverbundle
Enable WebServerBundle in dev environment
2017-10-15 09:23:31 +02:00
9ca069a6fe Replace kernel.root_dir by kernel.project_dir
kernel.root_dir and Kernel::getRootDir() are deprecated since Symfony 3.3.
See https://symfony.com/blog/new-in-symfony-3-3-a-simpler-way-to-get-the-project-root-directory and https://github.com/symfony/symfony/blob/3.3/UPGRADE-3.3.md#httpkernel for more information.
2017-10-14 00:32:56 +02:00
3c9fbb4e32 Enable WebServerBundle in dev environment
Since #3376, the web server console commands were not available.
2017-10-13 23:04:16 +02:00
0978bd849e Fix #3361 Entry Rest controller getEntries cast tags params to string 2017-10-13 10:28:05 +02:00
abce2f05dd Fixed @Kdecherf's review 2017-10-13 10:11:24 +02:00
705d3c38dc CS 2017-10-13 09:35:44 +02:00
88bac4a33e Changed reading_time field to prevent null values 2017-10-13 09:35:44 +02:00
bb86dc6486 CS 2017-10-12 07:38:27 +02:00
d03b72f405 Fix #3361 add test 2017-10-12 07:38:27 +02:00
fafdf17117 Fix #3361 check type for tags in entry repository
Check is $tags is a string before explode
2017-10-12 07:38:27 +02:00
f44a927530 Merge pull request #3372 from wallabag/translate-export-page
Translated first page of exported article
2017-10-11 14:12:49 +02:00
9dd67fa342 CS 2017-10-11 10:43:36 +02:00
8f187e280f Fixed @j0k3r's review 2017-10-11 10:43:19 +02:00
dc7fa8dfc6 Fixed @tcitworld's review 2017-10-11 10:43:19 +02:00
b1428a1cf8 Translated first page of exported article 2017-10-11 10:43:19 +02:00
d8dc7372ab Merge pull request #3376 from wallabag/symfony-3.3
Symfony 3.3
2017-10-11 09:55:03 +02:00
21bdbb2d5e Merge pull request #3378 from wallabag/2.3-ru
Add Russian language
2017-10-10 12:22:22 +02:00
4bea44da92 update Russian language 2017-10-10 10:48:38 +02:00
ef5fcdee20 add Russian language 2017-10-10 10:48:29 +02:00
28af2989ec Add Russian language in CoreBundle Resources and CraueConfigBundle 2017-10-10 10:47:48 +02:00
f645d371ce Fix MondeDiplo https url 2017-10-10 10:20:57 +02:00
3ef055ced3 CS 2017-10-09 16:47:15 +02:00
f40c88eb1f Jump to Symfony 3.3 & update others deps
Also update tests urls
2017-10-09 16:45:12 +02:00
ed5e175c20 Merge pull request #3347 from Kdecherf/entry-stats
Entry view: update .stats margins and color
2017-09-16 13:01:33 +02:00
79ea33c9d3 Entry view: update .stats margins and color
Decreasing margin of .stats, increasing vertical margin of .stats li,
increasing right margin of material icons and reducing contrast of
material icons.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-09-09 21:35:19 +02:00
23246a5da6 Merge pull request #3345 from wallabag/Quent-in-patch-1
Update messages.oc.yml
2017-09-09 18:57:50 +02:00
f764407daf Update messages.oc.yml 2017-09-09 18:23:59 +02:00
061fca8c6e Merge pull request #3340 from Kdecherf/fix-webpack
Fix webpack error on comments
2017-09-07 07:17:05 +02:00
f6d042f56d Merge pull request #3309 from wallabag/fix-multiple-tag-search
Multiple tag search, which was broken from API
2017-09-07 07:16:26 +02:00
9c4a7388da Remove unused function
Introduce after the rebase I guess
2017-09-06 22:58:35 +02:00
33264c2d02 Fix tests 2017-09-06 22:49:16 +02:00
7c04b7396a Multiple tag search was broken from API
First, the setParameter() were done on the same parameter which in fact
just duplicated the condition in the SQL query (like `where t.label =
'test' and t.label = 'test'`.

Changed the parameter doesn't help because the query was then wrong.

Changing the way to match associated tags for an entry and it worked.
2017-09-06 22:49:15 +02:00
e317a5ab60 Fix webpack error on comments
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-09-06 22:42:23 +02:00
78b36d4dbe Merge pull request #3332 from nclsHart/better-txt-export
Better entry txt export using html2text
2017-09-06 15:08:12 +02:00
b9c26b6330 Merge pull request #3337 from strobeltobias/patch-1
Add missing quotation marks and small fixes (2)
2017-09-04 12:09:26 +02:00
e85657fb10 Update messages.de.yml 2017-09-04 11:17:26 +02:00
f3e688207d Merge pull request #3333 from Quent-in/2.3
Update OC
2017-09-03 20:26:16 +02:00
3af5d41759 Merge pull request #3139 from Kdecherf/2502-tag-case
Ignore tag's case
2017-09-03 20:25:15 +02:00
9c4d1eb56a Merge pull request #3338 from strobeltobias/patch-2
Translate missing strings, add quotation marks
2017-09-03 20:24:41 +02:00
bcb10aeef8 Update to comply with suggested changes 2017-09-03 15:15:38 +02:00
973392cc48 Translate missing strings, add quotation marks 2017-09-01 23:15:18 +02:00
6c2a56458b Add missing quotation marks and small fixes (2) 2017-09-01 23:01:57 +02:00
442147d923 Update wallabag_user.oc.yml 2017-08-30 20:10:58 +02:00
a09136d2d2 Update CraueConfigBundle.oc.yml 2017-08-30 20:09:16 +02:00
de4bbe4968 Update validators.oc.yml 2017-08-30 20:06:34 +02:00
9f33293b7e Update 2017-08-30 20:01:11 +02:00
119e6c5edb Merge pull request #3330 from franek/set-starred-date
Add starred_at field which is set when an entry is starred
2017-08-30 13:53:49 +02:00
854616ac6d Merge pull request #3294 from wallabag/export-tag-null
Empty currentTag should be null
2017-08-30 13:51:20 +02:00
7b4f66881d php-cs-fixer on DoctrineMigrations/Version20170719231144
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-08-27 16:59:02 +02:00
e437ad810b Fix tests
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-08-27 16:51:23 +02:00
bd164a75c4 Add migration to change case of tags
This migration does not support SQLite as long as this engine does not
support Unicode in LOWER().

This migration starts by retrieving the list of lowercase tags which
need to be migrated. Then it retrieves the list of tags for each tags
from the previous step in order to migrate entries. It handles deletion
of empty tags. At the end the migration makes a full scan to update the
label of all remaining tags.

WARNING: THIS MIGRATION IS IRREVERSIBLE.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-08-27 16:51:23 +02:00
7036d91fe7 Tag: render tags case-insensitive by storing them in lowercase
Fixes #2502

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-08-27 16:51:23 +02:00
c660878388 better entry txt export using html2text 2017-08-27 00:04:21 +02:00
a991c46eed Set a starred_at field when an entry is starred.
This date is used to sort starred entries.

Can not use Entry::timestamps method otherwise starred_at will be updated each time entry is updated.
Add an updateStar method into Entry class
A migration script has been added in order to set starred_at field.
2017-08-25 21:19:47 +02:00
2490f61dca Merge remote-tracking branch 'origin/master' into 2.3 2017-08-22 11:22:47 +02:00
54171dd796 Merge pull request #3326 from nclsHart/reload-entry-command
Add reload entry command
2017-08-22 11:21:04 +02:00
dbf1188c5b rename getAllEntriesIdAndUrl into findAllEntriesIdAndUrlByUserId 2017-08-22 10:42:54 +02:00
215409a8b2 rename getAllEntriesId into findAllEntriesIdByUserId 2017-08-22 10:41:28 +02:00
511f1ce1e8 Add reload entry command 2017-08-21 10:45:48 +02:00
d83d25dade Merge pull request #3323 from egilli/fix-export-link-with-baggy
Fix export links in baggy theme
2017-08-14 17:45:16 +02:00
aa29fc4ec6 Fix export links in baggy theme 2017-08-13 18:03:32 +02:00
73b3d449b1 Merge pull request #3322 from braco/patch-1
Update Readme with crucial information
2017-08-12 09:32:51 +02:00
d0804524a1 Update Readme with crucial information 2017-08-10 14:54:58 -04:00
4d2758dfa0 Merge pull request #3319 from Quent-in/2.3
Translation : OC small changes
2017-08-10 10:13:09 +02:00
0d7d472c91 Small change
Apostrophe par erreur, et "aller À votre compte" et non "sur", pas choquant mais mieux je pense en OC.
2017-08-09 18:40:19 +02:00
86ecd2b543 Merge pull request #3314 from nclsHart/fix-3313
Reduce number of queries on tag list
2017-08-08 19:48:47 +02:00
aff1dd4ff1 Merge pull request #3317 from wallabag/mruminski-patch-1
Update messages.pl.yml
2017-08-08 19:38:43 +02:00
e86ee7fd1e Update messages.pl.yml
add polish translation for credentials
2017-08-08 15:45:44 +02:00
935e9fffb4 Reduce number of queries on tag list 2017-08-06 23:02:32 +02:00
f11a3cf21c Merge pull request #3312 from Quent-in/2.3
Occitan language updates
2017-08-06 15:39:04 +02:00
1aa5b75804 Correction apostrophe encadrée par simples apostrophes 2017-08-05 20:20:18 +02:00
efeaadcf9d Correction indent. L538
Correction indentation suite rapport Travis
2017-08-05 19:48:45 +02:00
fccc3a2e07 Merge pull request #3311 from nclsHart/makefile-webpack
Fix make build by replacing grunt with webpack
2017-08-05 19:19:09 +02:00
162740b798 Update
2FA : choix des occitanophones interrogés : autentificacion en dos temps.
+ fautes de frappes
2017-08-05 15:19:34 +02:00
86de3eb766 Update OC: correction fautes de frappe 2017-08-05 15:14:34 +02:00
5942d358b7 Update with new strings
L538 : not quite sure about the number of space.
2017-08-05 14:58:15 +02:00
a4fcb2e5c6 Update registration using API 2017-08-05 14:46:33 +02:00
5385fda8ab Fix make build by replacing grunt with webpack 2017-08-05 00:21:05 +02:00
8b5bef48d5 Merge pull request #3301 from nclsHart/list-user-command
Add list users command
2017-08-02 07:25:02 +02:00
f7a4b44136 add search argument and limit option to list users command 2017-07-31 23:20:41 +02:00
af31cfed76 Add list user command 2017-07-30 22:04:29 +02:00
882da5c5eb Merge pull request #3297 from nclsHart/commands-better-rendering
Better rendering for all core commands
2017-07-30 08:31:04 +02:00
4fc7eba349 Merge pull request #3298 from nclsHart/fix-namespace-phpdoc
Fix some namespaces and phpdoc
2017-07-30 08:27:39 +02:00
e492f8da13 Merge pull request #3299 from nclsHart/missing-method-prepare-entry
Add missing abstract method prepareEntry in BrowserImport
2017-07-30 08:10:50 +02:00
fe312015d2 Add missing abstract method prepareEntry in BrowserImport 2017-07-29 22:59:11 +02:00
52b84c11a5 Fix some namespaces and phpdoc 2017-07-29 22:51:50 +02:00
e1b33efb3d Better rendering for all core commands 2017-07-29 11:09:02 +02:00
d69a66a58e Merge pull request #3290 from nclsHart/fix-3019
Add a dedicated title for all entries page
2017-07-29 09:34:29 +02:00
bde23a44f8 Empty currentTag should be null
And when a parameter is null, it won't appear in the url like `?tag=`.
2017-07-28 08:07:11 +02:00
233eb91be4 Merge pull request #3291 from nclsHart/show-user-io
Better rendering for show user command using symfony style
2017-07-28 07:38:15 +02:00
e56f82142a Merge pull request #3292 from nclsHart/remove-getdoctrine
Remove unused method getDoctrine in several commands
2017-07-28 07:36:27 +02:00
6f9aba78a7 Merge pull request #3293 from nclsHart/remove-unused-use
Remove unused use statement in install command
2017-07-28 07:35:48 +02:00
04f19537e7 Remove unused use statement in install command 2017-07-27 23:51:01 +02:00
a19e212f43 Remove unused method getDoctrine in several commands 2017-07-27 23:44:12 +02:00
d58199f362 Better rendering for show user command using symfony style 2017-07-27 23:34:57 +02:00
383215866f add a dedicated title for all entries page 2017-07-27 23:08:08 +02:00
839edf32cc Merge pull request #3280 from Simounet/fix/2.3-date
Fix updatePublishedAt on already parsed article's date
2017-07-25 16:54:43 +02:00
35c1f1376c Merge pull request #3284 from wallabag/travis-7.2
Testing on PHP 7.2
2017-07-24 17:38:41 +02:00
ff9f89fd23 Add a test for updatePublishedAt
To avoid error when a content is re-submitted and it previously add a
published date.

Also, fix the `testPostSameEntry`
2017-07-24 17:07:47 +02:00
b236d3f627 Fix updatePublishedAt on already parsed article's date 2017-07-24 16:39:07 +02:00
9ab45e6813 Testing on PHP 7.2 2017-07-24 15:48:53 +02:00
ea127a401b Merge pull request #3283 from wallabag/fix-language-validation
Put the final URL in data test
2017-07-24 13:54:01 +02:00
459374022f CS 2017-07-24 11:52:43 +02:00
c6c45673af Put the final URL in data test 2017-07-24 11:13:53 +02:00
f39152ad6e Merge pull request #3266 from egilli/export-domain-as-author
Use the article publisher as author for exported files
2017-07-11 09:21:49 +02:00
c7fcca533d Merge pull request #3270 from wallabag/do-not-allow-html-api
Disallow html for API templating formats
2017-07-11 07:30:30 +02:00
9aa11176b8 Merge pull request #3264 from wallabag/trait-timestamps
Add EntityTimestampsTrait to handle dates
2017-07-11 07:30:08 +02:00
eeabca8090 Make updateAuthor code simpler to read 2017-07-10 10:08:20 +02:00
337e807297 Merge pull request #3267 from wallabag/revert-client-credentials
Revert client_credentials grant types
2017-07-09 21:22:28 +02:00
c57f69d967 Use the article publisher as author for export
When exporting an entry, use the publishedBy field as author name for
epub, mobi and pdf formats. Fallback to domain name if empty.
2017-07-09 18:33:14 +02:00
2e6239bb9f Disallow html for templating formats
Using html template format will then put the html format in the allowed list for the api doc which we don’t want since the api doesn’t response for html format.
2017-07-09 10:07:14 +02:00
07320a2bd2 Use the article domain as author for export files
When exporting an entry, use the domain name as author name for epub,
mobi and pdf formats, instead of 'wallabag'.
Change the author from array to string, because for now, there is always
only one author.
2017-07-08 19:53:43 +02:00
2e5b2fa808 Revert client_credentials grant types 2017-07-08 19:28:12 +02:00
927c9e796f Add EntityTimestampsTrait to handle dates
Refactorize timestamps() method to avoid re-writing it on each entity
2017-07-06 09:01:51 +02:00
b5d7eb148c Merge pull request #3256 from wallabag/fix-patch
Fix PATCH method
2017-07-05 15:00:24 +02:00
896f981ff5 Merge pull request #3257 from wallabag/fix-mapping-entities
Fixed mapping entities
2017-07-03 17:15:45 +02:00
c18a2476b6 CS 2017-07-03 13:56:39 +02:00
d0ec2ddd23 Fix validateAndSetPreviewPicture
Which wasn't covered by a test!
2017-07-03 13:45:04 +02:00
a05b61159e Fix PATCH method
The PATCH method for the entry should only update what user sent to us and not the whole entry as it was before.
Also, sending tags when patching an entry will now remove all current tags & assocatied new ones.
2017-07-03 13:45:04 +02:00
e50d7d31c0 CS 2017-07-03 13:40:47 +02:00
9114615adc Fixed mapping entities
There were this error in the console:

> The association Wallabag\CoreBundle\Entity\SiteCredential#user refers to the inverse side field Wallabag\UserBundle\Entity\User#site_credentials which does not exist.
2017-07-03 13:40:47 +02:00
71e1cbc8eb Merge pull request #3258 from wallabag/cs-fixer
Add a real configuration for CS-Fixer
2017-07-03 13:39:54 +02:00
38520658ad Fix tests 2017-07-03 07:30:54 +02:00
f808b01692 Add a real configuration for CS-Fixer 2017-07-01 09:52:38 +02:00
822c877949 Merge pull request #3245 from wallabag/fix-bc
Avoid BC on exists endpoint
2017-06-29 11:17:58 +02:00
331e5b0261 CS 2017-06-28 09:18:22 +02:00
39ffaba323 Return null instead of false 2017-06-28 08:15:06 +02:00
42708d1121 Merge remote-tracking branch 'origin/master' into 2.3 2017-06-26 10:05:48 +02:00
53e1892eb6 Merge pull request #3237 from matteocoder/master
Revised messages.it.yml file
2017-06-26 10:00:35 +02:00
559cbfdc2f Fixed broken lines and added new lines
In addition to fixing broken lines, I've also added a couple of lines from recent PRs.
2017-06-24 11:06:09 +02:00
18696f77fd Avoid BC on exists endpoint 2017-06-23 08:30:23 +02:00
29714661b1 Merge pull request #3204 from wallabag/better-export-page
Better public sharing page
2017-06-22 15:34:46 +02:00
151f45db0e Don't load js for nothing in prod 2017-06-22 14:55:49 +02:00
77255d6688 Add css on share public page 2017-06-22 12:15:24 +02:00
6b1b148d65 Add share.scss file
Still needs to include it in the twig template
2017-06-22 12:13:22 +02:00
789c46821d Fix linter issue on webpack config files 2017-06-22 12:13:22 +02:00
38dd2def20 add 🇮🇹 shared_by_wallabag string translated by @matteocoder 2017-06-22 12:13:22 +02:00
5642d1a150 adjust 🇩🇪 shared_by_wallabag string to include user info 2017-06-22 12:13:22 +02:00
77c5140bed Better export page
I’ve increase the width of the page 900px, 600px looks too small for me. Should we use something like 90% instead?
2017-06-22 12:13:22 +02:00
9416053bfc Merge pull request #3241 from wallabag/fix-qr-code-trans
Fix translations on QR code instructions
2017-06-22 10:26:41 +02:00
d0702f9fbd Merge pull request #3227 from wallabag/oauth-client-credentials
Add client_credentials oAuth2 auth method
2017-06-22 10:00:23 +02:00
1adab57426 Add 🇮🇹 translation 2017-06-22 09:12:57 +02:00
8c3d7875b2 Update polish
add missing translation
2017-06-22 09:12:57 +02:00
e2a038d653 Fix translations on QR code instructions 2017-06-22 09:12:57 +02:00
8c68acff2a Merge pull request #3207 from wallabag/tag-rss
Add RSS for tags
2017-06-21 14:51:46 +02:00
bd40f1af88 Add all entries RSS feed and put links on tag page itself and baggy too
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-06-21 12:02:04 +02:00
ebf2d92327 Fix typo 2017-06-21 11:44:36 +02:00
8c59809432 add rss icon
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-06-21 11:44:36 +02:00
11b8695663 Fix tests 2017-06-21 11:44:35 +02:00
03ce43d466 Fix getContainer in command 2017-06-21 11:44:35 +02:00
18c38dffc6 Add RSS tags feeds 2017-06-21 11:44:35 +02:00
25203e5081 User existing service instead of getDoctrine 2017-06-21 11:44:35 +02:00
80784b782b Merge pull request #2683 from wallabag/credentials-in-db
Store credentials in DB
2017-06-20 16:40:48 +02:00
f44dba22fc Get rid of masked value in listing 2017-06-20 16:03:39 +02:00
bead8b42da Fix reviews
Encrypt username too
Redirect to list after saving credentials
Fix typos

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-06-20 16:03:39 +02:00
906424c1b6 Crypt site credential password 2017-06-20 16:03:35 +02:00
9de9f1e5ce Add a live test for restricted article
It is not aimed to test if we can get the full article (since we aren't using real login/password)
but mostly to test the full work (with authentication, etc.)

Do not clean fixtured to avoid SQLite to re-use id for entry tag relation 😓
2017-06-20 16:03:20 +02:00
fd7fde9515 Force sequence creation for postgresql 2017-06-20 16:03:20 +02:00
b8427f22f0 Add menu access to site credentials CRUD 2017-06-20 16:03:14 +02:00
5a9bc00726 Retrieve username/password from database
Inject the current user & the repo to retrieve username/password from the database
2017-06-20 16:03:13 +02:00
fc6d92c63d Update route & user verification 2017-06-20 16:03:13 +02:00
f92fcb53ca Add CRUD for site credentials 2017-06-20 16:03:08 +02:00
604cca1f42 Merge pull request #3215 from wallabag/fix-3192
Empty preview pictures and language return null
2017-06-20 06:43:59 +02:00
fbb39b61bd Merge pull request #1 from matteocoder/matteocoder-messages.it
revised messages.it
2017-06-17 13:42:50 +02:00
508f248676 revised messages.it 2017-06-17 13:42:28 +02:00
7e271553fe Merge pull request #3229 from wallabag/fix-mobile-view
Fix mobile view and update asset deps
2017-06-15 09:56:39 +02:00
f99ebec0f2 Fix mobile view and update asset deps
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-06-15 07:58:12 +02:00
caa0b1765b Add client_credentials oAuth2 auth method
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-06-14 17:30:12 +02:00
f93a3109a5 Merge pull request #3220 from wallabag/remove-padding
Removed padding on entry view
2017-06-13 17:54:06 +02:00
6cc1d32454 Updated production files 2017-06-13 17:07:44 +02:00
dfd821dcfb Removed padding on entry view 2017-06-13 16:52:14 +02:00
4dc9fb705f Merge pull request #3213 from wallabag/fix-internal-settings-form
Fixed internal settings form
2017-06-13 10:24:47 +02:00
41d45c6122 Fix empty language and preview pics 2017-06-12 16:46:33 +02:00
b662c65e57 Fixed internal settings form 2017-06-12 10:44:08 +02:00
977ac0a1d6 Merge pull request #3208 from wallabag/is-public
Add ability to filter public entries & use it in the API
2017-06-12 10:26:01 +02:00
d9da186fb8 CS 2017-06-10 16:08:24 +02:00
a9c6577f0c Few fixes 2017-06-10 15:37:25 +02:00
1112e54772 Add public filter/field in the API
Listing entries can now be filtered by “public”.
Creating or patching an entry can now set is to public or remove the public.
Entry response now include “is_public” boolean field
2017-06-10 15:31:57 +02:00
e8911f7c09 Add isPublic filter on entries 2017-06-10 15:00:52 +02:00
873f6b8e03 Merge remote-tracking branch 'origin/master' into 2.3 2017-06-10 14:41:30 +02:00
f6d45eca76 Merge pull request #3206 from wallabag/mruminski-patch-1
Update validators.pl.yml
2017-06-10 13:17:20 +02:00
de9445cd25 Merge pull request #3203 from wallabag/fix-tag-count-baggy
Fix tags count in tags list on baggy
2017-06-10 13:16:10 +02:00
a3477df5c9 Merge pull request #3202 from pVesian/master
Config label improvement #3199
2017-06-10 13:14:42 +02:00
8da86b3f93 Update validators.pl.yml
add "quote_length_too_high" translation
2017-06-10 12:40:40 +02:00
679aaf0836 Merge pull request #3173 from wallabag/domain-name-param
remove craueconfig domain name setting and add a proper one in parame…
2017-06-10 11:36:03 +02:00
3fd6790893 Update translations 2017-06-10 11:29:56 +02:00
a9b984feee Fix tags count in tags list on baggy 2017-06-10 11:21:47 +02:00
a899399989 Merge pull request #3192 from wallabag/validate-content-fields
Validate language & preview picture fields
2017-06-09 13:51:26 +02:00
491371a051 Config label improvement #3199 2017-06-09 12:11:48 +02:00
1f7018e1fe Cleanup test
Looks like we didn't ALWAYS get a value for language from 20minutes.
Ahem.
2017-06-09 11:52:41 +02:00
80e49ba7b0 Convert - to _ in language
Mostly to increase language supports
2017-06-09 11:42:09 +02:00
42f3bb2c63 Use Locale instead of Language 2017-06-09 11:28:04 +02:00
5c762616c3 Merge pull request #3195 from wallabag/authentication-error
Log an error level message when user auth fail
2017-06-09 11:05:34 +02:00
1a94252831 Promote https 2017-06-09 10:07:27 +02:00
f81a34e379 Use a listener to catch auth failure 2017-06-09 09:45:43 +02:00
fa1c9d7cc7 CS 2017-06-08 22:52:26 +02:00
e9056dd96f Fix test
de_DE is not valid language.
Zataz doesn’t send a valid language in their content (they use `fr-FR`).
2017-06-08 22:51:30 +02:00
63f9f22fa3 Log an error level message when user auth fail
When a user login using the form we know log an error level information with information about the user:
- username used
- IP
- User agent

For example:

> Authentication failure for user "eza", from IP "127.0.0.1", with UA: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36".

It’ll allows server admin using fail2ban to configure it to block these people if they generate too much failure authentication.
2017-06-08 22:24:49 +02:00
be54dfe4e6 CS 2017-06-08 21:56:20 +02:00
0d349ea670 Validate language & preview picture fields
Instead of saving the value of each field right into the content without any validation, it seems better to validate them.
This might sounds obvious now we say that.
2017-06-08 21:51:46 +02:00
80f4d85ac9 Review 2017-06-08 19:15:33 +02:00
3f474025d8 Merge pull request #3187 from wallabag/api-client-credentials
Create (and return) a client after creating a new user using the API
2017-06-08 17:24:49 +02:00
a8d3fe50df Add ability to name the client 2017-06-08 14:25:44 +02:00
2da8f071cf Merge pull request #3189 from wallabag/add-discourse
Added link to community in issue template
2017-06-08 14:02:12 +02:00
b0f323c976 Added link to community in issue template 2017-06-08 13:34:14 +02:00
eb570e49c8 CS 2017-06-07 23:31:14 +02:00
0c00e52516 Create a client when creating a user using the api
While creating a new user using the API, we also create a new client for the current user.
So the app which just create the user can use its newly created client to configure the app.

That new client is only return after creating the user.
When calling the endpoint /api/user to get user information, the new client information won’t be return.
2017-06-07 23:23:28 +02:00
7bb3aa3177 Merge pull request #3093 from aaa2000/annotation-error-on-save
Displays an error with an annotation with a too long quote
2017-06-07 16:30:27 +02:00
c0d756f67d Merge pull request #3181 from wallabag/api-content-patch
Add ability to patch an entry with more fields
2017-06-07 15:40:59 +02:00
db0c48af36 Refactorize the way to save an Entry in the API 2017-06-07 15:07:55 +02:00
4e4a5b534f Merge pull request #3184 from wallabag/better-way-image-extension
Use an alternative way to detect images
2017-06-07 13:41:25 +02:00
a3f16a5685 Merge pull request #3179 from wallabag/show-user-command
Show user command
2017-06-07 09:40:56 +02:00
c406cef5b6 Fix postgresql migration 2017-06-07 00:12:20 +02:00
c07ec4b682 Merge remote-tracking branch 'origin/master' into 2.3 2017-06-06 20:15:21 +02:00
e48b238a3e fix tests 2017-06-06 16:18:25 +02:00
d6c4c484c4 add migration 2017-06-06 16:04:51 +02:00
be9d693e74 remove craueconfig domain name setting and add a proper one in parameters 2017-06-06 15:36:21 +02:00
6ed2627bb3 Merge pull request #3177 from wallabag/api-create-user-update
API user creation behing a toggle
2017-06-06 15:25:05 +02:00
9fe87bc2e2 Merge pull request #3165 from wallabag/it-translation-update
Update Italian translation
2017-06-06 11:44:18 +02:00
577c0b6dd8 Use an alternative way to detect image
When parsing content to retrieve images to save locally, we only check for the content-type of the image response.
In some case, that value is empty.
Now we’re also checking for the first few bytes of the content as an alternative to detect if it’s an image wallabag can handle.
We might get higher image supports using that alternative method.
2017-06-05 22:54:02 +02:00
0d8ecb82a3 Fix review
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-06-04 17:57:40 +02:00
2c3e148b00 Displays an error with an annotation with a too long quote
Fix #2762
2017-06-04 11:38:29 +02:00
438329be46 Merge pull request #3180 from wallabag/mruminski-patch-1
Update PL translation
2017-06-02 21:02:07 +02:00
645291e8fe Add ability to patch an entry with more fields
Like when we create an entry, we can now patch an entry with new fields:
- content
- language
- preview_picture
- published_at
- authors
2017-06-02 20:52:49 +02:00
a1e6187406 Return 201 on user creation 2017-06-02 20:03:25 +02:00
d0f7b0cc60 Update PL transation
add missing translation
2017-06-02 19:35:25 +02:00
d143fa243d Add show user command
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-06-02 16:53:03 +02:00
044079967b Add 🇮🇹 translation 2017-06-02 11:45:45 +02:00
bf7f0cb5a3 Use a dedicated file for wallabag config 2017-06-02 11:33:11 +02:00
1b9cd91782 Add translation 2017-06-02 11:32:38 +02:00
426bb453d2 API user creation behing a toggle
I've added a toggle feature (in internal settings) so that user api creation can be disabled while form registration still can be enabled.
Also, the /api/user endpoint shouldn't require authentication. Even if we check the authentication when sending a GET request, to retrieve current user information.

I've moved all the internal settings definition to config to avoid duplicated place to define them.
I don't know why we didn't did that earlier.
2017-06-02 11:32:38 +02:00
a687c8d915 Merge pull request #2708 from jcharaoui/import-disablecontentupdate
Import disableContentUpdate
2017-06-02 11:26:37 +02:00
d06a1ebdfb Update messages.it.yml 2017-06-02 09:17:45 +02:00
14b8a7c950 Merge pull request #3176 from wallabag/fix-image-download
Replace images with & in url
2017-06-02 09:12:11 +02:00
9bf7752f73 CS 2017-06-01 22:58:38 +02:00
fcad69a427 Replace images with &
Images with `&` in the path weren’t well replaced because they might be with `&amp;` in the html instead.

Replacing `&` with `&amp;` fix the problem.
2017-06-01 22:50:33 +02:00
f5924e9547 Fix option attributes 2017-06-01 15:44:36 +02:00
5901516805 Merge pull request #3171 from wallabag/drop-fucking-sqlite
Defined MySQL as the default rdbms for wallabag
2017-06-01 14:46:01 +02:00
701d3066fb We don't need that getter 2017-06-01 12:46:07 +02:00
ec97072152 No need to catch that Exception 2017-06-01 11:45:02 +02:00
6acadf8e98 Rewrote code & fix tests 2017-06-01 11:31:45 +02:00
5d03e2d1a5 Merge pull request #3172 from wallabag/more-scruti
More Scrutinizer issues fixed
2017-06-01 10:29:32 +02:00
843182c7cf CS 2017-06-01 09:52:09 +02:00
d5c2cc54b5 Fix tests 2017-06-01 09:49:15 +02:00
432a24f502 CS 2017-06-01 09:48:14 +02:00
704803e182 Replace Wallabag v1 error strings with v2 strings 2017-06-01 09:48:14 +02:00
d0e9b3d640 Add disableContentUpdate import option
This commit also decouples the "import" and "update" functions inside
ContentProxy. If a content array is available, it must be passed to the
new importEntry method.
2017-06-01 09:48:14 +02:00
1c5da417e4 Put default fetching error title in global config 2017-06-01 09:43:01 +02:00
7aba665e48 Avoid returning objects passed by reference.
Objects are always passed by reference, so it doesn't make sense to
return an object which is passed by reference as it will always be the
same object. This change makes the code a bit more readable.
2017-06-01 09:43:01 +02:00
3a6af6c580 fixup! Set the right variable type 2017-06-01 09:36:01 +02:00
10bf812a9e Both parameter wasn't used in the function, removing them 2017-06-01 09:30:38 +02:00
c3f7a2ca70 Set the right variable type 2017-06-01 09:30:20 +02:00
53da8ad844 Page parameter was never used in the function
It could have been used if we set the current page inside PreparePagerForEntries.
But we did that in each controller because we can have an OutOfRangeCurrentPageException
2017-06-01 09:29:18 +02:00
ec42e697ea Changed default database name 2017-06-01 09:17:05 +02:00
2a0eec07a5 Merge pull request #3137 from aaa2000/isolated-tests
Isolated tests
2017-06-01 07:58:17 +02:00
46825cfffb Fixed @tcitworld 's review 2017-05-31 22:50:18 +02:00
7d5e84fec1 Defined MySQL as the default rdbms for wallabag 2017-05-31 22:36:21 +02:00
2e05858e1a Updated 🇮🇹 translations
Thank you @matteocoder
2017-05-31 22:20:44 +02:00
757ec837be Merge pull request #3077 from wallabag/add-tags-list-view
Added tags on list view
2017-05-31 21:18:14 +02:00
84b041e87f Reduced border-radius for tags 2017-05-31 20:31:35 +02:00
ec8e7ffad4 Merge pull request #3106 from wallabag/api-content
Allow other fields to be send using API
2017-05-31 17:26:05 +02:00
7ab5eb9508 Isolated tests
Use https://github.com/dmaicher/doctrine-test-bundle to have test isolation.
2017-05-31 16:03:54 +02:00
91775f36fe Add some flex magic
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-31 14:34:46 +02:00
4368a27152 PR has been merged in graby 2017-05-31 14:00:15 +02:00
695af58857 Fix tests following rebase 2017-05-31 14:00:15 +02:00
38a04dee34 CS 2017-05-31 14:00:15 +02:00
f0378b4d7c Forced date can now be a timestamp too
Add adding more tests for forced content
2017-05-31 14:00:15 +02:00
9e349f08a6 Improve docs 2017-05-31 14:00:15 +02:00
0d6cfb884c Remove htmlawed and use graby instead
Instead of using htmlawed (which is already used in graby) use graby directly (which require some refacto on graby side).
Still needs some tests.
2017-05-31 14:00:15 +02:00
cf05a1ae34 Reduce imported entries
Down from 2.2 minutes to 1.39 minutes
2017-05-31 14:00:15 +02:00
74a75f7d43 Use graby ContentExtractor to clean html
It might be better to re-use some graby functionalities to clean html instead of building a new system.
2017-05-31 14:00:15 +02:00
fb436e8ca0 Add support for authors 2017-05-31 13:59:45 +02:00
e668a8124c Allow other fields to be send using API
Entry API can now have these new fields:
- content
- language
- preview_picture
- published_at

Re-use the ContentProxy to be able to do the same using the web UI (in the future).
htmLawed is used to clean stuff from content, I hope it’ll be enough to avoid security breach.

Lower content validation when we want to update an entry with content already defined. Before, language & content_type were required. If there weren’t provided, we re-fetched the content using graby. I think these fields aren’t required for an entry to be created. So I removed them.
Which means some import from the v1 export won’t be re-fetched since they provide content, url & title.

Also, remove liberation link from Readability import to avoid overlaping import (from wallabag v1, which had the same link)
2017-05-31 13:59:45 +02:00
812c980fa5 Fixed tags display on grid view 2017-05-31 13:26:29 +02:00
4423b88c5b Merge pull request #3168 from wallabag/instapaper-tags-import
Add support for tag in Instapaper import
2017-05-31 12:32:09 +02:00
d61fd8be4f Merge pull request #3138 from Kdecherf/2835-tags
Ignore ActionMarkAsRead when removing tag from entry
2017-05-31 11:48:42 +02:00
3f8578ded3 Merge pull request #3161 from wallabag/scrutinizer-2.3
Fix some Scrutinizer issues
2017-05-31 11:46:41 +02:00
31485bddb9 Ensure retrieved data are fresh 2017-05-31 11:11:02 +02:00
bad7df8c00 CS & improve tags assertions 2017-05-31 10:38:15 +02:00
7a8ed3cee1 Add support for tag in Instapaper import 2017-05-31 10:38:00 +02:00
7aa5607f29 Merge pull request #3143 from wallabag/fix-wllbg2-import
Fixed is_starred for wallabag v2 import
2017-05-31 09:08:34 +02:00
d716495f6c Merge pull request #3167 from wallabag/doc-github-template
Fix link in Github template
2017-05-31 09:06:21 +02:00
78de00e831 Fix link in Github template 2017-05-31 07:12:55 +02:00
5dbf3f2326 TagController: ignore ActionMarkAsRead when removing tag from entry
Fixes #2835

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-05-31 00:36:46 +02:00
047fdc767a Add tests 2017-05-30 20:27:44 +02:00
2150576d86 Merge pull request #3065 from wallabag/api-creation-endpoint
Register through API
2017-05-30 15:26:11 +02:00
ff24cf9c1d Update 🇮🇹 translation 2017-05-30 14:06:38 +02:00
4ec53ab74c CS 2017-05-30 13:01:25 +02:00
26650fdbf8 Use a better way to set input for command
Actually use the correct to way handle that

http://symfony.com/doc/current/components/console/helpers/questionhelper.html#testing-a-command-that-expects-input
2017-05-30 12:47:28 +02:00
5fe65baee5 Fix some Scrutinizer issues 2017-05-30 11:39:15 +02:00
d181bd7285 Merge remote-tracking branch 'origin/master' into 2.3 2017-05-30 09:59:06 +02:00
fe6461e4aa Avoid side effect on other tests 2017-05-30 09:57:57 +02:00
21242a02a1 Added tags on list view 2017-05-30 09:51:49 +02:00
7a90ca6171 Merge pull request #3147 from wallabag/delete-confirm
Add some deletion confirmation to avoid mistake
2017-05-30 09:42:56 +02:00
7e8b90d1ed Merge pull request #3160 from wallabag/mruminski-patch-1
Update messages.pl.yml
2017-05-30 09:10:54 +02:00
d069bff4f6 Remove unknown validation_groups
The Profile validation_groups does not exist and then for validation to be skipped (like password length)
2017-05-30 08:04:11 +02:00
5709ecb368 Re-use NewUserType to validate registration
The only ugly things is how we handle error by generating the view and then parse the content to retrieve all errors…

Fix exposition fields in User entity
2017-05-30 07:56:01 +02:00
6eb463c4ab Update messages.pl.yml
add missing translation
2017-05-29 23:47:00 +02:00
2740fc525e update 🇩🇪 messages.de.yml 2017-05-29 21:10:00 +02:00
2251045901 WIP
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-29 10:16:23 +02:00
b788add087 Merge pull request #3153 from wallabag/content-proxy-refactor
Move Tags assigner to a separate file
2017-05-28 21:50:23 +02:00
de8d2a9005 CS
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-28 12:59:48 +02:00
5d3deafd3e CS
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-28 01:16:01 +02:00
6bc6fb1f60 Move Tags assigner to a separate file
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-27 22:08:14 +02:00
fa0f5ee12b Add some deletion confirmation to avoid mistake 2017-05-24 21:33:37 +02:00
4c707d087b Fixed is_starred for wallabag v2 import 2017-05-24 15:36:41 +02:00
35941d57ee Merge pull request #3145 from wallabag/fix-so
Fix SO tests
2017-05-24 14:33:58 +02:00
82a590fddd Merge pull request #3146 from DamienCassou/fix-doc-url
Fix documentation URL for "How can I help to fix that?"
2017-05-24 13:54:57 +02:00
ac1509a66b Fix documentation URL for "How can I help to fix that?" 2017-05-24 12:57:46 +02:00
216dee4d8a Fix SO tests
SO switched to http yesterday
2017-05-24 12:13:25 +02:00
e869ee7d7f Switch back to latest guzzle-site-authenticator 2017-05-24 07:29:46 +02:00
9d521dbfee Merge pull request #3133 from wallabag/testing-travis-failure
Let's play !
2017-05-19 13:58:37 +02:00
be085c3d18 Ensure download_images_enabled is disabled
Even if the tests fail, that config must stay disabled after the test.
Otherwise it might timeout on other test (because it'll try to save all other images)
2017-05-19 13:10:46 +02:00
1f155b29db Fold migrations & fixtures command on Travis 2017-05-19 13:10:44 +02:00
4ab0d25f65 Merge remote-tracking branch 'origin/master' into 2.3 2017-05-19 11:25:19 +02:00
f87e6547e8 Merge pull request #3130 from X-dark/master
unify Download/Export wording.
2017-05-19 10:07:01 +02:00
5f82fc23a7 modify key name as well 2017-05-18 17:17:21 +02:00
1dd76ac650 unify Download/Export wording.
This fixes #2967
2017-05-18 15:23:48 +02:00
21f78f4d4b Update of the oc version of CoreBundle
I hope I didn't break everything with the ' and ".
2017-05-18 10:44:15 +02:00
6830d92558 Merge pull request #3125 from wallabag/prepare-222
Prepare wallabag 2.2.3
2017-05-17 17:48:51 +02:00
c0e8e6037b Prepare wallabag 2.2.3 2017-05-17 17:21:14 +02:00
e893e33e9b Merge pull request #3122 from wallabag/delete-doc
Removed embedded documentation
2017-05-17 11:57:28 +02:00
afc9875f28 Merge pull request #3117 from wallabag/fix-doc
Fixed documentation URL
2017-05-17 10:40:35 +02:00
6b94ee51b8 Fixed documentation URL 2017-05-17 09:03:04 +02:00
4e88a6a651 Merge pull request #3124 from wallabag/lock-guzzle-auth
Lock guzzle-site-authenticator to avoid errors
2017-05-17 09:02:22 +02:00
8581fcae90 Lock guzzle-site-authenticator to avoid error 2017-05-16 23:34:42 +02:00
092ed4a787 Merge pull request #3123 from X-dark/master
reorder contrib strings in about page
2017-05-16 14:50:25 +02:00
8544c7e4b6 reorder contrib strings in about page
this fixes #2891
2017-05-16 14:17:13 +02:00
322c270b65 Removed embedded documentation 2017-05-16 13:09:40 +02:00
d168fff7a9 Merge pull request #3120 from aaa2000/fix-delete-annotation-user
Fix delete annotation when username is defined
2017-05-15 11:42:05 +02:00
ef204e45b0 Merge pull request #3113 from wallabag/upgrade-craue
Upgraded CraueConfigBundle to 2.0
2017-05-15 09:05:08 +02:00
60c522899b Fix delete annotation when username is defined
When an user set his name in "Config" > "User Information", he
can't delete or update an annotation

Fix #2382
2017-05-14 11:38:02 +02:00
3b792787d7 Upgraded CraueConfigBundle to 2.0 2017-05-12 16:39:47 +02:00
75045d6462 Merge pull request #3110 from wallabag/add-logger-matching-rules
Added logger when we match Tagging rules
2017-05-12 16:17:48 +02:00
a1146b6551 Added tests on logs records 2017-05-12 15:01:18 +02:00
3554364bed Fixed tests 2017-05-12 13:47:53 +02:00
0a033767db Added logger when we match Tagging rules 2017-05-12 13:13:19 +02:00
06568b15bb Merge pull request #3108 from wallabag/store-headers
Added headers field in Entry
2017-05-11 17:39:21 +02:00
1517d5772d Replaced json_array with array
And fixed failing test due to @j0k3r :trollface:
2017-05-11 14:59:53 +02:00
dda6a6addc Added headers field in Entry 2017-05-11 14:18:21 +02:00
7987816d1e Merge pull request #3104 from wallabag/migration-username-length
Added migration to change length for user fields
2017-05-10 11:24:59 +02:00
09edbff336 Merge pull request #3101 from wallabag/credentials-new-extrafields
Skip auth when no credentials are found
2017-05-10 10:58:19 +02:00
8c3158eba8 Added migration to change length for user fields 2017-05-10 10:46:32 +02:00
150d9ec1dc Handle empty configuration 2017-05-10 10:37:53 +02:00
147cae223b Update composer.json 2017-05-10 10:23:08 +02:00
91ba9a5975 Merge pull request #3095 from aaa2000/api-error-on-fail-fetch-content
Create a new entry via API even when its content can't be retrieved
2017-05-10 09:38:55 +02:00
e538c85ba7 Merge pull request #3103 from wallabag/api-delete-tag-query
Retrieve tag / tags value from query or request
2017-05-10 09:32:27 +02:00
58f5a39ce6 Merge pull request #3102 from wallabag/cache-yarn
Cache yarn cache in Travis
2017-05-10 08:53:04 +02:00
a9357a8311 Remove the created entry to avoid side effects on other tests 2017-05-09 23:19:24 +02:00
1594a79fc5 Retrieve tag / tags value from query or request
It allows to request to delete a tag using query string instead of body parameter (which seems to be the standard).
Instead of breaking the previous behavior, I used a generic way to retrieve parameter (which looks into request attributes, query parameters and request parameters)
2017-05-09 23:15:25 +02:00
94b232bbb8 Skip auth when no credentials are found
If we can’t find a credential for the current host, even if it required login, we won’t add them and website will be fetched without any login.
2017-05-09 22:53:42 +02:00
c44d13f9ea Cache yarn cache in Travis 2017-05-09 22:53:01 +02:00
0eb8220204 Merge pull request #2751 from bdunogier/2.2-guzzle_subscribers_improvement
Improved Guzzle subscribers extensibility
2017-05-09 17:10:03 +02:00
a2ae05a61c Merge pull request #3076 from wallabag/hotfix/2979
Disable negative numbers in filters
2017-05-09 13:56:44 +02:00
54c2d164a3 Merge remote-tracking branch 'origin/master' into 2.3 2017-05-09 13:55:31 +02:00
1b1647175d Add some tests 2017-05-09 12:12:23 +02:00
b28c5430ef Merge pull request #3022 from wallabag/webpack
Adds Webpack support and remove Grunt
2017-05-09 11:43:48 +02:00
d047530dc0 CS 2017-05-09 11:17:09 +02:00
efac66cb56 icon mail a bit better
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-09 11:04:02 +02:00
c829b06ed8 Merge pull request #3097 from wallabag/update-license
Update graby* licenses
2017-05-09 09:47:20 +02:00
9d7d549712 Update graby* licenses 2017-05-09 09:22:50 +02:00
832fbd94c0 Merge pull request #3096 from aaa2000/fix-api-entries-pagination-with-perpage
Fix API pagination is broken if perPage is custom value
2017-05-09 09:12:15 +02:00
b60a666df2 Fix API pagination is broken if perPage is custom value
Fix #2720
2017-05-08 16:27:16 +02:00
08f29ae7b6 Create a new entry via API even when its content can't be retrieved
Fix #2988
2017-05-08 14:57:25 +02:00
ff5cdbdc95 fix 3-dots menu position
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-08 12:32:20 +02:00
4c6ee89c9c Fix review again
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-07 17:13:08 +02:00
34806fab1b Fix reviews
Signed-off-by: Aline <chetta.aline@gmail.com>
2017-05-07 15:07:50 +02:00
f2beee5185 Merge pull request #3090 from aaa2000/translate-login-page-error
Translate error message in login page
2017-05-07 14:00:41 +02:00
f3c300e485 Translate error message in login page
Fix #2933
2017-05-06 22:21:04 +02:00
43f81a62e9 Merge pull request #3088 from wallabag/execute-migrations-after-install
Added migrations execution after fresh install
2017-05-05 17:42:42 +02:00
ab742ee9c6 Merge pull request #2920 from wallabag/cleanduplicatescommand
Clean Duplicates Command
2017-05-05 17:42:18 +02:00
4eeb29ff78 Fixed test 2017-05-05 15:20:58 +02:00
7d2d1d6859 Added migrations execution after fresh install 2017-05-05 15:14:58 +02:00
89f108b45a Fixed @j0k3r review 2017-05-05 14:54:03 +02:00
d09fe4d233 Added test for deduplication 2017-05-05 14:33:36 +02:00
6980304968 Merge pull request #3053 from wallabag/api-bulk-add
Added API endpoint to handle a list of URL
2017-05-05 13:56:34 +02:00
72db15ca5d Little refacto and send 400 on reaching urls limit 2017-05-05 12:05:50 +02:00
14f58edd80 fixed margin on sidebar menu 2017-05-05 09:19:56 +02:00
6603a9d649 Merge pull request #3082 from aaa2000/fix-form-errors-display
Fix display the form errors correctly
2017-05-05 07:01:28 +02:00
ab9eb5cdb7 Fix display the form errors correctly
Use `property_path` form option to map underscored form fields
to object properties

@see https://github.com/symfony/symfony/issues/9162#issuecomment-25431148

Fix #3067
2017-05-05 00:12:16 +02:00
662db41bae Changed parsing of login_extra_fields in guzzle auth 2017-05-04 21:45:06 +02:00
5b914b0422 Improved Guzzle subscribers extensibility
Allows 3rd parties to register new guzzle subscribers by adding extra calls to the http_client_factory service.
2017-05-04 21:44:34 +02:00
2003ffa97e Fix according to review 2017-05-04 17:44:42 +02:00
cebed9c01f Merge pull request #3080 from wallabag/use-username-to-import
Use username to import
2017-05-04 15:19:16 +02:00
18e1da6277 rebase
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-04 14:56:52 +02:00
4cea76b0cf Use npm script instead of direct webpack call
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-04 14:49:44 +02:00
42a2139b8f fix travis 2017-05-04 14:49:44 +02:00
17cc3aacb7 fix theme changes
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-04 14:49:44 +02:00
e35f8439a7 add comment to config.yml to explain live reload feature 2017-05-04 14:49:44 +02:00
8655913ebf disable default dev server 2017-05-04 14:49:44 +02:00
64f81bc316 Adds Webpack support and removes the use for Grunt
Signed-off-by: Thomas Citharel <tcit@tcit.fr>

use scss

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

fix build, add babel, fix annotations

fixes (and improvements !) for baggy

add live reload & environments & eslint & theme fixes
2017-05-04 14:49:44 +02:00
d1e5059ea0 Use username to import
Signed-off-by: Thomas Citharel <tcit@tcit.fr>

add docs

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

use username as default

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

rename user to username

typo

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-04 14:41:42 +02:00
6b76ae3d1f Merge pull request #3060 from wallabag/search-users
Search & paginate users
2017-05-04 14:35:14 +02:00
3b4502e0e6 Merge pull request #3079 from wallabag/update-doc
Fixed old links in documentation
2017-05-04 07:07:20 +02:00
79d8f0d459 Updated documentation version 2017-05-03 15:58:36 +02:00
56f9a60f49 Fixed old links in documentation 2017-05-03 15:54:56 +02:00
9c09c253fe Merge pull request #3047 from wallabag/add-notmatches-operator
Added notmatches operator for tagging rule
2017-05-03 11:53:01 +02:00
1267905d28 Disable negative numbers in filters 2017-05-03 11:08:56 +02:00
a162b1a99b Changed export test 2017-05-03 10:53:10 +02:00
dfa0822f19 Merge pull request #3075 from wallabag/disable-shortcuts-login
Disabled shortcuts on login/register page
2017-05-02 16:59:49 +02:00
0e6509c3d8 Merge pull request #3073 from wallabag/fix-sandwich
Fixed sandwich menu position in entry view (material theme)
2017-05-02 16:42:26 +02:00
a40029f9d6 Disabled shortcuts on login/register page 2017-05-02 16:21:06 +02:00
a7c8f54570 Merge pull request #3072 from wallabag/hotfix/3061
Small typo in documentation fix #3061
2017-05-02 15:46:45 +02:00
96e4398072 Fixed sandwich menu position in entry view (material theme) 2017-05-02 15:40:15 +02:00
b5b6877976 Merged list and search methods 2017-05-02 15:30:32 +02:00
d01dc5a81e rename index to list
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-02 15:28:39 +02:00
a2daa32d0c Fix tests
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-02 15:28:39 +02:00
50cfd8108b Add pagination
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-02 15:28:39 +02:00
c37515f880 Add filter to users management page
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-02 15:28:39 +02:00
0f26c285d4 Small typo in documentation fix #3061 2017-05-02 11:51:23 +02:00
e1d64050ad Merge remote-tracking branch 'origin/master' into 2.3 2017-05-01 22:15:46 +02:00
c613df0e25 Add docs for cli commands
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-01 13:30:00 +02:00
3d57d625f8 Add basic tests
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-01 13:04:31 +02:00
e2f3800ccb Add Clean Duplicates Command 2017-05-01 13:04:31 +02:00
efd351c98f Added limit 2017-05-01 09:26:12 +02:00
7fa844a349 Fix tests (for real this time) 2017-05-01 09:26:12 +02:00
719ba257d3 Fix tests 2017-05-01 09:26:12 +02:00
a7abcc7b7a Splitted the endpoint in two 2017-05-01 09:26:12 +02:00
1eca7831a6 Added API endpoint to handle a list of URL
By passing an array, you can add / delete URL in mass (bulk request)
2017-05-01 09:25:34 +02:00
3cbb0cc3ef Merge pull request #3055 from wallabag/api-bulk-add-tags
Added API endpoint to handle a list of URL and to add/delete tags
2017-05-01 09:04:41 +02:00
9579003045 Merge pull request #3066 from wallabag/ignore-tests-exported-files
Ignore tests exported files
2017-04-29 22:51:32 +02:00
d49cdfe2ef Ignore tests exported files 2017-04-29 19:41:14 +02:00
8ee18fdabc Merge pull request #3064 from gileri/master
Correct create_application en string
2017-04-29 15:43:42 +02:00
dcbebc17aa Fix tests 2017-04-29 12:58:39 +02:00
ef88b37eb5 Correct create_application en string 2017-04-29 12:30:12 +02:00
c5e04b0109 Merge pull request #3057 from raf64flo/patch-1
Use up-to-date Firefox extension and add F-Droid link for Android app.
2017-04-26 09:10:28 +02:00
e6ec001c6a Fix IT translation #3057 2017-04-25 16:52:02 +02:00
283aca210a Fix typos. Fix #3057 2017-04-25 15:52:51 +02:00
6f01c10c88 Fix documentation for DE/IT/FR language, even if not sure for ED/IT. Fix #3057. 2017-04-25 15:35:51 +02:00
b40c479a40 Remove 'fr' from Firefox extension URL 2017-04-25 15:17:08 +02:00
83bf04f09e Update Firefox extension and Android links
Use up-to-date Firefox extension and add F-Droid link for Android app.
2017-04-25 15:11:53 +02:00
138c352cd7 Merge pull request #3052 from shtrom/fix-relative-symlinks
Make symfony-assets-install use `relative` symlinks
2017-04-25 14:15:01 +02:00
80299ed282 Added endpoint to handle URL list to add/delete tags 2017-04-24 12:24:17 +02:00
d1fc590211 Added API endpoint to handle a list of URL and to add/delete tags 2017-04-24 11:12:41 +02:00
f972af3f5b Make symfony-assets-install use relative symlinks
This facilitates packaging, when installing in a different work PREFIX
than the final install location.

Signed-off-by: Olivier Mehani <shtrom@ssji.net>
2017-04-22 21:45:30 +10:00
b8acf672c0 Merge pull request #3048 from wallabag/remove-download-pictures
Cleaned craue_config_setting by removing useless download_pictures setting
2017-04-22 13:20:44 +02:00
a375fed7bf Fixed @j0k3r review 2017-04-22 13:14:34 +02:00
21d955f703 Cleaned craue_config_setting by removing useless download_pictures setting 2017-04-20 15:45:43 +02:00
fdd725f58c Added notmatches operator for tagging rule 2017-04-20 15:17:02 +02:00
64f1d8f77a Merge pull request #3024 from wallabag/store-date
Added publication date and author
2017-04-18 13:12:28 +02:00
c5ba478dc3 Merge pull request #3044 from wallabag/fos-user-2.0
Remove dev FOSUserBundle
2017-04-18 09:49:59 +02:00
177ef14c15 Remove dev FOSUserBundle 2017-04-18 08:08:26 +02:00
531828ca44 Merge pull request #3030 from wallabag/remove-isPublic-from-entry
Remove isPublic from Entry entity fix #2598
2017-04-14 14:56:26 +02:00
01736b5a2e Removed is_public in Entry edit form 2017-04-13 15:54:19 +02:00
15e4aea678 Remove isPublic from Entry entity fix #2598 2017-04-13 13:12:19 +02:00
3e7a843aa9 Merge branch 'master' into 2.3 2017-04-13 13:07:06 +02:00
e9c80c99bd Added test for multiple authors 2017-04-10 17:58:27 +02:00
3aa655e44a Fixed migrations 2017-04-10 09:26:08 +02:00
7b0b3622ab Added author of article 2017-04-09 15:24:51 +02:00
5e9009ce86 Added publication date 2017-04-05 22:22:52 +02:00
656395fde6 Merge pull request #3023 from mart-e/epub-notice-at-the-end
Add export notice at the end of the epub
2017-04-05 10:20:19 +02:00
1b70990b01 Add export notice at the end of the epub
The text "Produced by wallabag with PHPePub" is the first page of any epub.

On ebooks reader, it is common (e.g. kobo) to use the first page as the cover of
unread books, which makes it more difficult to differentiate the books.

Move the Notices chapter at the end of the book.
2017-04-05 09:24:48 +02:00
19122cf660 Merge pull request #3020 from wallabag/add-remove-archived-entries
Allow to remove all archived entries
2017-03-31 17:28:54 +02:00
13a592a128 Renamed methods 2017-03-31 17:03:08 +02:00
e682a70f88 Refactored code 2017-03-31 11:04:18 +02:00
9102851f59 Added delete button on Baggy theme 2017-03-31 10:53:23 +02:00
73f28afb19 Renamed countAllEntriesByUsername method 2017-03-31 10:46:47 +02:00
6da1aebc94 Allow to remove all archived entries
Since we still support fucking SQLite, we need to retrieve all tags & annotations for archived entries before deleting them.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-03-31 10:46:05 +02:00
fa884b30ba Merge pull request #3021 from wallabag/rename-method
Rename method
2017-03-30 16:40:18 +02:00
5633b32f0a Merge pull request #3014 from wallabag/change-default-value-listmode
Changed default value for list mode (grid instead of list)
2017-03-30 16:12:11 +02:00
273b6f0658 Rename method from *username to *user
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-03-30 16:07:48 +02:00
548e608870 Merge pull request #3017 from Kdecherf/local-image-alpha
Save alpha channel when downloading PNG images
2017-03-30 14:45:24 +02:00
7a3260ae9e Save alpha channel when downloading PNG images
Fixes #2805

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-03-29 21:58:29 +02:00
1680c95c27 Changed default value for list mode (grid instead of list) 2017-03-29 14:43:47 +02:00
6f296a789c Merge pull request #3000 from cloudron-io/master
Add Cloudron as installation method
2017-03-29 14:18:55 +02:00
106e0160f2 Added 🇩🇪 translation for Cloudron 2017-03-29 14:16:04 +02:00
3ea184ffc0 Added 🇫🇷 and 🇮🇹 translations for Cloudron 2017-03-29 12:31:52 +02:00
f76bcf6705 Merge pull request #2999 from FrenchHope/master
Share articles to a scuttle / semantic scuttle instance
2017-03-28 15:19:42 +02:00
b5a5377af1 Added migration for Scuttle sharing 2017-03-28 14:20:14 +02:00
fb9f100e8f Scuttle sharing 2017-03-28 14:20:14 +02:00
7d1d961267 Merge remote-tracking branch 'origin/master' into 2.3 2017-03-28 14:07:42 +02:00
6ae579e43f Merge pull request #2861 from wallabag/2.3-droping-5.5
Dropping PHP 5.5
2017-03-28 13:18:17 +02:00
de0ab52a47 Updated requirements in documentation 2017-03-28 11:45:40 +02:00
90f95027a8 Merge pull request #2985 from etiess/patch-2
Update paywall.rst (more details and clear cache)
2017-03-23 13:56:55 +01:00
56f9adc431 Add Cloudron as installation method 2017-03-20 15:13:14 +01:00
7423ed4766 Merge pull request #2968 from chrido/master
remove language on html tag
2017-03-13 10:56:33 +01:00
3f5f303e7f Merge pull request #2971 from etiess/patch-3
Update paywall.rst (EN) with details + clear cache
2017-03-09 15:34:40 +01:00
cee28dc6d4 remove language on html-tag 2017-03-06 21:34:50 +01:00
8c565e3b73 Merge pull request #2954 from wallabag/update-version
Changed wallabag version
2017-03-02 14:43:04 +01:00
8ef1df8157 Changed wallabag version 2017-03-02 14:42:16 +01:00
0fe64f1fdd Merge pull request #2916 from wallabag/update-changelog
Updated CHANGELOG with latest changes
2017-03-02 14:40:22 +01:00
bae1f9dfba Updated CHANGELOG with latest changes 2017-03-02 14:22:17 +01:00
6c79aaf432 Merge pull request #2950 from wallabag/fix-symlinks
Fixed symlinks issue during release creation
2017-03-02 14:16:51 +01:00
1d13376df6 Fixed symlinks issue during release creation 2017-03-01 14:17:07 +01:00
71460a8ba5 Merge pull request #2926 from qtheuret/master
Add activation of 'rewrite' mod of Apache
2017-03-01 13:32:46 +01:00
e1cc8fd799 Merge pull request #2919 from wallabag/api-exists-returns-id
Api exists returns
2017-02-28 21:12:30 +01:00
3529ce35e4 Added german and italian translation 2017-02-28 21:10:24 +01:00
29969f854c Merge pull request #2932 from wallabag/mruminski-patch-1
Update Polish translation
2017-02-25 08:28:31 +01:00
78bce602cb Update Polish translation
add missing translation
2017-02-24 18:31:35 +01:00
85b4b6e0cd Merge pull request #2931 from wallabag/php-7.1
Use wallabag/tcpdf
2017-02-24 16:23:06 +01:00
5a73f94590 Use wallabag/tcpdf
It should restore the PHP 7.1 compatibility
2017-02-24 15:05:45 +01:00
ca9a83ee51 return id of article instead of true if entry exists 2017-02-24 11:31:31 +01:00
0a82d6e23c Activate 'rewrite' mod of Apache 2017-02-23 16:10:14 +01:00
a737f4b58e Ajout du mod 'rewrite' de Apache 2017-02-23 16:09:06 +01:00
5301d664d9 Update paywall.rst (EN) with details + clear cache 2017-02-23 08:54:33 +01:00
e316d4bd34 Update paywall.rst (more details and clear cache) 2017-02-22 11:49:45 +01:00
227a009da5 Merge pull request #2917 from ngosang/feature/es_translation_2
Update Spanish translation
2017-02-20 13:55:24 +01:00
ac47889928 Update Spanish translation 2017-02-20 12:21:02 +01:00
6914fdd8d8 Merge pull request #2915 from wallabag/import-drop-msg-user-null
Import: we now skip messages when user is null
2017-02-20 09:45:12 +01:00
b45b6b6707 Import: we now skip messages when user is null 2017-02-20 09:16:02 +01:00
48be826ea9 Merge pull request #2905 from nicofrand/patch-1
Alert that 2FA must be authorized in app/config/parameters.yml
2017-02-20 08:27:26 +01:00
b17cb92e9b Merge pull request #2913 from wallabag/add-wllbgit-readme
Added wallabag.it link in README
2017-02-20 08:05:58 +01:00
38fe541997 Alert that 2FA must be authorized in app/config/parameters.yml 2017-02-20 08:04:44 +01:00
bba94d7458 Merge pull request #2832 from Kdecherf/search-domain
Search by term: extend to entries url
2017-02-19 21:52:35 +01:00
b678d0f55c Added wallabag.it link in README 2017-02-18 15:04:57 +01:00
2b8f274b8a Merge pull request #2911 from wallabag/jlnostr-patch-1
Remove word repetition from german translation
2017-02-17 22:16:48 +01:00
5d858d21de Remove word repetition from german translation
see https://github.com/wallabag/wallabag/pull/2882#discussion_r101806434
2017-02-17 21:52:16 +01:00
628f9d31de Merge pull request #2908 from wallabag/move-it-documentatin
Moved 🇮🇹 documentation into it folder
2017-02-17 13:54:48 +01:00
9d8975f6b6 Moved 🇮🇹 documentation into it folder 2017-02-17 13:12:09 +01:00
2edc539581 Merge pull request #2830 from Kdecherf/striptags-title
Fix rendering of entry title in Twig views
2017-02-17 09:28:56 +01:00
2ac8e2c5b5 Merge pull request #2882 from wallabag/add-translations-doc-mobile-apps
Doc: translated mobile apps configuration in french
2017-02-17 09:28:21 +01:00
eac09b48b0 Search by term: extend to entries url
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-02-16 21:47:52 +01:00
9dd68dae77 Some changes to 🇩🇪 translation 2017-02-16 21:41:19 +01:00
aedd385e10 views: cosmetic in share links href
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-02-16 21:36:34 +01:00
6c1c433903 Merge pull request #2892 from ngosang/feature/es_translation
Update Spanish translation
2017-02-16 09:12:40 +01:00
8b42e75f68 add 🇩🇪 doc user/configuring_mobile 2017-02-15 17:13:14 +01:00
82749439ac Update Spanish translation 2017-02-15 15:41:06 +01:00
a92718dba2 Merge pull request #2875 from kgaut/patch-3
Doc - information about Apache 2.4
2017-02-14 22:14:51 +01:00
2414eb12c6 Merge pull request #2785 from matteocoder/patch-2
first_article.rst already inside articles.rst
2017-02-14 22:05:53 +01:00
f3c7e055f2 Merge pull request #2784 from matteocoder/patch-1
Doc: share.rst already integrated inside articles.rst
2017-02-14 21:37:27 +01:00
e04d656f5a first_article.rst already inside articles.rst
The file is a duplicate of a section already present in articles.rst
2017-02-14 20:57:22 +01:00
d60c38edf9 share.rst already integrated inside articles.rst
The share.rst file is just a duplicate of a section already present in another file.
2017-02-14 20:56:27 +01:00
7d1c19c021 Doc: translated mobile apps configuration in french 2017-02-14 20:45:08 +01:00
f17b89fadc Merge pull request #2878 from matteocoder/wallabag-docs-ita
Italian documentation added
2017-02-14 18:33:43 +01:00
eef47c0ead Merge pull request #2879 from matteocoder/matteocoder-patch-1
Fixed typo in "first_steps"
2017-02-14 17:16:14 +01:00
5601b4536c Italian documentation added
There are some missing links in various articles. Please let me know how I can fix this :)
2017-02-14 16:36:40 +01:00
6d1e97f564 Merge pull request #2860 from wallabag/docs-update-3rd-party-apps
docs 3rd party tools: update java wrapper, add cmd tool to add article
2017-02-14 15:40:29 +01:00
c772c473a1 docs: add 3rd party app wallabako for Kobo readers 2017-02-14 15:39:12 +01:00
0ae5297699 Doc - informations about Apache 2.4 2017-02-14 15:29:33 +01:00
5e4b9b2321 Merge pull request #2874 from kgaut/patch-2
Add informations about Apache 2.4
2017-02-14 15:11:08 +01:00
947ccd075c Add informations about Apache 2.4 2017-02-14 09:24:56 +01:00
4a953a250c Merge pull request #2869 from wallabag/log-restricted-access
Log restricted access value
2017-02-13 14:55:55 +01:00
7bf6b555f5 Log restricted access value
It might help to figure out if we have enabled it or not
2017-02-13 14:20:03 +01:00
4cb9e0aad1 Dropping PHP 5.5 2017-02-11 12:02:35 +01:00
8148675cb7 docs 3rd party tools: update java wrapper, add cmd tool to add article 2017-02-11 00:43:04 +01:00
abba55cdd6 Merge pull request #2846 from wallabag/mruminski-patch-1
fix misspells in polish translation
2017-02-06 17:29:31 +01:00
41ed68d5b0 fix misspells in polish translation 2017-02-06 15:38:33 +01:00
99cc170b0e Merge pull request #2842 from K-Phoen/update-rulerz
Update RulerZ
2017-02-06 09:20:28 +01:00
10caff9875 Merge pull request #2841 from Kdecherf/active-menu-search
Show active list in the left menu during search
2017-02-05 21:08:39 +01:00
177c5510ff Update RulerZ 2017-02-05 18:02:09 +01:00
7d9a67de14 Show active list in the left menu during search
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-02-05 15:19:52 +01:00
20da238413 Merge pull request #2788 from Zettt/master
Documentation on how to configure mobile apps to work with wallabag.it
2017-02-05 12:49:43 +01:00
664621955d Added configuration documentation for mobile apps 2017-02-05 12:48:30 +01:00
15a4d52833 Merge pull request #2839 from foxmask/master
scripts/update.sh: 18: scripts/update.sh: composer.phar: not found
2017-02-05 12:34:20 +01:00
5397d820fe Merge pull request #2838 from wallabag/Quent-in-patch-1
Update Oc version
2017-02-04 21:54:43 +01:00
6837c3989a Merge pull request #2840 from wallabag/fix-frameworkbundle
Restored correct version for framework-extra-bundle
2017-02-04 21:53:26 +01:00
7db1bdf1e4 Restored correct version for framework-extra-bundle
The bundle was fixed in latest version.
2017-02-04 18:26:16 +01:00
205c6f0c66 scripts/update.sh: 18: scripts/update.sh: composer.phar: not found
when composer.phar is not globally installed, we should add "./" in front of "composer.phar" to run it from the current folder.
2017-02-04 17:02:25 +01:00
289ce94bd8 Update Oc version
I'll be ready for next train
2017-02-04 15:21:13 +01:00
5b9cf67529 Merge pull request #2818 from Kdecherf/fix-search-bar
Fix nav-panel-search height
2017-02-03 09:04:33 +01:00
1bb7bdc8b3 Fix rendering of entry title in Twig views
This commit provides some improvements on the rendering of entry title
on entries list and entry views and refactors filter calls:
- Remove escape filter from apparent title, striptags is enough
- Move raw filter to the end of apparent title as it's ignored if not
  placed as the last filter
- Replace raw filter with e('html_attr') for title used in attributes,
  fixing possible issue and/or glitch
- Add striptags to entry.title used for link sharing to respect the
  apparent title

Fixes #2802

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-02-02 21:54:15 +01:00
8138fd390b Added minified CSS files 2017-02-02 21:48:59 +01:00
3cc0cc0ae7 Fix nav-panel-search height
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-02-02 21:48:59 +01:00
8a098044bf Merge pull request #2831 from wallabag/Quent-in-patch-1
Update of CraueConfigBundle in Occitan
2017-02-02 17:11:40 +01:00
20fa5ca02a Update of CraueConfigBundle in Occitan 2017-02-02 16:29:28 +01:00
c7d05059ca Merge pull request #2824 from wallabag/simplify-strings
Renamed Developer section to API client management
2017-02-02 15:35:22 +01:00
d3ef28c092 Freezed sensio/framework-extra-bundle version 2017-02-02 14:39:17 +01:00
f217cf48d9 Merge pull request #2826 from wallabag/jlnostr-patch-1
Translate missing strings for de-DE.
2017-02-02 09:13:21 +01:00
ab5c68facc Merge pull request #2829 from wallabag/mruminski-patch-1
Update polish strings
2017-02-02 09:12:52 +01:00
51ca217d2e Update polish strings
update missing polish strings
2017-02-01 22:29:03 +01:00
f41b085c76 Translate missing strings for de-DE. 2017-02-01 22:06:04 +01:00
74ba949d7e Update german strings. 2017-02-01 21:29:59 +01:00
013f426d10 Renamed Developer section to API client management 2017-02-01 13:23:13 +01:00
d3a8322a64 Merge pull request #2816 from wallabag/add-details-update
Added details about upgrade from 2.1.x or 2.2.0
2017-01-31 14:09:51 +01:00
1a6e0725d3 Added details about upgrade from 2.1.x or 2.2.0 2017-01-31 12:53:22 +01:00
713f35bafd Merge pull request #2812 from wallabag/prepare-221
Prepare wallabag 2.2.1 🚀
2017-01-31 11:31:45 +01:00
4021c928be Prepare wallabag 2.2.1 🚀 2017-01-31 11:06:35 +01:00
38c73f9691 Merge pull request #2809 from wallabag/fix-22-migrations
Fixed duplicate entry for share_public in craue_setting_table
2017-01-31 11:03:58 +01:00
a5cd696b22 Added check in migration about uuid field 2017-01-30 21:21:49 +01:00
7a340375c3 Fixed duplicate entry for share_public in craue_setting_table 2017-01-30 16:22:03 +01:00
ec67907420 Merge pull request #2790 from wallabag/prepare-220
Prepare wallabag 2.2.0 🚀
2017-01-27 19:03:13 +01:00
c833d576a9 Prepare wallabag 2.2.0 🚀 2017-01-27 17:28:58 +01:00
f0c5154d68 Merge pull request #2789 from wallabag/add-index-starred-archived
Added indexes on is_archived and is_starred
2017-01-27 14:46:50 +01:00
01e760691b Fixed check on index 2017-01-27 14:11:21 +01:00
b564d350b0 Added indexes on is_archived and is_starred 2017-01-27 11:44:04 +01:00
6fb06904ec Merge pull request #2416 from wallabag/2.2
wallabag 2.2.0
2017-01-27 09:34:32 +01:00
78295b99dd Merge remote-tracking branch 'origin/master' into 2.2 2017-01-26 13:32:07 +01:00
463cb376e3 Merge pull request #2646 from wallabag/explain-migrations-in-doc
Added explanations about migrations
2017-01-26 13:15:06 +01:00
012b2d453e Merge pull request #2787 from wallabag/lock-rulerz
Lock kphoen/rulerz to avoid breaking changes
2017-01-26 11:33:42 +01:00
363e2a9ce9 Lock kphoen/rulerz to avoid breaking changes 2017-01-26 11:01:25 +01:00
73eb2b4ed5 Merge pull request #2750 from wallabag/rename-uuid
Added migration to rename uuid to uid
2017-01-25 13:57:26 +01:00
6dfd1a6c78 Added migration for SQLite 2017-01-25 12:59:04 +01:00
5d916d03af Moved queries in a separate file 2017-01-25 12:34:20 +01:00
b8805fad03 Merge pull request #2774 from wallabag/cli-export
add cli export
2017-01-24 21:07:49 +01:00
3b0380f049 Fix phpcs and tests 2017-01-24 20:42:02 +01:00
605f82d9c4 Fixed typo in "first_steps"
Changed "Pimi passi" to "Primi passi
2017-01-24 08:22:18 -05:00
c8cd1660af Fixed update script 2017-01-23 14:43:00 +01:00
4acbeb9371 Added hardcoded SQL for migration to 2.2 2017-01-23 14:16:00 +01:00
b87f171233 Added information about latest migrations 2017-01-23 12:42:58 +01:00
500ae20c94 Add translation for 🇩🇪 2017-01-23 12:42:58 +01:00
80aee45fa8 Added french translation 2017-01-23 12:42:58 +01:00
c8ef0583af Added explanations about migrations 2017-01-23 12:42:58 +01:00
a607b7a9c0 add filepath test
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-01-22 13:19:46 +01:00
8303b037fb add cli export
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-01-22 12:51:14 +01:00
afaee1cc0a Merge pull request #2763 from janLo/sort-tags
Sort list of available tags
2017-01-18 15:15:19 +01:00
05fa529bcf Merge pull request #2759 from wallabag/prepare-216
Prepare wallabag 2.1.6 🚀
2017-01-18 10:24:24 +01:00
32755d5091 Order tags by slug
This adds an orderBy clause to findAllTags(). This makes the list of
tags more useful, as the tags appear in alphanumerical order instead of
somehow random.

Signed-off-by: Jan Losinski <losinski@wh2.tu-dresden.de>
2017-01-17 19:22:20 +01:00
1ba542ce04 Prepare wallabag 2.1.6 🚀 2017-01-17 13:59:39 +01:00
9123cb3053 Merge pull request #2758 from wallabag/fix-public-sharing
Fixed possible JS injection via the title edition
2017-01-17 11:59:14 +01:00
3d9950792c Fixed possible JS injection via the title edition 2017-01-17 10:09:04 +01:00
5ed503ab28 Added migration to rename uuid to uid 2017-01-14 13:46:20 +01:00
b4d81c91de Merge pull request #2742 from wallabag/fix-og-image-false
Avoid false preview image
2017-01-10 21:25:27 +01:00
1ff2e71c1c Use latest bdunogier/guzzle-site-authenticator 2017-01-10 18:50:55 +01:00
72e634b06c Fix registration.submit test 2017-01-10 18:50:45 +01:00
3d71d40349 Avoid false preview image
If the website doesn't provide an og_image, the value will be false and so it'll be saved like that in the database.
We prefer to leave it as null instead of false.
2017-01-10 17:42:36 +01:00
e4ccd3effe Update deps 2017-01-10 17:35:17 +01:00
a4180d0b8e Merge pull request #2733 from wallabag/fix-no-matching-response
Fixed API error No matching accepted Response format could be determined
2017-01-08 10:22:31 +01:00
96e2827605 Merge pull request #2736 from lex111/patch-1
Update copyright year
2017-01-04 22:43:58 +01:00
de84b135e2 Update copyright year in COPYING.md 2017-01-05 00:06:09 +03:00
c20d9e311f Update copyright year 2017-01-04 23:57:33 +03:00
cace43dd7b Merge pull request #2735 from wallabag/remove-small-readingtime
Removed the small element on reading time
2016-12-30 15:45:19 +01:00
144f2039e4 Merge pull request #2729 from Simounet/fix/double-overlay-right-sidenav
Fix double overlay on expanded right sidenav
2016-12-30 15:01:39 +01:00
4da856ef11 Merge pull request #2728 from Simounet/fix/side-nav-scrolling
Fix right side-nav scrolling on low height window
2016-12-30 14:57:39 +01:00
70d99765c7 Removed the small element on reading time 2016-12-30 14:17:18 +01:00
ccb9e79a35 Fix double overlay on expanded right sidenav 2016-12-30 14:00:19 +01:00
bb2934d476 Fix action's icons position 2016-12-30 13:54:13 +01:00
8e2419a5cf Fix right side-nav scrolling on low height window 2016-12-30 13:50:59 +01:00
339b1e689d Merge pull request #2725 from lapineige/master
Share to Shaarli - Include tags
2016-12-30 13:50:44 +01:00
0bacc9e175 Fixed API error 'No matching accepted Response format could be determined' 2016-12-30 13:23:02 +01:00
510b02573f Merge pull request #2732 from Simounet/fix/firefox-addon-url
Firefox add-on URL updated
2016-12-30 13:18:22 +01:00
db769f6061 Firefox add-on URL updated 2016-12-30 12:01:38 +01:00
5f4667e3e8 Merge pull request #2730 from Simounet/feature/all-actions-on-mobile
Access to search, filters, export on mobile
2016-12-30 11:10:47 +01:00
af54b2c959 Merge pull request #2731 from llune/patch-2
Minor typo fix
2016-12-30 08:55:15 +01:00
9ad7475c74 Minor typo fix 2016-12-30 02:20:58 +01:00
22d0c929e3 Access to search, filters, export on mobile 2016-12-29 19:19:51 +01:00
8527238846 Merge pull request #2702 from wallabag/add-index-uuid
Added index on entry.uuid
2016-12-29 10:54:07 +01:00
7239082a5e Renamed uuid to uid 2016-12-29 10:09:44 +01:00
90f6ee4dbe Merge pull request #2724 from Simounet/fix/reading-time
Fix entry reading time
2016-12-28 18:11:01 +01:00
d5d4708fe3 Share tags to Shaarli - Material theme 2016-12-28 12:27:09 +01:00
0a0aa70098 Share tags to Shaarli - Baggy theme 2016-12-28 12:27:00 +01:00
92ba3b5c0d Merge pull request #2723 from wallabag/fix-export-tag-space
Fixed export by tags with a tag which contains space
2016-12-28 09:10:14 +01:00
6ed615ac74 Fix entry reading time 2016-12-27 22:37:42 +01:00
c8de7ab94c Fixed export by tags with a tag which contains space 2016-12-27 21:26:53 +01:00
89cd670abf Changed uuid type in database 2016-12-25 10:51:25 +01:00
8137515171 Fixed index on entry.uuid and changed uuid field type 2016-12-25 10:51:25 +01:00
af131cb513 Added index on table creation 2016-12-23 10:26:33 +01:00
74b7c0985d Added index on entry.uuid
Useful for entry sharing
2016-12-23 10:26:33 +01:00
7719346328 Merge pull request #2696 from wallabag/run-migration
Run migration on each test
2016-12-23 09:31:41 +01:00
a72f3dc308 Fix bad migration for PostreSQL
Queries weren’t executed for PostgreSQL, bad syntax.
2016-12-23 09:00:13 +01:00
cd77a7e7ef Merge pull request #2714 from Simounet/fix/entry-card-shadow
Fix the box shadow on the card entry
2016-12-20 14:52:50 +01:00
78d6c3090a Fix the box shadow on the card entry 2016-12-20 13:04:51 +01:00
3ef75cc4e3 Be consistent between migration & schema definition 2016-12-19 14:24:19 +01:00
6514f0ed37 fixup! Run migration in test, ready for MySQL 2016-12-19 10:35:25 +01:00
d44016b072 Use actual database name
We can't retrieve the environment within the migration.
And when we ran migration on Travis, database name isn't `database_name` but `test_database_name`.
Retrieve the database name from the connection is more accurate
2016-12-19 10:35:25 +01:00
3ad4061dba pocket_consumer_key can be null 2016-12-19 10:35:24 +01:00
d9efa42f66 fixup! Manually import file for PostgreSQL 2016-12-19 10:35:24 +01:00
bd8db77f5f Remove comment
"The string "--" is not permitted within comments."
2016-12-19 10:35:24 +01:00
5354485885 Add orignal DB schema 2016-12-19 10:35:24 +01:00
81915ad8df And of course it doesn't work for SQLite 2016-12-19 10:35:24 +01:00
cafb105681 Manually import file for PostgreSQL 2016-12-19 10:35:24 +01:00
a48b5d5a5a Run migration in test, ready for MySQL 2016-12-19 10:35:24 +01:00
68cb89a516 Merge pull request #2616 from mathieui/doc-https-links
Change documentation links to HTTPS
2016-12-19 10:29:18 +01:00
77e342f75d Merge pull request #2682 from wallabag/migration-config
Ensure craue_config_setting migration are ok
2016-12-18 20:32:35 +01:00
bea8d75417 Replaced quotes for Postgres 2016-12-18 13:47:25 +01:00
57e629e154 Merge pull request #2690 from wallabag/improve-rmq-config
Added QoS for RabbitMQ
2016-12-16 08:20:50 +01:00
be8033bf12 Merge pull request #2701 from wallabag/disable-outputWalkers
Removed outputWalkers for pagination
2016-12-16 07:43:01 +01:00
31fec5f363 Ensure craue_config_setting migration are ok
We now can run the migration every time, new line from `craue_config_setting` are properly checked.
2016-12-15 22:25:10 +01:00
881b0578e7 Moved RabbitMQ QoS to parameters 2016-12-15 22:23:28 +01:00
99712e5d85 Added QoS for RabbitMQ 2016-12-15 22:23:28 +01:00
5a5da36955 Removed outputWalkers for RSS and API 2016-12-15 22:22:57 +01:00
9deac0c597 Removed outputWalkers for pagination
Due to overload, we disabled output walkers (see https://github.com/whiteoctober/Pagerfanta/issues/115
2016-12-15 22:22:56 +01:00
24becc9717 Merge pull request #2667 from wallabag/upgrade-symfony-32
Upgrade to Symfony 3.2
2016-12-15 22:18:45 +01:00
6ad8aabb83 Fixed search bug 2016-12-15 21:38:16 +01:00
21e7ccef3d Fix tests & deprecation notice 2016-12-15 21:38:16 +01:00
202a66ce02 Use simple-phpunit instead of phpunit
To avoid problem with the Yaml constant
http://symfony.com/blog/how-to-solve-phpunit-issues-in-symfony-3-2-applications
2016-12-13 09:33:06 +01:00
15cc183850 Merge pull request #2699 from wallabag/remove-usertable-query
Removed user join in query builder
2016-12-13 09:08:34 +01:00
375c9e2d3e Merge pull request #2697 from wallabag/fix-list-mode
Add default value for list_mode
2016-12-12 22:54:43 +01:00
45c159b798 Removed user join in query builder 2016-12-12 22:51:29 +01:00
24879db1f7 Add default value for list_mode 2016-12-12 17:41:03 +01:00
2c1eed8051 Merge pull request #2691 from wallabag/moved-total-import-notif
Moved total messages from import
2016-12-08 19:02:30 +01:00
be2c55de4c Moved total messages from import 2016-12-08 16:46:17 +01:00
edb9feb472 Merge pull request #2689 from wallabag/change-chmod
Replaced chmod for download pictures feature
2016-12-08 15:19:33 +01:00
e044d27f82 Replaced chmod for download pictures feature 2016-12-08 13:04:15 +01:00
75ae3c8d82 Merge pull request #2688 from wallabag/fix-browsers-import
Fixed imports with is_starred and is_archived
2016-12-08 09:07:09 +01:00
bb98fede2b Fixed imports with is_starred and is_archived 2016-12-07 16:01:50 +01:00
2d4b167038 Merge pull request #2686 from wallabag/fix-redis-import
Casted maxIterations for Redis import
2016-12-06 21:04:08 +01:00
558d5199b9 Merge pull request #2680 from wallabag/taggingrule-255
Limit rule to 255
2016-12-06 21:00:24 +01:00
7dc48ef820 Casted maxIterations for Redis import
Simpleue\Worker wants an integer, we gave it a string
2016-12-06 11:44:40 +01:00
4a1f963531 Merge pull request #2679 from jcharaoui/fix-2658
Fix content from imported entried being discarded when URL goes bad
2016-12-04 19:30:11 +01:00
106bdbcd0a Add some comments 2016-12-04 11:27:49 +01:00
a2c1b94e82 Revert switch to KernelTestCase for ContentProxyTest
Define the error string manually inside the test class instead of
fetching it from app config.
2016-12-03 09:50:36 -05:00
5aa0294cca Limit rule to 255
To avoid database error
2016-12-03 11:10:39 +01:00
cd82ace70a Add missing CoreKernelTestCase class 2016-12-03 00:26:57 -05:00
dba1e0b188 Fix WallabagV1Controller test
Account for URL redirection in refreshed entry.
2016-12-03 00:14:06 -05:00
fc2b7bda53 Fix ContentProxy tests 2016-12-03 00:14:06 -05:00
3cd6da0b74 Allow fetching content on all import types
For better consistency, allow all types of imported entries to update,
which was already the case for Firefox and Chrome.
2016-12-03 00:12:20 -05:00
e858018fdd Prevent undefined index when import fetching fails 2016-12-02 22:45:04 -05:00
36e6ef52a1 Imported entries which fail to fetch get standard error body 2016-12-02 22:42:36 -05:00
29dca43236 Retain imported content if fetching fails, fixes #2658 2016-12-02 22:41:35 -05:00
1093e979ff Merge pull request #2677 from wallabag/add-wallabag_user.de.yml
add translations/wallabag_user.de.yml (fixes #2673)
2016-12-01 19:08:12 +01:00
10d85dbae3 Update wallabag_user.de.yml
Wallabag->wallabag
2016-12-01 18:23:41 +01:00
87958ce645 add translations/wallabag_user.de.yml (fixes #2673) 2016-12-01 18:03:36 +01:00
81c657fc5b Merge pull request #2676 from wallabag/update-addons
Updated addons links
2016-12-01 14:39:48 +01:00
8d064ba5a4 Updated addons links 2016-12-01 13:48:34 +01:00
075e1d75e2 Merge pull request #2674 from wallabag/fix-404img-2FA
Fixed 404 for wallabag logo in 2FA
2016-12-01 13:35:55 +01:00
68da51d2a3 Fixed 404 for wallabag logo in 2FA 2016-12-01 10:51:04 +01:00
4bd42110c6 Merge pull request #2672 from wallabag/fix-typo
Fixed typo in asynchronous documentation
2016-12-01 07:38:19 +01:00
b46e63fc0a Fixed typo in asynchronous documentation 2016-11-30 22:02:08 +01:00
f3a1b896b3 Merge pull request #2670 from wallabag/add-floating-button
Added floating button on entry view for mobile
2016-11-30 16:55:44 +01:00
6787afbe0d Added floating button on entry view for mobile 2016-11-30 16:08:02 +01:00
9abac9651f Merge pull request #2650 from wallabag/add-hascolumn
Added hasColumn() in migration to check column existence
2016-11-30 14:17:40 +01:00
067ae472cc Named index 2016-11-30 12:29:55 +01:00
65a8c6e135 Code review 2016-11-30 11:27:07 +01:00
d68e045d86 Upgrade to Symfony 3.2 2016-11-30 11:08:38 +01:00
ad51d77146 Merge pull request #2662 from wallabag/add-list-view
Add list view
2016-11-28 16:47:41 +01:00
9aa991281d Renamed view_mode by list_mode and hide excerpt 2016-11-28 16:10:21 +01:00
d79b3adbed Fixed typo 2016-11-28 14:28:35 +01:00
597755b8c7 Cleaned old migrations 2016-11-28 14:28:35 +01:00
84c6a48df4 Added dropColumn for SQLite and some enhancements 2016-11-28 14:28:35 +01:00
a4d55a9161 Replaced abortIf with skipIf 2016-11-28 14:28:35 +01:00
18d7bc3a35 Added checks on migrations 2016-11-28 14:28:35 +01:00
986cb53645 Removed my hasColumn and used the existing one in Doctrine 2016-11-28 14:28:35 +01:00
73f7eabb6e Added hasColumn() in migration to check column existence 2016-11-28 14:28:35 +01:00
56a7ce17f3 Hide article text on mobile with list mode 2016-11-28 14:27:58 +01:00
8f3ff39ca3 Added test for list view 2016-11-28 14:27:58 +01:00
9f01d0fde0 Added list view 2016-11-28 14:27:58 +01:00
34ea7be622 Merge pull request #2663 from wallabag/remove-fosuser-attributes
Removed FOSUser attributes removed in alpha4
2016-11-28 14:27:31 +01:00
07326af5e2 Added migration to remove useless fields 2016-11-28 13:25:18 +01:00
cda0662311 Removed FOSUser attributes removed in alpha4
See https://github.com/FriendsOfSymfony/FOSUserBundle/blob/master/Upgrade.md\#200-alpha3-to-200-alpha4
2016-11-28 12:44:17 +01:00
6bb0866cf5 Merge pull request #2659 from akovalyov/bugfix/non-latin-characters-in-reading-time-calculation
Fix incorrect reading time calculation for entries in non-latin languages.
2016-11-28 09:23:04 +01:00
5b6888b13f Fix incorrect reading time calculation for entries in languages with
non-latin chars subset.
2016-11-28 01:15:06 +02:00
5b644798a0 Merge pull request #2654 from Kdecherf/domain-filter
Enforce lowercase on domain name filter
2016-11-27 18:35:38 +01:00
00fc2b44f4 Enforce lowercase on domain name filter
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-26 19:52:50 +01:00
ebe50a85fb Merge pull request #2622 from Kdecherf/ui-changes
Material UI Changes
2016-11-25 17:11:07 +01:00
60abe8c274 Minified CSS 2016-11-25 16:45:03 +01:00
56026217c5 Material: update size of text in article
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-25 13:49:45 +01:00
819c8f5bd4 Material: render blockquote in italic and strong in bold in article
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-25 13:39:53 +01:00
fdaa044314 Material: update style of pre in article
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-25 13:39:53 +01:00
59cfd63c23 Material: update style of ul in article
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-25 13:39:53 +01:00
858430c0d0 Material: update style of article links
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-25 13:39:53 +01:00
5ea90fa8b9 Material: increase max width of article on large screens
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-25 13:39:49 +01:00
7470a2f36a Material: prevent bold in title, update title font size
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-25 13:37:42 +01:00
5b69e03eb4 Material: change color of background, article content and titles
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-25 13:37:42 +01:00
b5e0bbeb85 Merge pull request #2642 from wallabag/fix-logout-shortcut
Fixed logout shortcut
2016-11-23 15:14:05 +01:00
66e9dde0dc Fixed logout shortcut 2016-11-23 14:40:00 +01:00
f4a9833490 Merge pull request #2620 from wallabag/fix-password-layout
Fix password layout
2016-11-23 09:53:18 +01:00
fcbf253b6b Remove empty line 2016-11-23 09:20:00 +01:00
75a4b3b23f Merge pull request #2640 from wallabag/fix-openoriginal
Fixed entry shortcuts available in list view
2016-11-23 09:06:45 +01:00
0df2a4b021 Fixed entry shortcuts available in list view 2016-11-22 21:31:21 +01:00
be2725db40 Add migration for new FOSUser version 2016-11-22 21:25:05 +01:00
ae741f998e Fix MonologBundle deprecation
The Symfony\Bundle\MonologBundle\DependencyInjection\Compiler\DebugHandlerPass class is deprecated since version 2.12 and will be removed in 3.0. Use AddDebugLogProcessorPass in FrameworkBundle instead.
2016-11-22 21:25:05 +01:00
5066c3e066 Re-use FOSUser master branch 2016-11-22 21:25:05 +01:00
4da598c5df Fix Travis 2016-11-22 21:23:58 +01:00
d7acde5cc3 Use the correct template
When resetting the password, the overriden template we used wasn’t well spelled.

And since we are using a locked version of FOSUser (on a custom commit), the translation of `resetting.check_email` is wrong in any language but english.
2016-11-22 21:23:58 +01:00
9624b3adfa These files aren’t used anymore
Translation were moved to the global one
2016-11-22 21:23:58 +01:00
7c6b7a40d1 Merge pull request #2637 from wallabag/mruminski-patch-1
Update messages.pl.yml
2016-11-22 20:02:00 +01:00
24d4b243a7 Update messages.pl.yml
translate shortcuts section to polish
2016-11-22 19:24:38 +01:00
176e0ea3ca Merge pull request #2317 from wallabag/restricted-access
Added authentication for restricted access articles
2016-11-22 19:12:53 +01:00
d51093a7d9 Added documentation and missing translations 2016-11-22 17:32:24 +01:00
d64bf7953b Added internal setting to enable/disable articles with paywall 2016-11-22 14:56:53 +01:00
40f3ea57fb Cleared CookieJar to avoid websites who use cookies for analytics 2016-11-22 14:25:51 +01:00
1d5dd2c241 Merge pull request #2612 from wallabag/add-shortcuts-help
Added help about shortcuts
2016-11-22 14:10:12 +01:00
7aab0ecf2f Added authentication for restricted access articles
Fix #438. Thank you so much @bdunogier
2016-11-22 14:01:46 +01:00
893ccad31f Translations for shortcuts help 2016-11-22 13:33:06 +01:00
c526f9e474 Added help about shortcuts 2016-11-22 13:07:42 +01:00
bb28368f69 Merge pull request #2635 from wallabag/304-reload
Return 304 when content isn't reloaded using the API
2016-11-22 11:27:55 +01:00
5cd0857e3c Return 304 when content isn't reloaded using the API
Previously it was a 400 but this is more related to a real error.
Using the API user should only know the content got reloaded or not.
If reloaded: 200 otherwise: 304.
2016-11-22 10:45:19 +01:00
944b8d6175 Merge pull request #2613 from wallabag/fix-overlap
Fix card action overlap
2016-11-22 10:27:14 +01:00
ba838dae5a Merge pull request #2614 from wallabag/api-reload
Add ability to reload entry from API
2016-11-22 09:39:43 +01:00
c72c6f43f2 Merge pull request #2632 from wallabag/mruminski-patch-1
Update messages.pl.yml
2016-11-21 20:17:33 +01:00
4bf5172585 Update messages.pl.yml
missing polish translation added
2016-11-21 18:18:52 +01:00
1f00547836 Merge pull request #2630 from ThibaudDauce/fix-black-headings
Add white-text class to card-title too
2016-11-21 17:06:55 +01:00
4f2755a61d Add white-text class to card-title too 2016-11-21 15:37:47 +01:00
eb2d613c3e Merge remote-tracking branch 'origin/master' into 2.2 2016-11-21 15:15:30 +01:00
625bb56181 Merge pull request #2624 from Rurik19/master
Fix #2056 update config.yml
2016-11-21 13:14:31 +01:00
83fed2648b Merge pull request #2625 from wallabag/prepare-215
Prepare wallabag 2.1.5
2016-11-21 09:49:34 +01:00
98253436e9 Prepare wallabag 2.1.5 🚀 2016-11-21 09:20:27 +01:00
e839f87a1c Merge pull request #2623 from wallabag/composer-php-5.5
Force composer to run as PHP 5.5.9
2016-11-21 09:01:35 +01:00
f32ff37534 Lock down PHPUnit for PHP 5.5
Since Composer defined lowest version is now PHP 5.5.9.
PHPUnit 5.0 require PHP 5.6.
2016-11-21 07:46:46 +01:00
05cdd393d8 wrong spaces 2016-11-21 11:29:09 +05:00
5e7fdfc8dd Fix #2056 update config.yml
Resolves refresh token lifetime issue
2016-11-21 11:13:40 +05:00
c396a50509 Force composer to run as PHP 5.5.9 2016-11-20 23:07:38 +01:00
a38d50e1e8 Merge pull request #2621 from wallabag/redis-password
Add ability to use Redis with password
2016-11-20 22:27:05 +01:00
59c42a4aad Add german translation 2016-11-20 20:43:05 +01:00
c1683778ab Add ability to use Redis with password 2016-11-20 20:43:04 +01:00
56da73969a Return an explicit error if reload fail 2016-11-20 16:25:13 +01:00
70584b42aa Fixing tests 2016-11-20 15:15:13 +01:00
7c05d59153 Change documentation links to HTTPS
Even though all the websites used in the commands redirect http to
https, a man in the middle can happen with the initial request,
leading to arbitrary code execution.
2016-11-20 14:51:14 +01:00
0a6f4568b5 Add ability to reload entry from API 2016-11-20 13:08:41 +01:00
5ae8788583 Merge pull request #2609 from wallabag/rss-paging
RSS paging
2016-11-20 10:17:37 +01:00
77e2898ad4 Fix card action overlap
On smaller resolution
2016-11-20 10:14:19 +01:00
16eb124e4a Add documentation about RSS paging 2016-11-20 09:50:52 +01:00
edd2472faa Fix tests 2016-11-20 09:39:26 +01:00
8670250a26 Add RSS pagination
Following https://tools.ietf.org/html/rfc5005#page-4
2016-11-20 09:39:26 +01:00
3c969d3990 Add missing translations 2016-11-20 09:39:25 +01:00
6f85bed294 Merge pull request #2543 from wallabag/search-engine
Added a simple search engine
2016-11-19 20:42:27 +01:00
995c204428 Added shortcut 2016-11-19 20:05:16 +01:00
32f455c131 Added tests 2016-11-19 20:05:16 +01:00
49b042dfdf Added translations and currentRoute parameter 2016-11-19 19:17:30 +01:00
398de40517 Added search engine in baggy theme 2016-11-19 19:17:30 +01:00
ee122a7528 Added a simple search engine
Fix #18
2016-11-19 19:17:30 +01:00
27dce581ca Messed up DE import translation 2016-11-19 15:39:02 +01:00
68003139e1 Merge remote-tracking branch 'origin/master' into 2.2
# Conflicts:
#	.editorconfig
#	docs/de/index.rst
#	docs/de/user/import.rst
#	docs/en/index.rst
#	docs/en/user/configuration.rst
#	docs/en/user/import.rst
#	docs/fr/index.rst
#	docs/fr/user/import.rst
#	src/Wallabag/CoreBundle/Command/InstallCommand.php
#	src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
#	src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
#	web/bundles/wallabagcore/themes/baggy/css/style.min.css
#	web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
#	web/bundles/wallabagcore/themes/material/css/style.min.css
#	web/bundles/wallabagcore/themes/material/js/material.min.js
2016-11-19 15:30:49 +01:00
cb1a6590c0 Merge pull request #2608 from wallabag/change-dev-version
Change version to 2.2.0-dev
2016-11-19 14:56:47 +01:00
8fdadee3a5 Change version to 2.2.0-dev 2016-11-19 14:28:25 +01:00
00b1dc0eb0 Merge pull request #2607 from wallabag/update-changelog
Updated changelog for 2.1.4
2016-11-19 14:03:18 +01:00
442dcb8ec1 Updated changelog for 2.1.4 2016-11-19 14:02:32 +01:00
bbd4ae7b56 Merge pull request #2600 from wallabag/install-assets
Install assets for shortcuts
2016-11-19 12:23:16 +01:00
4c27f14fa9 Merge pull request #2604 from wallabag/postgresql-version
wallabag can’t work on PostgreSQL <= 9.1
2016-11-19 12:00:18 +01:00
eabcd880ca Merge pull request #2605 from wallabag/update-release-process
Add .travis.yml change to RELEASE_PROCESS
2016-11-19 11:57:26 +01:00
8add306204 Merge pull request #2601 from wallabag/store-http-status
Added http_status in Entry entity
2016-11-19 11:53:41 +01:00
45277ad2bd Add .travis.yml change to RELEASE_PROCESS 2016-11-19 11:43:47 +01:00
a2261fbd70 Merge pull request #2603 from wallabag/fix-composer-no-dev
Fix clear-cache problem using —no-dev
2016-11-19 11:33:35 +01:00
cffcce0c92 Wallabag can’t work on PostgreSQL <= 9.1 2016-11-19 11:32:56 +01:00
01a47da128 Fix clear-cache problem using —no-dev
Related to :

> PHP Fatal error:  Class 'FOS\RestBundle\Serializer\JMSSerializerAdapter' not found in /Users/j0k/Sites/github/wallabag/var/cache/prod/appProdProjectContainer.php on line 9139
2016-11-19 10:45:21 +01:00
d215273c65 Check if status code is OK 2016-11-18 23:05:02 +01:00
e10e6ab34e Replace http status with a string
I don't want to have 0 if we don't fetch status code, I think it's better to have an empty string, mainly for filters
2016-11-18 15:55:16 +01:00
10b3509757 Added http_status in Entry entity 2016-11-18 15:09:21 +01:00
74216c7c74 Install assets for shortcuts 2016-11-18 14:12:26 +01:00
8853914ba4 Merge pull request #2596 from wallabag/prepare-214
Prepare wallabag 2.1.4 🚀
2016-11-18 10:24:55 +01:00
5d2971cadd Prepare wallabag 2.1.4 🚀 2016-11-18 10:00:29 +01:00
19d401b15c Merge pull request #2550 from wallabag/reorder-documentation
Reordered documentation
2016-11-18 09:28:20 +01:00
b060fbdfe7 Merge pull request #2593 from wallabag/test-clarify
Put log in the most common failure tests
2016-11-18 09:21:27 +01:00
50540682ff Undo translation of 'in english'. 2016-11-18 09:08:16 +01:00
c15d5a3af8 Merge pull request #2592 from wallabag/mruminski-patch-1
Update messages.pl.yml
2016-11-17 20:03:40 +01:00
5cc367b83a Fix tests 2016-11-17 19:58:10 +01:00
d8a35aba49 Put log in the most common failure tests
So we’ll quickly be able to see what kind of test is failing when viewing Travis
2016-11-17 19:30:50 +01:00
2bc5b74c73 Reordered documentation for German. 2016-11-17 19:22:21 +01:00
887303889b Update translation of link to german translation. 2016-11-17 19:22:19 +01:00
bb624c0269 Reordered 🇫🇷 documentation 2016-11-17 19:22:16 +01:00
2e389b0b90 Reordered documentation 2016-11-17 19:22:15 +01:00
52e01d3483 Update messages.pl.yml
translate action_mark_as_read section to polish
2016-11-17 18:52:42 +01:00
9e0a49e6ac Merge pull request #2578 from wallabag/questionmark-icon
Added help on config screen
2016-11-17 09:53:14 +01:00
66336f6571 Merge pull request #2547 from wallabag/add-option-markasread
Added a configuration to define the redirection after archiving an entry
2016-11-17 09:40:46 +01:00
c894d76e57 Added tooltips for baggy theme 2016-11-17 09:22:39 +01:00
540a9bc4a2 Added help on config screen 2016-11-17 09:22:39 +01:00
9e2440fe15 Fix migration 2016-11-17 08:05:15 +01:00
e6b133c60c CS 2016-11-16 23:10:01 +01:00
00bf45b6f2 Update unit test for Redirect 2016-11-16 23:07:34 +01:00
54fd55fda1 Tried to fix tests 2016-11-16 23:07:34 +01:00
65cd8a4a9a Added tests 2016-11-16 23:07:34 +01:00
f052f1fd57 Added constants for redirection values 2016-11-16 23:07:34 +01:00
287204cda7 Update messages.en.yml 2016-11-16 23:07:34 +01:00
f0ba37fbd5 Update messages.de.yml 2016-11-16 23:07:34 +01:00
5d52cc411b update German configuration.rst 2016-11-16 23:07:34 +01:00
a42f38d9fb Added a configuration to define the redirection after archiving an entry
Fix #496
2016-11-16 23:07:34 +01:00
e042a5d78f Merge pull request #2495 from wallabag/add-shortcuts
Added shortcuts
2016-11-16 09:35:59 +01:00
94f2057ffe Added CSS class on links 2016-11-16 09:17:12 +01:00
10a1ffae53 Fix keyboard navigation on quickstart view
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-11-15 22:23:50 +01:00
c930992348 fix next/prev page 2016-11-15 21:55:16 +01:00
5637a26e9a Bring navigation (with right, left and enter) on material entries page. Supports going to next and previous page !
Also better indentation for js files (changed editorconfig for them).

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-11-15 21:55:10 +01:00
16ef7607f4 Reorganized JS folders for shortcuts 2016-11-15 21:54:50 +01:00
af61cb80eb es6 imports
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-11-15 21:54:41 +01:00
f9cded7dd2 Added new shortcuts 2016-11-15 21:54:34 +01:00
49c5d0ad6e Changed FOSJSRouting format in config 2016-11-15 21:54:20 +01:00
3cc78f0679 Added shortcuts 2016-11-15 21:54:20 +01:00
d213219ec7 Merge pull request #2570 from wallabag/add-creation-date
Added creation date on entries view
2016-11-15 09:23:44 +01:00
decf651bbd Merge pull request #2587 from wallabag/user-agents
User-agents have moved to site-config
2016-11-15 09:23:26 +01:00
66fe2a3dc4 User-agents have moved to site-config
Since graby@1.5.0, user-agent can be defined in site-config, which the now recommended way
2016-11-14 14:29:13 +01:00
a8c6f29f3e Hide creation date in mobile view 2016-11-14 14:28:42 +01:00
64d080586d Merge pull request #2584 from blankoworld/master
fix #2582 - Documentation, Nginx config: disable all other PHP file from symphony
2016-11-14 14:00:24 +01:00
80302e5aaa Changed display for material theme 2016-11-14 13:58:41 +01:00
1c282b1da0 Added creation date on entries view 2016-11-14 13:57:31 +01:00
ccad5d7629 fix #2582 - Nginx config: disable all other PHP file from symphony
Regarding
https://www.nginx.com/resources/wiki/start/topics/recipes/symfony/ we
need to limit access to config.php and make_dev.php files from Nginx.
That's why we return 404 error page for these files.
2016-11-14 11:58:26 +01:00
d3511bbde9 Merge pull request #2577 from wallabag/add-tooltip-material
Added tooltips in header bar
2016-11-14 10:08:26 +01:00
d37081e50b Merge pull request #2562 from wallabag/image-bigger
Bigger image preview in case of only image content
2016-11-14 10:01:12 +01:00
cf9ee2fbd0 Added tooltips in header bar 2016-11-12 11:57:55 +01:00
8315507384 Merge pull request #2571 from wallabag/change-language-without-logout
Changed behavior when we change language
2016-11-11 18:27:04 +01:00
ece4718f63 Changed behavior when we change language
No need to disconnect to apply the language substitution
2016-11-10 20:54:20 +01:00
644b340178 Merge pull request #2566 from wallabag/add-unmarkit
Added unmark.it sharing
2016-11-09 18:19:08 +01:00
8a9604aafe Added unmark.it sharing
Fix #668
2016-11-09 18:18:49 +01:00
5cf9604004 Merge pull request #2565 from wallabag/remove-support-website
Removed support website on about page
2016-11-09 14:24:32 +01:00
1781ca3763 Removed support website on about page 2016-11-09 13:59:55 +01:00
33a66b1973 Merge pull request #2563 from wallabag/pr-template
Improve PR template
2016-11-09 09:03:10 +01:00
1e8c7fa5f9 Merge pull request #2564 from wallabag/mruminski-patch-1
Update messages.pl.yml
2016-11-09 09:02:33 +01:00
a9740448cf Update messages.pl.yml
translate Pinboard importer section to polish
2016-11-08 23:11:03 +01:00
c396ee2c63 Improve PR template 2016-11-08 22:53:30 +01:00
8d7b4f0eff Display a bigger image in case of image content
If the content is only an image, we can display a bigger preview image because we won’t have text to display.

Also, split different card view to avoid too much complexity in the entries.html.twig
2016-11-08 22:17:46 +01:00
e9490a3443 Add grunt watch task 2016-11-08 22:16:01 +01:00
7005b425e0 Remove the left margin of tag
In the entries list, the first tag below the link isn’t stick to the left. Now it is.
2016-11-08 22:15:37 +01:00
a0fb3b1b7a Merge pull request #2561 from wallabag/Rurik19-patch-2259
fix #2559
2016-11-08 18:38:37 +01:00
d99a7c2206 fix #2559 2016-11-08 22:14:32 +05:00
89e167a45a Merge pull request #2553 from wallabag/add-tagform-mobile
Added new tag form in mobile view for Material theme
2016-11-08 15:42:05 +01:00
df30af69d2 Added new tag form in mobile view for Material theme
Fix #2376
2016-11-08 14:24:00 +01:00
41c2178685 Merge pull request #2548 from wallabag/pinboard
Add Pinboard import
2016-11-08 14:19:40 +01:00
82f9a52078 docs: update german import.rst 2016-11-07 21:00:57 +01:00
40f3ab5311 Merge pull request #2555 from dkrmr/fix_update_script
Reorder variable assignation in update.sh script, fix #2554
2016-11-07 11:14:05 +01:00
a4de2351a0 Merge pull request #2556 from wallabag/replace-tokenstorage
Replaced TokenStorage with TokenStorageInterface
2016-11-07 11:13:50 +01:00
94766a8962 PHP CS 2016-11-07 10:41:11 +01:00
2fe2e411a7 Replaced TokenStorage with TokenStorageInterface 2016-11-07 10:34:49 +01:00
7d173a28c7 Reorder variable assignation in update.sh script, fix #2554 2016-11-07 09:55:03 +01:00
94060509b8 Use more explicit check 2016-11-07 08:36:52 +01:00
06283bef72 Merge pull request #2552 from wallabag/reading-time-round
Round readingtime to avoid crazy number
2016-11-06 23:32:39 +01:00
2e4efb5965 Add english doc into german one 2016-11-06 23:27:55 +01:00
56e6216485 Update messages.en.yml
Instapaper->Pinboard
2016-11-06 22:29:49 +01:00
e8e72daaa6 Update messages.de.yml 2016-11-06 22:29:08 +01:00
01ad4d6a89 Merge pull request #2551 from wallabag/remove-maintenance-bundle
Removed Maintenance bundle
2016-11-06 21:47:16 +01:00
d61b24e459 Round readingtime to avoid crazy number
Like `8.666666666667 min`
2016-11-06 21:41:32 +01:00
31151d70f2 Add doc 2016-11-06 21:23:38 +01:00
db3838545c Removed Maintenance bundle 2016-11-06 15:34:08 +01:00
e92fbdc852 Fix tests 2016-11-06 09:58:07 +01:00
24692715de Merge pull request #2546 from wallabag/update-parameters-doc
Updated default parameters.yml file in documentation
2016-11-06 09:52:09 +01:00
0c256e2e70 Updated default parameters.yml file in documentation 2016-11-06 09:11:12 +01:00
16037570bf Merge pull request #2545 from wallabag/update-doc
Update the upgrade documentation
2016-11-05 14:16:21 +01:00
bc12f08bda Update the upgrade documentation 2016-11-05 14:15:09 +01:00
9ab024b4f5 Add Pinboard import 2016-11-04 22:44:31 +01:00
b5571b52cc Merge pull request #2541 from wallabag/mruminski-patch-1
Update messages.pl.yml
2016-11-04 21:49:42 +01:00
cbdbd9d683 Merge pull request #2540 from wallabag/Quent-in-patch-1
Update of the OC version
2016-11-04 19:29:27 +01:00
ff7f551f5a Update messages.pl.yml
missing polish translation added
2016-11-04 19:26:06 +01:00
eaa0bf00a6 Update of the OC version 2016-11-04 18:13:11 +01:00
4ec9f5c334 Merge pull request #2536 from wallabag/prepare-213
Prepare wallabag 2.1.3 🚀
2016-11-04 13:32:47 +01:00
505e8acd46 Update CHANGELOG
Usage of github-changes from @lalitkapoor
2016-11-04 13:32:30 +01:00
4775fed6a7 Merge pull request #2535 from wallabag/default-sort-2.2
Use created_at as default sort
2016-11-04 09:38:03 +01:00
a3f7d8a870 Prepare wallabag 2.1.3 🚀 2016-11-04 09:10:15 +01:00
2db9142bfc Merge pull request #2460 from wallabag/ui-changes
UI Changes
2016-11-04 08:49:52 +01:00
f53f542fa5 Merge pull request #2534 from wallabag/default-sort
Use created_at as default sort
2016-11-04 08:48:42 +01:00
7e9c1d65b1 Add index into Table definition 2016-11-04 08:02:02 +01:00
1e7b04d4ea Use created_at as default sort
With index (following https://github.com/wallabag/wallabag/pull/2534)
2016-11-04 07:56:04 +01:00
ce11952447 Use created_at as default sort
Imported content use the real creation date. If we sort by id, it'll
display contents in reverse order.
2016-11-04 07:34:38 +01:00
001cc7168a Cleanup 2016-11-03 18:01:25 +01:00
864c1dd23a Fix rest controller merge 2016-11-03 17:29:16 +01:00
5a619812ca Merge remote-tracking branch 'origin/master' into 2.2 2016-11-03 16:41:29 +01:00
da41365579 Merge pull request #2180 from wallabag/download-pictures
Download pictures
2016-11-03 16:22:07 +01:00
ca08d02f2f Add warning message for import + download images
When import isn't async and downloading images is enabled, we warn the user that import can fail.
Also, added missing translations
2016-11-03 15:59:20 +01:00
816c0940d1 Merge pull request #2523 from wallabag/qrcode-android-app
Added QRCode and link to configure android application
2016-11-03 14:55:24 +01:00
32508ef07a avoid eslint warning by disabling line
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-11-03 14:23:09 +01:00
d56d416d9b Deal with more resolution issues
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-11-03 12:49:57 +01:00
3221b2e413 Fix resolution issues and 'title' issues
Also, modify editorconfig for css files.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-11-03 11:28:40 +01:00
84795d015b Merge pull request #2530 from wallabag/add-doc-failed-load-external-entity
Added documentation about failed to load external entity error
2016-11-02 20:07:10 +01:00
a49159e9eb Update faq.rst 2016-11-02 18:08:25 +01:00
b1057c6a5e update German faq.rst 2016-11-02 17:16:57 +01:00
cce77ebc2d update German faq.rst 2016-11-02 17:15:32 +01:00
4b5e95c0e5 Added more info about Doctrine / PHP bug 2016-11-02 17:02:48 +01:00
585fd2a4ad Added documentation about failed to load external entity error
Fix #2529
2016-11-02 16:58:20 +01:00
3be554c78f Merge pull request #2519 from Jibec/master
Translation update - French
2016-11-02 07:48:10 +01:00
e46fdf3096 CS 2016-11-02 07:26:14 +01:00
9c15470691 wallabag is full lowercase 2016-11-02 07:15:24 +01:00
1f66d79e6b Add more importer to wallabag:import command
All importer available expect Pocket which require an oAuth login.
2016-11-02 07:10:57 +01:00
7816eb622d Add entry.saved event to import & rest 2016-11-02 07:10:23 +01:00
be4f6bb4f3 Merge pull request #2528 from Kdecherf/slashdot-cookie
Force user-agent for .slashdot.org
2016-11-01 22:29:43 +01:00
22ef6f96e2 Force user-agent for .slashdot.org
Slashdot replaces actual content with a form regarding cookies when
requests originate from France. By forcing the user-agent, the warning
seems to go away.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-01 19:51:45 +01:00
e0597476d1 Use custom event instead of Doctrine ones
This give us ability to use Entry ID to determine where to store images and it’s then more easy to remove them when we remove the entry.
2016-11-01 14:49:02 +01:00
db1d962f7b Merge pull request #2524 from lologhi/instapaper-cli-import
Add Instapaper to CLI import
2016-11-01 14:26:57 +01:00
995d909d0f Add Instapaper to CLI import 2016-11-01 18:33:32 +08:00
303b3c61a7 Translation - French - tiny typo 2016-10-31 20:16:36 +01:00
31dd328df4 Translation - French - tiny escape correction 2016-10-31 20:12:29 +01:00
337b47c216 Translation - French - tiny escape correction 2016-10-31 20:01:07 +01:00
68e0efffb8 Fixed review 2016-10-31 17:20:27 +01:00
3b81212674 Added translations and baggy part 2016-10-31 16:48:34 +01:00
e61ee56031 Added QRCode and link to configure android application 2016-10-31 16:18:52 +01:00
aedd6ca0fd Add translations & migration 2016-10-31 13:29:33 +01:00
e52ee565f7 Merge pull request #2521 from foxmask/master
fix path for  the install scripts
2016-10-31 09:56:07 +01:00
7d9abd1ab5 Merge pull request #2520 from wallabag/config
Inject parameter instead of service
2016-10-31 09:39:53 +01:00
99692e8c33 fix path for in install scripts 2016-10-30 22:46:09 +01:00
038469e73f fix path for in install scripts 2016-10-30 22:38:38 +01:00
d1495dd0a4 Ability to enable/disable downloading images
This will speed up the test suite because it won’t download everything when we add new entry…
Add a custom test with downloading image enabled
2016-10-30 21:30:45 +01:00
e1632cea0e Fix tests 2016-10-30 20:43:37 +01:00
4b3c983ab8 Inject parameter instead of service
We are injecting CraueConfig service when we only need to retrieve one or two values from it.
Instead I discovered we can directly inject a value from a service in the service definition!
2016-10-30 20:27:41 +01:00
309e13c11b Move settings before Entry
Because we need wallabag_url to be defined when we’ll insert entries
2016-10-30 20:12:34 +01:00
41ada277f0 Add instance url to the downloaded images 2016-10-30 19:50:00 +01:00
f74061f1e1 Merge pull request #2518 from wallabag/docs-dev-3rd-party-by-strubbl
docs: fix link to wallabag-stats project
2016-10-30 12:27:25 +01:00
2087e499b4 Translation update - French 2016-10-30 12:11:24 +01:00
f6aff9a7a8 Translation update - French 2016-10-30 12:10:59 +01:00
431d038aa7 Translation update - French 2016-10-30 12:10:14 +01:00
a0eddc598e Translation update - French 2016-10-30 12:09:08 +01:00
90ec78f05a docs: fix link to wallabag-stats project 2016-10-30 12:01:24 +01:00
48656e0eaa Fixing tests 2016-10-30 11:27:09 +01:00
7f55941856 Use doctrine event to download images 2016-10-30 10:48:29 +01:00
45fd7e09d7 Cleanup 2016-10-30 09:58:53 +01:00
535bfcbe80 Move related event things in Event folder 2016-10-30 09:58:39 +01:00
2a2ceceaa4 Merge pull request #2514 from wallabag/docs-dev-3rd-party-by-strubbl
docs: update 3rd party projects by Strubbl
2016-10-30 07:04:11 +01:00
a40b2b7ee4 docs: update 3rd party projects by Strubbl 2016-10-29 19:59:05 +02:00
156bf62758 CS 2016-10-29 16:25:45 +02:00
94654765cc Working 2016-10-29 16:25:45 +02:00
419214d722 Download pictures successfully
Needs to rewrite them properly (get base url)
2016-10-29 16:25:45 +02:00
4dface6670 first draft (from v1) 2016-10-29 16:25:45 +02:00
ca9858537e Merge pull request #2513 from wallabag/update-capistrano-config
Updated Capistrano configuration
2016-10-29 15:36:58 +02:00
c4b3933bae Updated Capistrano configuration 2016-10-29 14:39:07 +02:00
67b270d996 Merge pull request #2506 from wallabag/fix-export-with-tags
Fixed entries export filtered with a tag
2016-10-29 14:27:46 +02:00
794ac861cb Added test for export by filtering with tag 2016-10-29 14:03:55 +02:00
920d88599a Fixed entries export filtered with a tag
Fix #2505
2016-10-29 13:43:11 +02:00
5feef9f7a4 Merge pull request #2499 from wallabag/add-relation-client-user
Added relation between API Client and User
2016-10-29 13:20:55 +02:00
267087d969 Merge pull request #2509 from wallabag/explode-api-controller
Exploded WallabagRestController into many controllers
2016-10-29 13:20:01 +02:00
bc4564a709 Removed useless route 2016-10-28 15:24:58 +02:00
900c844861 Exploded WallabagRestController into many controllers
Fix #2503
2016-10-28 14:46:30 +02:00
f08ec5f88a Remove backquote in query 2016-10-28 11:14:14 +02:00
f24ea59ea4 Fixed migration and added tests 2016-10-28 10:55:39 +02:00
eca4d030bf Merge pull request #2508 from wallabag/fix-redis-rabbit-doc
Added the whole path to parameters.yml file
2016-10-27 16:53:57 +02:00
37da178696 Added the whole path to parameters.yml file 2016-10-27 14:46:21 +02:00
069d39dfaf Merge pull request #2507 from wallabag/add-check-makefile
Added require.sh to check if composer is installed
2016-10-27 13:55:17 +02:00
c4d9a8d6d0 Usage of composer.phar if it's found 2016-10-27 10:09:43 +02:00
9998c72533 Added require.sh to check if composer is installed 2016-10-27 09:53:09 +02:00
f3b637fbfe Merge pull request #2500 from wallabag/add-check-composer
Added a check in Makefile to see if composer is installed
2016-10-27 07:30:50 +02:00
a5d6a7d8b5 Merge pull request #2504 from wallabag/change-page-title-filter-tags
Added tag label in the page title
2016-10-26 16:09:37 +02:00
73e8df9e44 Renamed variable for page title 2016-10-26 15:49:44 +02:00
7a5043f187 Added tag label in the page title
Fix #2472
2016-10-26 13:53:23 +02:00
c68720d40e Merge pull request #2473 from pmichelazzo/master
Portuguese (Brazilian) translation
2016-10-25 11:41:24 +02:00
e8eec07ae6 Translated missed line 147 2016-10-25 07:25:08 -02:00
c5ad143e75 Added a check in Makefile to see if composer is installed
Fix #2498
2016-10-24 22:28:44 +02:00
23406ca3f1 Added relation between API Client and User
Fix #2062
2016-10-24 21:56:28 +02:00
e1d4ed2d81 Merge pull request #2493 from bmillemathias/add_link_content_fetch_problem
Add relevant links to fetch content error page
2016-10-24 21:44:22 +02:00
d36e5e20a5 Removed the email part 2016-10-24 21:01:13 +02:00
8e58be9fb6 Merge pull request #2496 from wallabag/mruminski-patch-1
Update messages.pl.yml
2016-10-24 20:19:53 +02:00
cd99bfae68 Update messages.pl.yml
translate reset section to polish
2016-10-24 19:49:33 +02:00
64a8781e45 Merge remote-tracking branch 'origin/master' into 2.2 2016-10-24 12:03:17 +02:00
9313ea9d44 Merge pull request #2401 from wallabag/reset-account
Reset account
2016-10-24 11:57:51 +02:00
f623516e10 SQLite should use utf8, not utf8mb4 2016-10-24 10:10:38 +02:00
a1c1841828 Merge pull request #1890 from wallabag/v2-api-annotation-switched
bring annotations to API
2016-10-24 10:06:12 +02:00
d1b075509d Add relevant links to fetch content error pages.
We link to the troubleshooting guide and give the mail link.
2016-10-23 15:34:52 +02:00
5ce1528953 Fix migrations 2016-10-23 12:35:57 +02:00
c64b4941d5 Merge pull request #2486 from wallabag/translate-backup-doc
Added 🇫🇷 documentation for wallabag backup
2016-10-22 22:23:15 +02:00
2ca1cc0c18 Translate backup.rst to German 2016-10-22 21:11:20 +02:00
67aa755fb5 Added 🇫🇷 documentation for wallabag backup 2016-10-22 14:16:17 +02:00
88d5d94dcb Lowercase wallabag 2016-10-22 14:05:59 +02:00
5751b41491 Add migration for MySQL utf8mb4 2016-10-22 14:01:58 +02:00
f69636c4db Merge pull request #2484 from bmillemathias/fix_2479
Document what to backup in Wallabag
2016-10-22 13:55:46 +02:00
fc79f1ffa8 Add verification check for MySQL version
Must now be >= 5.5.4
2016-10-22 13:41:03 +02:00
f7f6bfb7e9 Merge pull request #2485 from bmillemathias/fix_android_documentation
Fix missing words in Android application documentation
2016-10-22 13:31:14 +02:00
1e7807e703 Merge pull request #2456 from wallabag/use-new-pdf
use new tcpdf library version
2016-10-22 13:29:58 +02:00
89abc0b61b Add missing words in the documentation 2016-10-22 13:21:53 +02:00
b0de88f75d Use statements & update translation 2016-10-22 13:13:07 +02:00
8c61fd12b1 CS 2016-10-22 13:13:07 +02:00
ca8b49f46e Add baggy reset part 2016-10-22 13:13:07 +02:00
f71e55ac88 Avoid orphan tags 2016-10-22 13:13:07 +02:00
2f82e7f8e1 Cleanup subscriber / listener definition 2016-10-22 13:13:07 +02:00
191564b7f7 Add custom doctrine subscriber for SQLite
Since SQLite doesn’t handle cascade remove by default, we need to handle it manually.

Also some refacto
2016-10-22 13:13:07 +02:00
98efffc2a6 Fix emoji insertion in MySQL
Switch to utf8mb4 instead of utf8 because f*** MySQL
See https://github.com/doctrine/dbal/pull/851
2016-10-22 13:13:07 +02:00
206bade58a Add ability to reset some datas
- annotations
- tags
- entries
2016-10-22 13:13:06 +02:00
817724a7b8 Re-add bottom pagination
Also pager.html.twig wasn’t necessary, there weren't enough duplication to put them in a dedicated template
2016-10-22 13:09:16 +02:00
ab61dbc073 remove padding on small widths
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-10-22 13:08:12 +02:00
34aa06a9b9 WIP
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-10-22 13:08:04 +02:00
af2ff7c6da use new tcpdf library version 2016-10-22 12:52:23 +02:00
aa4741091f 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
2016-10-22 12:09:20 +02:00
3199ec4702 CS 2016-10-22 09:17:01 +02:00
fc75009de7 Document what to backup in Wallabag
Fixes issue #2479
2016-10-22 09:14:07 +02:00
d9b7768dca Added a missing namespace 2016-10-22 09:06:07 +02:00
e5edb6e127 PHP CS 2016-10-22 09:06:07 +02:00
0c271b9eb0 fix cs and phpdoc 2016-10-22 09:06:07 +02:00
b1e92f8c14 cs 2016-10-22 09:06:07 +02:00
1eea248bb0 move code 2016-10-22 09:06:07 +02:00
c7935f32d2 cs 2016-10-22 09:06:07 +02:00
351eb8d97e bring annotations to API 2016-10-22 09:06:07 +02:00
e8331dd9e7 Merge pull request #2453 from wallabag/fix-api-export
Fix API export
2016-10-21 15:22:11 +02:00
f99ddbc6f8 Merge pull request #2481 from wallabag/some-fixes
Some fixes
2016-10-21 15:15:41 +02:00
49dee2d2de Merge pull request #2482 from wallabag/avoid-bad-refresh
If reload content failed, don’t update it
2016-10-21 15:12:29 +02:00
b64d8f2c9f Update Twitter cards description 2016-10-21 10:51:20 +02:00
2cbf0d05d4 Update translation for piwik_host 2016-10-21 10:45:39 +02:00
645dc7594b Fix missing translations 2016-10-21 07:52:55 +02:00
818cbe1fee Fix Portuguese translation 2016-10-21 07:18:41 +02:00
8e53bf3aa1 Update translation 2016-10-21 00:12:53 +02:00
f6798f69c3 This test doesn’t require an internet connection 2016-10-20 23:26:16 +02:00
9095497191 Fix test 2016-10-20 23:03:37 +02:00
2297d60f10 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.
2016-10-20 22:49:46 +02:00
5453500458 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)
2016-10-20 21:17:45 +02:00
1e3d74a9cf 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.
2016-10-20 21:17:03 +02:00
576d285ddf 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..
2016-10-20 21:16:01 +02:00
166e8cc6a9 Fix french translation 2016-10-20 21:14:46 +02:00
1cad9416c9 Update Portuguese translations 2016-10-20 21:11:10 +02:00
b669224762 Validate ALL translations files 2016-10-20 21:11:09 +02:00
a42cc6ff89 Update validators.pt.yml file
Some missed strings translated.
2016-10-20 08:57:24 +02:00
5d6cffedb1 Update Portuguese (Brazilian) translation
Adding the config.yml on the package.
2016-10-19 19:25:48 +02:00
99731f0bb1 Merge remote-tracking branch 'wallabag/master' 2016-10-18 22:48:23 +02:00
3a3c6b866b Portuguese (Brazilian) translation
This the Portuguese (Brazilian) for the Wallaby v2.
2016-10-18 20:51:31 +02:00
7180aaed45 Merge pull request #2467 from wallabag/version-213dev
Update wallabag version for master branch
2016-10-17 11:57:52 +02:00
f31361a6d9 Update wallabag version for master branch 2016-10-17 11:56:29 +02:00
fd461c25aa Merge pull request #2466 from wallabag/fix-update-doc
Removed MD5 hash in documentation
2016-10-17 11:40:03 +02:00
39c3dd30d2 Removed MD5 hash in documentation 2016-10-17 11:38:11 +02:00
1172622a07 Merge pull request #2452 from wallabag/prepare-212
Prepare wallabag 2.1.2 🚀
2016-10-17 11:04:20 +02:00
d4e9ce5807 Change release title in changelog 2016-10-17 10:27:07 +02:00
fd54f236f4 Update release process 2016-10-17 10:23:34 +02:00
545748bad1 Update changelog 2016-10-17 10:22:51 +02:00
ef22711605 Prepare wallabag 2.1.2 🚀 2016-10-17 09:43:13 +02:00
72ec79a5d6 Merge pull request #2464 from wallabag/fix-settings-translation
Fixed hardcoded title for internal settings
2016-10-17 09:23:15 +02:00
5e469b91d9 Fixed hardcoded title for internal settings
Fix #2458
2016-10-17 09:14:05 +02:00
692f9388cb Merge pull request #2455 from wallabag/fix-material-config-tabs
Fix tabs on material
2016-10-16 21:06:23 +02:00
3fb409ffc6 Merge pull request #2454 from wallabag/fix-baggy-small-width
Fix baggy display on small screens
2016-10-16 21:05:30 +02:00
97512ec4bc Merge pull request #2459 from wallabag/improve-german-translation
German: improve existing and add missing translation
2016-10-16 12:06:42 +02:00
dda6398a40 Merge pull request #2457 from wallabag/link-german-docu
add link to German documentation in about page
2016-10-16 10:54:19 +02:00
5bd7acd50d German: improve existing and add missing translation 2016-10-16 10:45:51 +02:00
f69ab83a5a add link to German documentation in about page 2016-10-16 09:23:58 +02:00
d9a30ef301 Fix tabs on material
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-10-15 19:26:38 +02:00
d32e1c424a Fix baggy on small screens 2016-10-15 19:04:53 +02:00
5960aa1ffc CS 2016-10-15 18:00:08 +02:00
f1c3f68e90 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 …
2016-10-15 16:46:42 +02:00
05c009bb85 Merge pull request #2451 from wallabag/add-dev-make
Bring make dev
2016-10-15 15:40:20 +02:00
8ecfdd7f8a Merge pull request #2450 from wallabag/new-improvement-view
View improvements
2016-10-15 15:38:49 +02:00
08f5a5b6bd fix stylelint 2016-10-15 15:25:46 +02:00
f48a6f3a54 Bring make dev 2016-10-15 15:16:35 +02:00
38dc91be8e Improved side menu, reduced the font size on small screens, fixed a form to add links on small screens 2016-10-15 14:49:07 +02:00
76f2123def Merge pull request #2412 from wallabag/fix-postgres-migration
Fix PostgreSQL migrations
2016-10-15 14:42:46 +02:00
7131f94274 Merge pull request #2446 from wallabag/fix-taggingrules-doc
Added information about tagging rules in documentation
2016-10-15 11:47:12 +02:00
f878902e6a docs/de/user/configuration.rst: German fix for tagging rules docu 2016-10-14 23:48:50 +02:00
2752053f99 docs/de/user/configuration.rst: German fix for tagging rules docu 2016-10-14 23:47:37 +02:00
7b9b9ca7f8 Merge pull request #2447 from wallabag/fix-fr-de-doc-homepage
Fixed french and german doc homepages
2016-10-14 15:45:13 +02:00
68b8e75f94 Fixed french and german doc homepages 2016-10-14 14:55:45 +02:00
8edb250caa Added information about tagging rules in documentation
Fix #2060
2016-10-14 14:45:32 +02:00
311285f585 Merge pull request #2444 from Kaligule/master
Mention example instance in docs
2016-10-14 09:57:34 +02:00
7880838943 Merge pull request #1 from Kaligule/Documentation
Mention example instance
2016-10-14 09:15:14 +02:00
eb7d1b4b30 Mention example instance
Namely http://v2.wallabag.org/api/doc, so api methods can be looked up without installing wallabag first.
2016-10-14 09:09:28 +02:00
bf8e088033 Merge pull request #2435 from wallabag/french-upgrade-doc
Added french documentation for upgrade
2016-10-13 16:56:37 +02:00
83634bab22 Added missing space 2016-10-13 16:56:03 +02:00
8b28151e14 Merge pull request #2434 from wallabag/parameters-doc
Added french documentation for parameters.yml
2016-10-13 16:53:13 +02:00
e65c27587b Merge pull request #2439 from zertrin/minor-fix-docs-1
Minor fixes in the english documentation
2016-10-13 16:52:25 +02:00
a25377cb4c Minor fixes in the english documentation 2016-10-13 11:07:24 +02:00
17064d3c54 update German user/upgrade-2.1.x-2.1.y.rst 2016-10-12 20:45:28 +02:00
f68e351018 update German user/upgrade-2.0.x-2.1.1 2016-10-12 20:41:15 +02:00
75a1506c27 translate to German: user/parameters 2016-10-12 20:33:55 +02:00
6147736868 Merge pull request #2438 from wallabag/mruminski-patch-1
Update messages.pl.yml
2016-10-12 20:01:13 +02:00
fa100dd1e0 Update messages.pl.yml
translate delete section to polish
2016-10-12 19:32:30 +02:00
b1b561da51 Merge pull request #2372 from pmartin/api-get-entry-as-epub
API: ability to export entry in all available format (epub, pdf, etc...)
2016-10-12 14:06:33 +02:00
b09cafbb3f Added french documentation for upgrade 2016-10-12 13:37:50 +02:00
18470d7c6a Added french documentation for parameters.yml 2016-10-12 13:19:45 +02:00
da8ecdfa17 Merge pull request #2432 from wallabag/issue-site-config
Update ISSUE_TEMPLATE.md
2016-10-12 12:04:08 +02:00
7ffa48a11c Update ISSUE_TEMPLATE.md 2016-10-12 11:22:11 +02:00
e4cf672ccf Merge remote-tracking branch 'origin/master' into 2.2 2016-10-11 21:01:30 +02:00
dbe94e73a9 Merge pull request #2429 from wallabag/lock-fos-user
Lock deps for FOSUser
2016-10-11 19:32:22 +02:00
a0a4ce3135 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.
2016-10-11 18:59:08 +02:00
e57df5611f Merge pull request #2409 from wallabag/Quent-in-patch-1
Occitan version update
2016-10-11 18:18:29 +02:00
9bed0ea236 Merge pull request #2422 from wallabag/typo-doc
Fixed display for note in installation page
2016-10-11 15:03:46 +02:00
c8976118d4 Merge pull request #2426 from wallabag/fix-doc
Fix links on english documentation homepage
2016-10-11 15:00:59 +02:00
7e72b371ba Fix links on english documentation homepage 2016-10-11 14:59:32 +02:00
a9e4d6dad2 Update messages.oc.yml
I thought I had translated the Docker installation line, apparently not!
Thanks Nicolas for the other changes!
2016-10-10 20:01:25 +02:00
7dacf35845 Merge pull request #2420 from wallabag/redis-tests
Avoid error when Redis isn't here in tests
2016-10-10 19:02:05 +02:00
36ef9e2730 Fixed display for note in installation page 2016-10-10 18:51:20 +02:00
bccf7a70bc Merge pull request #2403 from wallabag/cleanup-install-process-in-doc
Cleaned up documentation for installation process
2016-10-10 16:58:15 +02:00
e40bed3607 Avoid error when Redis isn't here in tests 2016-10-10 16:34:57 +02:00
c99d90455b Merge pull request #2419 from wallabag/fix-twitter-cards
Fixed Twitter Cards by adding a description tag
2016-10-10 16:09:52 +02:00
a2f42d8eaa Fixed Twitter Cards by adding a description tag 2016-10-10 16:05:06 +02:00
fa4c39b37c Added steps about Redis/RabbitMQ activation 2016-10-10 15:38:49 +02:00
c15f083896 Fixed links on import page 2016-10-10 15:38:42 +02:00
0ff674a952 Merge pull request #2418 from wallabag/add-twitter-cards
Added support of Twitter Cards for public articles
2016-10-10 15:20:06 +02:00
020c723e28 Added support of Twitter Cards for public articles 2016-10-10 14:33:34 +02:00
035513b025 Use table for parameters.yml 2016-10-10 13:42:50 +02:00
3e761063e2 Merge pull request #2417 from wallabag/version-dev
Define a dev version for the master
2016-10-10 13:03:34 +02:00
ed11d7f731 Added page about parameters.yml 2016-10-10 13:01:14 +02:00
6b1317a627 Add -dev version
Following https://github.com/wallabag/wallabag/pull/2417
2016-10-10 11:39:42 +02:00
eb54d338e8 Typos in upgrade doc 2016-10-10 11:35:32 +02:00
fb8835cc8f 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.
2016-10-10 11:31:57 +02:00
7c1ce28342 Update upgrade documentation 2016-10-10 11:21:20 +02:00
7c1225347d Update documentation 2016-10-10 10:20:32 +02:00
c26d1285ba Fixed review 2016-10-10 10:05:50 +02:00
84e3c36e02 Added documentation about testsuite
Fix #2415
2016-10-10 09:15:53 +02:00
edc8bc0b2f Update RELEASE_PROCESS.md 2016-10-10 09:12:24 +02:00
3175e33012 Update README.md 2016-10-10 09:11:26 +02:00
2a5ff7f554 Merge pull request #2411 from wallabag/fix-entities
Fix entities definition
2016-10-10 08:02:25 +02:00
8eeefc658c Merge pull request #2414 from szafranek/bugfix-bookmarklet
Remove automatic closing of the window from bookmarklet
2016-10-10 07:11:01 +02:00
e93c9dc4ab Merge pull request #2413 from wallabag/sub-command-verbose
When a sub command fail, display error message
2016-10-10 07:09:45 +02:00
d8a9209cfc Remove automatic closing of the window from bookmarklet 2016-10-09 22:40:55 +02:00
39a19bdf47 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.
2016-10-09 22:39:43 +02:00
02edf0707f Changed the default command when we launch make 2016-10-09 22:01:24 +02:00
4e7863c6aa Created scripts folder to store update/install/release process 2016-10-09 21:50:15 +02:00
4c79c51f99 Fix PostgreSQL migrations 2016-10-09 21:35:04 +02:00
47508f004f Merge pull request #2410 from wallabag/tag-optim
Optimize tag list display
2016-10-09 21:27:47 +02:00
418626e836 Merge pull request #2177 from wallabag/delete-account
Delete user
2016-10-09 21:21:03 +02:00
26490a8794 Update Makefile 2016-10-09 21:15:57 +02:00
46aeaab8ff Update Makefile 2016-10-09 21:06:26 +02:00
8dc4cd0f25 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.
2016-10-09 20:51:37 +02:00
d8507addbb First draft for Makefile 2016-10-09 20:21:02 +02:00
e084778030 CS 2016-10-09 19:35:27 +02:00
28bb48905a 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
2016-10-09 18:55:22 +02:00
b4fcd60e7f 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.
2016-10-09 18:55:21 +02:00
4d318f3755 Add more log to tag:all 2016-10-09 18:55:21 +02:00
dd248e4561 Occitan version update
If you need to write dates in full letter you might be interessed in https://github.com/fightbulc/moment.php
It comes with lots of languages ;)
Q: where are the "previous" and "next" bouton text? Can't find them to translate them.
2016-10-09 18:24:42 +02:00
e39aec3e38 Merge pull request #2406 from szafranek/bugfix-number-of-annotations
Show number of annotations instead of nbAnnotations placeholder
2016-10-09 14:11:20 +02:00
d451bcb3d0 Merge pull request #2405 from szafranek/cleanup-fix-invalid-html
Fix few invalid HTML tags
2016-10-09 07:46:09 +02:00
90c766b96b 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.
2016-10-09 04:59:04 +02:00
c5e4293efd Fix few invalid HTML tags 2016-10-09 03:37:21 +02:00
9810f30821 Remove unnecessary user serialization 2016-10-08 21:16:40 +02:00
7ac3e575f1 CS 2016-10-08 20:35:16 +02:00
a730cae384 Bonus: display driver in install command 2016-10-08 20:33:21 +02:00
5112b3556b update German installation.rst 2016-10-08 20:28:18 +02:00
3f60446756 Fix PostgreSQL query
PostgreSQL doesn’t like when we compare interger and boolean :)
2016-10-08 20:26:06 +02:00
5334381509 update German installation.rst 2016-10-08 20:25:48 +02:00
876d77a67d Better display and description
Confirmation message isn’t required since it is written in the delete description
2016-10-08 20:25:42 +02:00
eed812afd0 Logout user before deleting it
And add a smal description
2016-10-08 19:39:12 +02:00
7c256ffabe Chmoded install.sh 2016-10-08 15:14:45 +02:00
7eff4736a1 Cleaned up documentation for installation process 2016-10-08 15:10:56 +02:00
32d103f702 Merge pull request #2402 from wallabag/remove-1x-changelog
Removed 1.x stuff in CHANGELOG
2016-10-08 14:07:35 +02:00
c3396c65ef Fix some tests 2016-10-08 14:07:13 +02:00
951ad27fe4 Removed 1.x stuff in CHANGELOG 2016-10-08 14:05:07 +02:00
93a95c09bf Merge pull request #2351 from wallabag/fix-api-client-deletion
Changed relation between API client and refresh token
2016-10-08 13:31:54 +02:00
4ad6f5878a Merge pull request #2393 from wallabag/api-urls-exist
Ability to check multiple urls in API
2016-10-08 13:31:31 +02:00
e07c25a1ad Merge pull request #2397 from wallabag/api-orphan-tags
Ensure orphan tag are remove in API
2016-10-08 13:31:08 +02:00
b840268711 Added a test to check if entries are also deleted 2016-10-08 13:27:18 +02:00
71254701b7 Changed tests 2016-10-08 13:27:18 +02:00
821bb87685 Added tests 2016-10-08 13:27:18 +02:00
bb0c78f4a6 Added check if there is only one user
Added translations and documentation
2016-10-08 13:27:18 +02:00
abb5291cd5 CS 2016-10-08 13:27:17 +02:00
e4b46f77ef work 2016-10-08 13:27:17 +02:00
3f3a60879e Add entry export in API
Export isn't available for json & xml because user can use the default
entry endpoint instead.
2016-10-08 12:59:19 +02:00
24de866534 API: getEntry can return EPUB 2016-10-08 12:05:41 +02:00
3d4b0b3064 Routing: epub format is allowed for API 2016-10-08 12:05:40 +02:00
d9b0673dbb Merge pull request #2399 from wallabag/use-locale-for-config
Use default locale for user config
2016-10-08 10:34:08 +02:00
af4ce9e069 Merge pull request #2400 from wallabag/doc-env-prod
Set env to prod in documentation
2016-10-08 10:33:52 +02:00
ba69216853 Set env to prod in documentation 2016-10-08 09:39:07 +02:00
dd32c89ed6 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
2016-10-08 09:33:55 +02:00
ee32248f43 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)
2016-10-08 00:05:41 +02:00
ac8cf632bb 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!)
2016-10-07 23:31:53 +02:00
3049afe190 Merge pull request #2396 from wallabag/mruminski-patch-1
Update messages.pl.yml
2016-10-07 22:20:51 +02:00
f271dd4b76 Merge pull request #2395 from wallabag/socket-connection
Add ability to use socket
2016-10-07 22:20:37 +02:00
aa8a58b5a0 Update messages.pl.yml
translated shared_by_wallabag to polish
2016-10-07 21:32:27 +02:00
6d204f5382 Add ability to use socket
For Redis & MySQL
2016-10-07 21:00:13 +02:00
f0abc22d09 Ability to check multiple urls in API 2016-10-07 20:37:01 +02:00
233a1081ea Merge pull request #2386 from wallabag/update-changelog
Changed Changelog by using github-changelog-generator from @skywinder
2016-10-07 17:35:57 +02:00
20bf78b935 Merge pull request #2389 from wallabag/add-info-publich-articles
Added default picture if preview picture is null
2016-10-07 16:35:32 +02:00
499ba4cb2f Merge pull request #2388 from wallabag/fix-2factor-user-admin
Fixed two-factor checkbox display in user admin panel
2016-10-07 16:35:01 +02:00
aa88d2494b Merge pull request #2385 from wallabag/add-doc-about-siteconfig
Added documentation about siteconfig fix
2016-10-07 16:02:03 +02:00
3b1bf6343d Update release process 2016-10-07 15:30:25 +02:00
4e5d219663 Fixed review 2016-10-07 15:27:05 +02:00
d5c45d5288 Added default picture if preview picture is null 2016-10-07 15:21:31 +02:00
fba816c43b Added link to fivefilters website 2016-10-07 15:14:15 +02:00
5e7786f3c4 Fixed two-factor checkbox display in user admin panel
Fix #2380
2016-10-07 14:56:26 +02:00
9cfea18a5d Fixed review 2016-10-07 14:40:32 +02:00
e17373b659 Changed Changelog by using github-changelog-generator from @skywinder 2016-10-07 14:34:44 +02:00
c8d2dcdafe Merge pull request #2383 from wallabag/add-info-publich-articles
Added OpenGraph support for public articles
2016-10-07 14:30:46 +02:00
baf0ffa7df Added documentation about siteconfig fix
Found in #2358, thank you @j0k3r
2016-10-07 14:17:13 +02:00
21d82c3c5d Added test for OpenGraph 2016-10-07 14:06:12 +02:00
bf71a734f6 Merge pull request #2332 from wallabag/tags-export
Fix relations export for Entry
2016-10-07 13:55:55 +02:00
d0d196ffb3 Fixed review 2016-10-07 09:22:40 +02:00
f0d52417fb Added OpenGraph support for public articles
Fix #2289
2016-10-07 09:05:18 +02:00
74e1f7433a Fix tag test 2016-10-07 07:43:48 +02:00
6c8806cadc Fix bad translation key
`entry_reload_failed` instead of `entry_reloaded_failed`
2016-10-07 07:43:48 +02:00
b0458874c8 Fix relations export for Entry
Tags & Annotations weren’t really well exported.
This is now fixed (+ tests)
2016-10-07 07:43:19 +02:00
9d127b3b93 Merge pull request #2377 from wallabag/fix-exists-api
Fix exists API call
2016-10-05 19:52:06 +02:00
0b174d69d7 Fix typo & add test 2016-10-05 19:30:56 +02:00
046f33e21b Merge pull request #2374 from wallabag/clickable-tags
Clickable tags
2016-10-05 16:16:21 +02:00
145d69fe5d Merge pull request #2375 from wallabag/upgrade-nodejs
try to reduce assets build npm connection failing by updating nodejs
2016-10-05 15:38:19 +02:00
5d39243068 Fix exists API call
Boo
2016-10-05 15:28:36 +02:00
3c00779dc3 try to reduce assets build npm connection failing by updating nodejs 2016-10-05 15:05:42 +02:00
15f1352ef8 better tags on material 2016-10-05 14:06:55 +02:00
2fb9caeb2d Merge pull request #2363 from wallabag/clean-composer
Remove mouf/nodejs-installer from composer
2016-10-04 22:22:19 +02:00
1b1cb553be Remove mouf/nodejs-installer from composer 2016-10-04 21:44:58 +02:00
645c0d5bce better tags on baggy 2016-10-04 20:11:10 +02:00
837247dea4 Update md5 hash for package 2016-10-04 17:43:28 +02:00
c36f5adce2 Merge pull request #2349 from wallabag/prepare-211
Prepare wallabag 2.1.1
2016-10-04 17:13:57 +02:00
933c6f3155 Update CHANGELOG.md 2016-10-04 17:13:16 +02:00
8ebb214ec4 Typo 2016-10-04 17:12:45 +02:00
954b6a36a3 Update CHANGELOG 2016-10-04 17:11:26 +02:00
5958597ba6 Prepare wallabag 2.1.1 2016-10-04 17:08:34 +02:00
57386125ab Merge pull request #2353 from wallabag/assets-fix
Basically, fix everything
2016-10-04 16:26:50 +02:00
c10adc1f76 typo and build on test 2016-10-04 15:59:56 +02:00
6cb364a2c1 use airbnb base rules and update eslint 2016-10-04 15:30:05 +02:00
f733d8aaa3 Fix icon position 2016-10-04 15:12:48 +02:00
3e85e91159 Fixed calendar icon position with baggy theme 2016-10-04 15:00:47 +02:00
0c7f1ba796 Fixed icon position in share menu 2016-10-04 14:58:06 +02:00
46d78f87d9 fix icons 2016-10-04 14:48:22 +02:00
f2ab290f0f Merge pull request #2359 from wallabag/user-config
Create config even if user is disabled
2016-10-04 13:35:13 +02:00
9f7d154e34 Add eslint & stylelint tests (fix a few things) and move dependencies to dev 2016-10-04 12:14:28 +02:00
9a6ac0b47a 👋 HHVM 2016-10-04 11:20:58 +02:00
755ff9e835 Create config even if user is disabled
When a user register itself AND the wallabag instance is configured to send a confirmation email, the user is disabled when the listener (which create the config) receive the event.
There were a check (don't know why) if the user is enabled we create the config. But the user is disabled when confirmation email is actived.
2016-10-04 10:42:46 +02:00
f440e28281 Update doc
Merge VALIDATE_TRANSLATION_FILE & ASSET build (less build on Travis)
2016-10-04 10:31:03 +02:00
ca8f9bdc15 Fix font & Travis
Grunt now copy fonts instead of symlink (node_modules won't exist for the end user)
2016-10-04 10:10:40 +02:00
f0b2d57154 Merge pull request #2354 from Zayon/master
Add php-bcmath extension to requirements
2016-10-04 08:41:17 +02:00
9f3a1cd20c shaarli instead of Diaspora 2016-10-04 07:26:18 +02:00
10f51f429d Update .travis.yml 2016-10-04 07:25:05 +02:00
96a99d4375 Fix grunt path 2016-10-04 01:00:14 +02:00
f7265b4b9d Add php-bcmath extension to requirements
Fix issue #2342
2016-10-03 23:29:21 +02:00
5759c9aac1 remove install scripts and tweak travis 2016-10-03 23:21:02 +02:00
a494c33ef7 Basically, fix everything
* Remove install.sh
* Assets are now provided
* Icons font issues are fixed
2016-10-03 23:08:26 +02:00
b0da721a52 Changed relation between API client and refresh token
Fix #2350
2016-10-03 21:39:01 +02:00
a3cc0dd0bf Add missing env in install.sh
Fix https://github.com/wallabag/wallabag/issues/2345
2016-10-03 18:13:40 +02:00
aafb3321b7 Merge pull request #2341 from mruminski/master
Update messages.pl.yml
2016-10-03 16:44:19 +02:00
b054bc27e6 Merge pull request #2340 from wallabag/improve-ger-transl
small improvement for german translation
2016-10-03 16:23:16 +02:00
1c634fe437 improve German translation 2016-10-03 15:52:27 +02:00
24add95e9e Merge pull request #2338 from wallabag/install-2.1
Fix for 2.1 installation
2016-10-03 15:33:08 +02:00
0113e2af1f Update messages.pl.yml
add missing and update existing translation
2016-10-03 15:05:21 +02:00
88d8125a5f Ensure cache is clear before upgrading
If we changed some namespace / classes, we need to refresh the cache before anything else.
2016-10-03 14:44:16 +02:00
4ac780eb21 Use install_dev.sh for Travis
Add `--no-dev` to `composer install` for prod env
2016-10-03 14:35:42 +02:00
8fdb5e5766 Re-add wallabag:install 2016-10-03 14:21:49 +02:00
9d3603147b Update md5 hash for wallabag 2.1.0 2016-10-03 11:16:35 +02:00
8c3c69fb9c Merge pull request #2334 from wallabag/prepare-21
Prepare wallabag 2.1.0 🚀
2016-10-03 10:42:14 +02:00
83c26bdf26 Merge pull request #2335 from wallabag/fix-quickstart-css
Fixed CSS for quickstart links
2016-10-03 10:29:41 +02:00
0f70abd695 Fixed CSS for quickstart links 2016-10-03 10:27:01 +02:00
7d002c333d Merge pull request #2333 from wallabag/translation-german-for-2.1
for 2.1, translate all strings to German, which haven't been translated yet
2016-10-03 09:25:51 +02:00
12f7fd004a Prepare wallabag 2.1.0 🚀 2016-10-03 09:16:57 +02:00
ab809de184 Merge pull request #2314 from wallabag/assets
Assets work
2016-10-03 09:09:45 +02:00
c30af946e7 Update messages.de.yml 2016-10-03 09:08:42 +02:00
553f863c3c Fixed typos 2016-10-03 09:05:40 +02:00
beee26f6d5 Better translation for the weird sentence 2016-10-02 22:50:27 +02:00
a878581410 Improve the german translation a bit
Just some little mistakes, good work so far :)
2016-10-02 22:32:23 +02:00
df9c080f8c translate all strings to German, which haven't been translated yet 2016-10-02 21:41:21 +02:00
dfbbf0e18a Merge pull request #2331 from wallabag/api-links
Fix parameters in API _links
2016-10-02 17:48:16 +02:00
77557d289b Merge remote-tracking branch 'origin/master' into 2.1 2016-10-02 17:37:41 +02:00
c3f8b428dd Fix parameters in API _links
We forgot to pass them to the factory
2016-10-02 15:41:08 +02:00
1dc3bee6b9 Merge pull request #2327 from wallabag/user-management
Add users management UI
2016-10-02 15:00:02 +02:00
c21f2924f3 Merge pull request #2330 from pmichelazzo/master
Remove error message when creating ePub versions
2016-10-02 14:56:18 +02:00
ccc7faec09 Disabled delete button for the logged user
To avoid some bad things to happen…
2016-10-02 13:29:57 +02:00
18b8dc0e99 Merge pull request #2325 from wallabag/api-entries-exists
Add an exists endpoint in API
2016-10-02 13:17:23 +02:00
ffcd91ec6c Remove error message when creating ePub versions
Trying to create a ePub version, the first page shows a message of a
“missing >”. This change solve this problem (and, for sure, in any
download version that’s use HTML).
2016-10-02 13:16:12 +02:00
92395680b6 Merge pull request #2328 from wallabag/avoid-duplicate-url
Avoid duplicate url with accents
2016-10-02 13:14:16 +02:00
eb4142e0af Remove NewUser test from Config 2016-10-02 11:09:28 +02:00
03141f9b95 Cleanup & add link on baggy menu 2016-10-02 11:08:53 +02:00
152fcccd44 Add users management UI
- remove the “add a user” from the config page
- add a CRUD on user
- fix some missing translations (+ bad indentation)
2016-10-02 11:08:53 +02:00
52c1fc7449 Merge pull request #2326 from wallabag/update-quickstart
Changed quickstart layout
2016-10-02 11:06:03 +02:00
6e5e27ab07 Merge pull request #2324 from wallabag/edit-tagging-rule
Add ability to edit a tagging rule
2016-10-02 11:05:10 +02:00
bfb3ae01da Merge pull request #2323 from wallabag/footer-stats
Add simple stats in footer
2016-10-02 11:04:49 +02:00
ae394b4078 Merge pull request #2329 from wallabag/Quent-in-patch-1
Occitan version update
2016-10-02 11:04:10 +02:00
a4df48916d Fix OC typos
+ remove extra sentence
2016-10-02 09:57:48 +02:00
24ad330be6 Update test 2016-10-02 01:47:10 +02:00
3583cadf6f CS 2016-10-02 01:43:50 +02:00
d6d3fb6e4c Remove additional entry
After the test is done, cleanup what we’ve done
2016-10-02 01:42:21 +02:00
1bcfeb0f4a Occitan version update
to be ready for the future of Wallabag :)
2016-10-01 18:23:37 +02:00
0d61b6015f Fixed french translation 2016-10-01 18:15:59 +02:00
2455472e26 CS 2016-10-01 18:05:25 +02:00
19ca0b2f35 Avoid duplicate url with accents 2016-10-01 18:00:11 +02:00
7d72cce4c7 Changed translations 2016-10-01 17:29:04 +02:00
55551e332c Add test when url doesn’t exist 2016-10-01 17:26:36 +02:00
8799bde00d Introduce validateRuleAction 2016-10-01 17:24:24 +02:00
6273fefd5d Add an exists endpoint in API
It should allow third party to check if an url was already saved by a user
2016-10-01 17:15:28 +02:00
a44d2613c7 Changed quickstart layout 2016-10-01 17:13:53 +02:00
bf3dc999e7 Add ability to edit a tagging rule 2016-10-01 16:52:05 +02:00
c4bf7af96f Merge pull request #2322 from wallabag/v2-404
Customize errors templates
2016-10-01 16:35:48 +02:00
1264029cd4 Add simple stats in footer 2016-10-01 16:03:50 +02:00
db5541e7a1 Merge pull request #2320 from wallabag/user-config
Create user config in one place.
2016-10-01 15:51:37 +02:00
40e219622a Customize errors templates
All error goes to the same template which only display the error message and the status code.
2016-10-01 14:58:48 +02:00
fb7354c4a4 Fix bad template name
When a user register, the template displayed saying it should now check its email was misspelled.
Resulting in displaying the default one (with margin issue).
2016-09-30 21:02:44 +02:00
ca17abce2d Create user config in one place
Using a listener, user config is now created when a user:

- is created from the command line
- register (with or without email confirmation)
- is created from the config panel
2016-09-30 21:01:36 +02:00
114c55c0a6 Merge remote-tracking branch 'origin/master' into 2.1 2016-09-30 13:27:19 +02:00
00d3f2a383 Merge pull request #2319 from pmartin/docker-php-gd-extension
Docker : install PHP 'gd' extension
2016-09-30 13:25:23 +02:00
ecdefb11f7 Add PHP 'gd' extension to docker
The gd extension is required to export entries as EPUB.
2016-09-30 12:29:37 +02:00
56f0150e2a Fix doc: 'bin/console' instead of 'app/console' 2016-09-30 12:29:22 +02:00
555ed552ca Merge pull request #2318 from wallabag/refactor-templates
Removed duplicated templates files
2016-09-30 10:21:33 +02:00
2ff9991a1d Removed duplicated templates files 2016-09-30 09:38:08 +02:00
49f25d6ee8 remove bower dependency from npm 2016-09-29 13:17:19 +02:00
fb479be3a0 Merge pull request #2315 from wallabag/fixes-about-upgrade
Fixes about upgrade
2016-09-29 11:35:47 +02:00
2d8af6fc7f Added french documentation about Redis and RabbitMQ 2016-09-29 11:01:15 +02:00
c59e628afe Added links to async config in german doc 2016-09-29 10:43:53 +02:00
00283a3b0a add German redis.rst 2016-09-29 10:41:07 +02:00
080cb52fac add German rabbitmq.rst 2016-09-29 10:36:19 +02:00
b4118f66ff remove bower 2016-09-29 09:20:37 +02:00
0471e905b8 fonts & ligatures 2016-09-29 09:18:46 +02:00
37b63c170d Merge pull request #2316 from mruminski/2.1
Update messages.pl.yml
2016-09-29 07:20:23 +02:00
02384d22ef Update messages.pl.yml
add missing translation for Instapaper importer
2016-09-29 01:04:06 +02:00
8f234d0156 remove autocomplete and bring fonts through npm 2016-09-28 18:59:15 +02:00
ff5be9720b Added links to async config in french doc 2016-09-28 16:37:36 +02:00
cb0096df41 Added links to async config in english doc 2016-09-28 16:37:02 +02:00
fc487c4eb1 Remove .idea stuff 2016-09-28 15:42:09 +02:00
34e4c12604 Little improvements to the german translation 2016-09-28 13:52:06 +02:00
ff1f55c2a0 update German upgrade-2.0.x-2.1.y.rst 2016-09-28 12:26:29 +02:00
9866d39431 Fixed review 2016-09-28 11:59:35 +02:00
eef8aeec8f Reordered upgrade documentation 2016-09-28 11:13:20 +02:00
c146f6940a Assets work
* ES6 all the things !

* ESLint checks everything

* CSS fixes (use stylelint)

* Fix #2231
2016-09-28 10:30:18 +02:00
084fb0d303 Some fixes about upgrade from 2.0.x -> 2.1.0 2016-09-28 10:04:36 +02:00
92fa168344 Merge pull request #2313 from wallabag/fix-long-loading
Remove CSS class who caused long loading on Firefox
2016-09-27 21:58:06 +02:00
1ed965beb9 Remove CSS class who caused long loading on Firefox
Fix #2302 #2281
2016-09-27 20:52:30 +02:00
a9e92b6609 Add Instapaper translations 2016-09-27 20:27:08 +02:00
a7dda1f2bf Add Instapaper docs 2016-09-27 20:27:08 +02:00
c7ea9b41f3 Add controller test for Instapaper 2016-09-27 20:27:08 +02:00
ff1a5362f7 Add Instapaper import
Also update ImportController with latest import (chrome, firefox & instapaper).
2016-09-27 20:27:08 +02:00
55345331c4 Merge pull request #2309 from mruminski/2.1
Update messages.pl.yml
2016-09-27 08:00:58 +02:00
20762cd1ab Update messages.pl.yml
add missing translation for Firefox and Chrome imports
2016-09-27 00:58:44 +02:00
d6de23a100 Merge pull request #2192 from wallabag/import-browser-bookmarks
Import Firefox & Chrome bookmarks into wallabag
2016-09-26 14:47:02 +02:00
fefef9d41b Added tags for Firefox import 2016-09-26 13:40:10 +02:00
990adfb34c Move prepareEntry to dedicated place
Yeah first try was ugly, now each part are in the dedicated place.
Also, the date is hardly truncated to 10 chars because Firefox date are 16 chars long and Chrome are 17 chars long. So instead of divised them by a huge number, I prefer to truncate them.
2016-09-26 07:30:02 +02:00
12d93e6896 Update Firefox file
With real data, the previous looks more than a Chrome converted file.
Also, fix date conversion (hope so).
2016-09-25 22:24:07 +02:00
7e98ad9626 Merge pull request #2308 from wallabag/tags-duplicate
Fix duplicate tags on import
2016-09-25 16:11:06 +02:00
27acc6ddb8 Fix bad date format in Browser import 2016-09-25 15:32:02 +02:00
f0fd82d039 Fix bad parameter for tests 2016-09-25 14:21:12 +02:00
bd206a84d8 Fixed tests by removing clear() 2016-09-25 12:29:19 +02:00
64b1229b2d fix tests 2016-09-25 12:29:19 +02:00
2c61db30b7 cs & fixes 2016-09-25 12:29:19 +02:00
59201088b4 bring chrome and firefox as separate imports 2016-09-25 12:29:18 +02:00
f7c55b3812 Added tests for Chrome bookmarks import 2016-09-25 12:29:18 +02:00
06d13ddfbc Indentation and renamed fixtures file 2016-09-25 12:28:55 +02:00
efe659ab84 Add Chrome path for Mac OS 2016-09-25 12:28:55 +02:00
ae669126e7 Import Firefox & Chrome bookmarks into wallabag 2016-09-25 12:28:54 +02:00
289875836a Fix tag count for PostgreSQL 2016-09-25 12:23:44 +02:00
82fc3290d4 CS 2016-09-25 12:03:49 +02:00
401135852c Use scheduled entity insertions to avoid tag duplicate
Using `getScheduledEntityInsertions()` we can retrieve not yet flushed but already persisted entities and then avoid tags duplication on import.
2016-09-25 12:03:49 +02:00
faa86e06ba Fix tags count in menu
Move enable cache for Tag in the Entity because function `find*` should return result and not a Query
2016-09-25 12:03:49 +02:00
9d7dd6b0d2 Merge pull request #2306 from wallabag/redis-rabbit-check
Some checks about Redis & RabbitMQ
2016-09-25 11:36:59 +02:00
0e0102b6fc Avoid failing test for user who didn’t install Redis 2016-09-24 19:57:59 +02:00
13a522dfbd Display a message when async import won’t work
Mostly if Redis or RabbitMQ isn’t installed / launched.
I guess it’ll avoid some issues.
2016-09-24 19:56:15 +02:00
e10f3b1e91 Disable deprecation that fail test 2016-09-24 19:55:23 +02:00
637aa17e6b Merge pull request #2301 from wallabag/fix-rss-feeds
fix feeds not syncing on android app
2016-09-22 07:51:05 +02:00
389d55f86b fix feeds not syncing on android app 2016-09-21 19:51:19 +02:00
32e95760f5 Merge pull request #2239 from wallabag/documentation-2.1
Update documentation with new features for 2.1
2016-09-20 14:29:16 +02:00
5074e7d4fa Merge pull request #2299 from mruminski/2.1
polish version
2016-09-20 08:33:27 +02:00
b6fc1f2007 Update CraueConfigBundle.pl.yml
fix misspell
2016-09-19 23:16:37 +02:00
1223c0811d Update CraueConfigBundle.pl.yml
add missing translation
2016-09-19 23:02:50 +02:00
a94108f574 Update messages.pl.yml
add missing translation
2016-09-19 22:53:02 +02:00
267b9d62dc Update wallabag_user.pl.yml
add missing "
2016-09-19 22:37:03 +02:00
a00bed8b59 polish version
create wallabag_user.pl.yml file
2016-09-19 20:42:55 +02:00
e406a94ab6 Fixed version in documentation 2016-09-19 15:23:04 +02:00
ce0a32229a Fix wallabag version in documentation 2016-09-19 15:22:05 +02:00
8fed8d1bac Add documentation about article sharing 2016-09-19 15:20:46 +02:00
05d2d62f12 Update generated files from Symfony 2016-09-19 11:35:35 +02:00
d7b4b2c72c Merge remote-tracking branch 'origin/master' into 2.1 2016-09-19 11:23:07 +02:00
f9feca5c64 Merge pull request #2297 from morhelluin/epub-export-special-chars
Fix issue #2296: epub export with special chars in the title.
2016-09-19 11:18:17 +02:00
da18a4682f Merge pull request #1941 from wallabag/v2-asynchronous-jobs
Use asynchronous jobs for imports
2016-09-19 07:15:40 +02:00
45d94a98f7 Fix issue #2296: epub export with + in the title. 2016-09-18 14:43:54 +02:00
59b97fae99 Avoid losing entry when fetching fail
Instead of just say “Failed to save entry” we’ll save the entry at all cost and try to fetch content. If fetching content failed, the entry will still be saved at least, but without content.
2016-09-17 07:40:56 +02:00
fbb319f064 Missing some migrations
and CS
2016-09-16 22:58:33 +02:00
ebe0787e09 Moved Pocket token to user config 2016-09-16 22:22:25 +02:00
4fc998245c Only display message in queue for admin
Instead of for EVERYONE
2016-09-16 20:08:07 +02:00
0ed8ce55b5 Merge pull request #2292 from wallabag/fix-markasread-label
Fixed label for mark as read link in entry view
2016-09-16 08:50:07 +02:00
458beef0a9 Fixed label for mark as read link in entry view
Fix #2286
2016-09-15 15:32:01 +02:00
760419cd43 Merge pull request #2291 from wallabag/add-links-doc-homepage
Add links to translations in documentation homepage
2016-09-15 15:20:37 +02:00
78d5da87fa Add links to translations in documentation homepage 2016-09-15 14:58:14 +02:00
c6b68dc1df Merge pull request #2287 from wallabag/remove-footer
Remove footer part
2016-09-15 14:21:21 +02:00
e77cde4531 Remove FooterController 2016-09-15 11:11:24 +02:00
5b382b9ffb Merge pull request #2290 from wallabag/Quent-in-patch-1
Update messages.oc.yml
2016-09-15 09:27:08 +02:00
15b1917142 Update messages.oc.yml
L44 : vosautres, general form
vosaltres : local and catalan form
vosaultres : doesnt exist ^^
2016-09-14 17:54:09 +02:00
ac87e0db2a AMPQ -> AMQP 2016-09-14 10:18:02 +02:00
a622fbc444 Fix typo 2016-09-14 09:10:13 +02:00
d4e366f6eb Add missing translations 2016-09-13 22:38:05 +02:00
47d7c682a4 Add more “real” tests 2016-09-13 22:27:27 +02:00
c80cc01afa Change flash message for queued articles 2016-09-13 21:09:05 +02:00
e01a3c98d6 Display how many messages are queue
- update the docker-composer to add Redis
- add migrations
2016-09-13 20:32:52 +02:00
d49c88f15a Remove footer part 2016-09-13 20:31:06 +02:00
5d002e9bdf Update import.worker.enabled translation 2016-09-12 09:07:53 +02:00
886d479734 Fix tests 2016-09-11 23:57:27 +02:00
ebf5e5087d Add tests on ImportCommand 2016-09-11 22:15:31 +02:00
03e078d060 Update docs about worker 2016-09-11 22:15:31 +02:00
015c7a8359 Add more tests
And ability to define how many messages can be hanle by the redis worker before stopping (usefull for tests)
2016-09-11 22:15:31 +02:00
7d862f83b9 Re-facto EntryConsumer
Using an abstract method allow to share code but also can be used it we add a new broker in the future
2016-09-11 22:15:31 +02:00
dc69e25f97 Display a message when async is enabled 2016-09-11 22:15:28 +02:00
7230e4c39f Enable Redis on Travis
Add generated files from `composer up`
Add more articles for Readability tests
2016-09-11 21:58:57 +02:00
b3437d58ae Enable Redis async import
- using javibravo/simpleue
- internal config value are now `import_with_redis` & `import_with_rabbit` which are more clear
- if both option are enable rabbit will be choosen
- services imports related to async are now splitted into 2 files: `redis.yml` & `rabbit.yml`
-
2016-09-11 21:58:56 +02:00
7f7531171f Retrieve created date from Pocket 2016-09-11 21:58:56 +02:00
13470c3596 Add test for RabbitMQ
Also update Symfony deps
2016-09-11 21:58:56 +02:00
8664069e1a Fix DateTime & clear() 2016-09-11 21:58:55 +02:00
6d65c0a8b0 Add ability to define created_at for all import
At the moment only Readability & wallabag v2 import allow created_at import.
Pocket removed `time_added` field from their API v2 to v3...
And wallabag v1 doesn't export that value.
2016-09-11 21:58:55 +02:00
3aca0a9f00 CS 2016-09-11 21:58:55 +02:00
3849a9f323 Some cleanup & refactor 2016-09-11 21:58:55 +02:00
02f6489572 Retrieve all items from Pocket
5000 by 5000.
Also, retrieve newest item first.
2016-09-11 21:58:31 +02:00
c98db1b653 Convert other imports to Rabbit 2016-09-11 21:58:31 +02:00
ef75e1220e Send every imported item to the queue
Instead of queing real Entry to process, we queue all the item to import from Pocket in a raw format.
Then, the worker retrieve that information, find / create the entry and save it.
2016-09-11 21:57:46 +02:00
87c9995b6c Update docker-composer with RabbitMQ configuration 2016-09-11 21:57:09 +02:00
40d2a29443 Replace RabbitMQ injection with CraueConfiguration 2016-09-11 21:57:09 +02:00
e31ee20dd7 Add RabbitMQ service for Travis CI 2016-09-11 21:57:09 +02:00
56c778b415 1st draft for rabbitMQ 2016-09-11 21:57:09 +02:00
59758d8fe5 Merge pull request #2279 from wallabag/cleanup-travis
Check if asset is enable instead of opposite
2016-09-11 18:48:36 +02:00
88e88016b9 Clearing entities in the loop fail on Postgres
It looks like when you clear entities on Postgres some references are lost and tags are not saved :-/
2016-09-11 16:30:01 +02:00
58fadbc9df Fix error on EntityManager clear
Introduced in the recent 2.5.5 release.
Also updated deps.
2016-09-11 15:53:16 +02:00
04d5c60216 Update install.sh
Since $ASSETS can be empty now and only be “build”.
2016-09-11 12:52:42 +02:00
40c47f7023 Check if asset is enable instead of opposite
Instead of defining ASSETS all the time, just define it when we want to
use it
Might give us more clearer build
2016-09-09 21:30:14 +02:00
c078d18372 Merge pull request #2275 from wallabag/export-dates
Export dates from entries
2016-09-08 18:33:09 +02:00
9401696fe4 Export dates from entries 2016-09-08 16:49:21 +02:00
5fc79381bb Merge pull request #2274 from wallabag/json-response-created-at
Re-use JsonResponse
2016-09-08 12:28:46 +02:00
60faee002c Re-user JsonResponse
Since Symfony 3.1 we can define the json of a JsonResonse using `->setJson()`
2016-09-08 12:03:38 +02:00
a707643ef1 Update md5 checksum for 2.0.8 in documentation 2016-09-07 15:40:15 +02:00
48a692c143 Merge pull request #2271 from wallabag/prepare-208
Prepare wallabag 2.0.8
2016-09-07 14:53:29 +02:00
5bdec0195f Prepare wallabag 2.0.8 2016-09-07 14:27:32 +02:00
94d1dae4ef Update install documentation 2016-09-06 13:43:53 +02:00
6f23289e72 Merge pull request #2266 from wallabag/add-tags-counter
Added tags counter in sidebar (material theme)
2016-09-05 22:20:27 +02:00
e5b090960b Merge pull request #2267 from wallabag/Quent-in-patch-1
Occitan  updated
2016-09-05 19:49:23 +02:00
fee8f2312e Occitan updated
Line 347, I'm not sure about what I wrote to avoid and end of string started with "
I had to use the simple ' in the sentence.
Let me know if it was okay like so.
2016-09-05 18:55:53 +02:00
5173fd1c3d Returned 0 instead of returning empty array for Twig Extension 2016-09-05 14:17:44 +02:00
a1d22ea7d0 Remove useless variable 2016-09-05 10:23:40 +02:00
13d9f7c96c Switched enableCache visibility to private 2016-09-04 21:06:52 +02:00
429d86f388 Added tags counter in sidebar (material theme) 2016-09-04 20:53:28 +02:00
c3b53188d7 Merge pull request #2263 from wallabag/speed-up-count
Instead of selecting the whole data, just count it
2016-09-04 20:07:45 +02:00
234ad94453 CS 2016-09-03 19:26:23 +02:00
59ddb9ae99 Remove Twig globals
Twig Global function are called globally. This means even on a query to the api.

Using a function we can decide when we want to call it.

Also, remove previous `COUNT(e.id)` since it doesn't work on PostgreSQL ...
2016-09-03 19:09:28 +02:00
543da3e0b7 Instead of selecting the whole data, just count it
Instead of performing a complex select (to retrieve all data for entry, etc...) just select the counter and retrieve it.

Down from ~50ms to ~30ms on the unread page (with 500 items)
2016-09-03 18:11:07 +02:00
8f8654913c Merge pull request #2002 from wallabag/feature-display-itemsNumber
Feature display items number
2016-09-03 16:13:08 +02:00
b3f4a11a81 Store cache lifetime in config 2016-09-03 14:02:50 +02:00
2b9c5097d4 Merge pull request #2262 from wallabag/install-check-db-connection
Add a check for the database connection
2016-09-03 13:34:13 +02:00
5070644a12 CS 2016-09-03 11:45:59 +02:00
f62c3faf88 Update test
If the database isn't found when checking for the connection it means, we can connect to the server.
The InstallCommand will create the database later.

Also, when checking for the SQLite connection, Doctrine creates the file (so the database). That's why the test is skipped for SQLite.
2016-09-03 10:34:27 +02:00
001a7bad66 Add a check for the database connection
Checking for the driver isn't enough.
We are now checking if we can etablish a connection to the database before trying to do anything.
By displaying the error from the Exception (in case of error) we hope to reduce issues overload about people getting error with the database
2016-09-03 09:24:34 +02:00
9972ab467a Merge pull request #2260 from wallabag/fix-config-fontsize
Fixed different font-size for labels in config screen
2016-09-02 11:17:47 +02:00
b1e0a586e8 Fixed different font-size for labels in config screen
Fix #1788
2016-09-02 10:53:22 +02:00
336262e6ee Merge pull request #2252 from wallabag/fix-last-merge
Fixed last merge who caused CSS/JS bugs
2016-09-02 10:27:41 +02:00
a8d5aa1c44 Add tinydot to material concat 2016-09-02 10:21:10 +02:00
33adf8dc91 Merge pull request #2242 from wallabag/fix-minor-css
Fix print / article views
2016-09-01 22:23:45 +02:00
8bde9d0efe Merge pull request #2258 from mruminski/2.1
Update messages.pl.yml
2016-09-01 20:26:23 +02:00
0b0233b1ec Enable cache for queries 2016-09-01 20:20:12 +02:00
3a6c252104 Update messages.pl.yml
add missing polish translations
2016-09-01 19:42:26 +02:00
be20e6f009 CSS indentation 2016-09-01 19:18:39 +02:00
bd8c13e8b0 Merge pull request #2255 from wallabag/readability
Add Readability import
2016-09-01 14:18:48 +02:00
dc9d76b490 Added documentation for Readability migration 2016-09-01 13:40:00 +02:00
209ec7cedd Add Readability to Quickstart page 2016-09-01 13:39:55 +02:00
a1a1077059 Add tests on ReadabilityImport 2016-09-01 13:39:41 +02:00
ca2a43ae7d Add missing translations 2016-09-01 13:39:37 +02:00
ca15aaac18 Fix import count tests 2016-09-01 09:36:11 +02:00
03e3753f6b Add Readability import
Based on the JSON export instead of the API (which will be shutting down by the September 30, 2016)
2016-09-01 08:00:30 +02:00
a374ac0fd3 Fixed last merge who caused CSS/JS bugs 2016-08-30 13:52:28 +02:00
cdd3010b47 Merge remote-tracking branch 'origin/master' into 2.1 2016-08-28 16:15:27 +02:00
13d44ca766 Merge pull request #2243 from wallabag/feature-untagged-entries
Add untagged entries
2016-08-28 15:56:16 +02:00
0184e09a66 Add missing translations 2016-08-28 15:37:22 +02:00
d5d1612153 Add tests for untagged entries 2016-08-28 14:44:00 +02:00
b6520f0b15 Add untagged entries
Fix #1631
2016-08-28 14:44:00 +02:00
8635ab1cd1 Merge pull request #2245 from wallabag/change-page-title
Changed where page title is displayed
2016-08-28 14:33:46 +02:00
985f5f9d05 Occitan version
Occitan translation, I hope I properly put it where it has to be.
If there reminds other textes to translate, please let me know!
2016-08-27 12:24:18 +02:00
74d68fbf25 Changed where page title is displayed 2016-08-26 21:26:21 +02:00
add0e14cff Fixed print view for baggy theme 2016-08-26 21:20:02 +02:00
52ef497099 Fix print / article views 2016-08-26 14:35:43 +02:00
c4da9d1cd8 Merge pull request #2240 from wallabag/add-icon-public-share
Add icon for public share link
2016-08-26 12:14:36 +02:00
f7de67e26f Merge pull request #2241 from modos189/v2-issue-1991
Fix issue #1991: correction of the height field to add articles
2016-08-26 07:26:42 +02:00
ceebf13fe8 Fix issue #1991: correction of the height field to add articles 2016-08-26 01:13:35 +03:00
8e06720ff3 Add icon for public share link 2016-08-25 16:19:21 +02:00
bf0d9ef534 Merge pull request #2238 from modos189/v2-improve-view
V2 improve view
2016-08-25 15:55:30 +02:00
aad350a5a2 Merge pull request #2237 from wallabag/add-original-url-public-entry
Add original link in public view of the article
2016-08-25 15:39:15 +02:00
0a512eaf57 Remove text about original URL in public view 2016-08-25 15:32:38 +02:00
538587855a A new version of the plugin tinydot with update on window resize 2016-08-25 16:22:47 +03:00
5aba43d92c Changes in the login form:
* The alignment of the login form centered in WebKit
* Indent after the reference password recovery
2016-08-25 16:09:55 +03:00
9415bc992e Add original link in public view of the article 2016-08-25 14:39:33 +02:00
60e7220406 Merge pull request #1904 from wallabag/feature-public-mode
Share entry with a public URL
2016-08-25 09:30:51 +02:00
eddda878a0 Update test
and some cleanup
2016-08-24 22:29:36 +02:00
b1afef30dc Handle share_entry
- share_entry needs to be in the migration too
- and it needs a translation
2016-08-24 21:56:02 +02:00
ad9304cd7e Handle table prefix in migration
and fix migration for name field in oauth table
2016-08-24 21:38:26 +02:00
c6d77eaf51 Merge pull request #2236 from wallabag/allow-failure-php-7.1
Allow failure for PHP 7.1
2016-08-24 11:39:17 +02:00
a1ab7d1d32 Merge pull request #2186 from wallabag/addRegistration
Add option to disable registration
2016-08-24 11:13:00 +02:00
ddb49dd931 Allow failure for PHP 7.1
Got tired of `EE/home/travis/build.sh: line 45:  4445 Segmentation fault      (core dumped) phpunit -v` using PHP 7.1.0beta3
2016-08-24 10:49:43 +02:00
8541b3c4fd Add simple test 2016-08-24 10:28:43 +02:00
a5684f6a23 Merge pull request #2234 from cstuder/patch-1
Fixes mailto link in documentation
2016-08-24 09:11:14 +02:00
cc654b427f Merge pull request #2235 from wallabag/german-doc-config
Add configuration for german documentation
2016-08-24 09:10:55 +02:00
78b3c31d70 Change annotation for uuid field 2016-08-24 09:07:49 +02:00
18545173a6 Add configuration for german documentation 2016-08-24 08:53:20 +02:00
cdf405ad8f Fixes mailto link in german translation 2016-08-24 08:43:38 +02:00
cdfeea0a96 Fixes mailto link in french translation 2016-08-24 08:43:17 +02:00
cf967401b0 Fixes mailto link 2016-08-24 08:22:35 +02:00
2f9927404d Merge pull request #2230 from modos189/issue_2055
Cut entries title in card view: continued
2016-08-23 17:24:46 +02:00
3e860ff1ce Change links on baggy theme 2016-08-23 16:55:49 +02:00
f1be7af446 Change share entry behavior 2016-08-23 16:49:21 +02:00
3377c938f8 Add translations 2016-08-23 16:49:21 +02:00
9a5231e8c4 Improve migration 2016-08-23 16:49:21 +02:00
a7e2218e25 Add test and fix migration 2016-08-23 16:49:21 +02:00
222e09f140 Add Cache on Share Action 2016-08-23 16:49:21 +02:00
d0545b6bd6 Add migration 2016-08-23 16:49:21 +02:00
f3d0cb9106 Share entry with a public URL 2016-08-23 16:49:21 +02:00
28388e15c3 Replacement plugin dotdotdot (6.7 KB) on my tinydot (315 bytes) 2016-08-23 12:58:35 +03:00
1bee9e0760 Merge pull request #2218 from wallabag/api-delete-tags-1982
Delete tag or tags by label
2016-08-23 11:51:13 +02:00
f997ae6afb Implement Twig_Extension_GlobalsInterface to remove deprecation 2016-08-23 07:47:55 +02:00
8315130a75 Display entries number for each category 2016-08-23 07:47:55 +02:00
ee4442f42a CS 2016-08-23 07:40:36 +02:00
7149aa5781 Proper parameter name, simplify logic & phpdoc 2016-08-23 07:40:36 +02:00
de3d716ae4 Add option to disable registration 2016-08-23 07:40:36 +02:00
97e7ad4dc7 Remove duplicate pager on baggy 2016-08-23 07:36:43 +02:00
a0e1eafc35 Add some tests
Also, retrieve tag from the request instead of the query (which will be the same but it's more easy to test).

Moved down `deleteTagAction` because it conflicted with the new action:

  api_delete_tag => /api/tags/{tag}.{_format}
  api_delete_tags_label => /api/tags/label.{_format}

And finally, throw exception when a tag is not found before removing it.
2016-08-23 07:26:58 +02:00
9bf83f1fb8 CS 2016-08-23 07:26:58 +02:00
4da01f492b Delete tag or tags by label
Tests not included
2016-08-23 07:26:58 +02:00
e71cef0bb8 Fix typos in field name 2016-08-23 07:26:58 +02:00
119914e65d added name on client 2016-08-23 07:26:58 +02:00
267e8d6361 Add tests for tag list routes 2016-08-23 07:26:18 +02:00
371bcca0f6 Translations and baggy view for tags 2016-08-23 07:26:18 +02:00
891456ba9a Links on each tag in Tags view 2016-08-23 07:24:42 +02:00
d5de909bbc Update SymfonyRequirements 2016-08-23 07:24:00 +02:00
79efca1e6f Merge remote-tracking branch 'origin/master' into 2.1 2016-08-22 23:03:16 +02:00
474b086656 Simplify the initialization of the plugin dotdotdot 2016-08-22 23:59:20 +03:00
e32aea53ab Added the jquery library dotdotdot ( http://dotdotdot.frebsite.nl/ ) that allows you to clip a text on the second line and fixed cut entries title in card view 2016-08-22 23:34:44 +03:00
9c545fe028 Added name on client
- Fix typos in field name
- Added migration for name field in API client table

Manually cherry-picked from PR
https://github.com/wallabag/wallabag/pull/2171
2016-08-22 20:18:27 +02:00
db4d63fc1a Upgrade PHPUnit to version 5
- Fix deprecated getMock
- Use PHPUnit 4 for PHP 5.5 build

Manually cherry-picked from PR
https://github.com/wallabag/wallabag/pull/2201
2016-08-22 20:16:50 +02:00
80bb0b7344 Merge pull request #2226 from wallabag/prepare-207
Prepare wallabag 2.0.7
2016-08-22 10:40:24 +02:00
5068544e10 Prepare wallabag 2.0.7 2016-08-22 10:08:21 +02:00
c649d43381 Merge pull request #2222 from wallabag/add-date-on-article-view
Added creation date and reading time on article view
2016-08-22 09:40:21 +02:00
d35ba2c3d6 Display text on baggy
Instead of using icons (which aren't available) display real text for reading time & creation date
2016-08-21 22:22:34 +02:00
4e4e8e9899 Merge pull request #2221 from wallabag/replace-favorite-star
Replaced favorite word/icon with star one
2016-08-21 22:11:20 +02:00
8642f14220 Merge pull request #2224 from wallabag/avoid-exception-import
Avoid breaking import when fetching fail
2016-08-20 14:31:32 +02:00
19d9efab32 Avoid breaking import when fetching fail
graby will throw an Exception in some case (like a bad url, a restricted url or a secured pdf).

Import doesn't handle that case and break the whole import.
With that commit the import isn't stopped but the entry is just skipped.

Also, as a  bonus, I've added extra test on WallabagImportV2 when the json is empty.
2016-08-20 01:17:26 +02:00
e7732deb1f Changed code indentation 2016-08-18 15:37:44 +02:00
eecd7e406d Fixed some translations 2016-08-18 15:30:28 +02:00
4e1be104ab Added creation date and reading time on article view
Fix #2034
2016-08-18 15:23:19 +02:00
519ba0b5e7 Replaced favorite word/icon with star one
Fix #2041
2016-08-18 14:27:17 +02:00
e408d7e895 Merge pull request #2220 from Rurik19/master
Enable PATCH method for CORS in API part
2016-08-18 11:56:02 +02:00
41c9eecfa7 Enable PATCH method for CORS in API part 2016-08-18 14:30:32 +05:00
b762ab3cce Merge pull request #2134 from wallabag/hhvm
Run tests on an uptodate HHVM
2016-08-17 18:00:17 +02:00
fc41abb990 Run tests on an uptodate HHVM
Using some tricks from symfony/symfony
2016-08-17 16:41:36 +02:00
782390a80e Merge pull request #2095 from wallabag/fix-2auth-form
Fix form user display when 2FA is disabled
2016-08-17 15:17:07 +02:00
0cecfa2536 CS 2016-08-17 14:36:20 +02:00
6dfac457d8 Fix tests
Ensure tests after the InstallCommand test will have a clean database.
Previous attempt failed because of a foreign key

Also, nightly on Travis seems to target PHP 7.2-dev, so I put 7.1 in requirement and moved nightly in allowed failures.
And it seems xdebug isn't shipped with PHP 7.1, so I added a workaround to avoid build to fail when trying to remove xdebug.ini file.
2016-08-17 14:34:39 +02:00
9a5c5c330e Disable autobranch & commit 2016-08-17 12:31:16 +02:00
7dbedfc8a3 Enable Zappr 2016-08-17 12:29:47 +02:00
e49c62fac8 Fix form user display for baggy theme 2016-08-17 11:41:46 +02:00
8f5e220327 Fix form user display when 2FA is disabled 2016-08-17 11:41:46 +02:00
2e16a90339 Merge pull request #2216 from Rurik19/master
Enable CORS headers for OAUTH part
2016-08-16 14:22:43 +02:00
848c2e1b97 Enable CORS headers for OAUTH part 2016-08-12 13:01:53 +05:00
00acc0d006 Changed URL for scrutinizer in README 2016-08-11 20:57:06 +02:00
8617972f3f Merge pull request #2212 from wallabag/prepare-206
Prepare release 2.0.6
2016-08-10 15:03:43 +02:00
a26f91dcb6 Prepare release 2.0.6 2016-08-10 14:26:13 +02:00
b10a422e1f Merge pull request #2202 from wallabag/fix-phpdoc
add some missing phpdoc parameters
2016-07-24 11:49:21 +02:00
8cb869ea95 add some missing phpdoc parameters 2016-07-24 11:47:03 +02:00
029965b6a2 Merge pull request #2200 from charno6/patch-1
Fixed typo in entry:notice:entry_saved
2016-07-23 22:58:26 +02:00
75ac3e6289 Fixed typo in entry:notice:entry_saved
"Eintag" to "Eintrag"
2016-07-23 22:40:23 +02:00
8c7d7c0300 Merge pull request #2199 from Simounet/facto/social-links
Handling socials links into a config file
2016-07-21 16:17:53 +02:00
57c608fa94 php-cs-fixer pass 2016-07-20 23:08:04 +02:00
40288b7166 Chrome extension URL updated 2016-07-20 22:55:43 +02:00
78d1727096 Merge pull request #2198 from Simounet/fix/image-inside-figure
FIX image inside a figure element max-width
2016-07-20 20:44:47 +02:00
0e1abf392c FIX image inside a figure element max-width (baggy theme) 2016-07-20 20:23:55 +02:00
f64472e9f8 FIX image inside a figure element max-width 2016-07-20 19:39:24 +02:00
39f27d6370 Handling socials links into a config file 2016-07-20 19:36:01 +02:00
0faeabefa7 Merge remote-tracking branch 'origin/master' into 2.1 2016-07-20 12:02:02 +02:00
317fc6e684 Merge pull request #2195 from wallabag/remove-bin
Remove binary from repo
2016-07-20 11:38:55 +02:00
8d8d48a2bb Remove binary from repo
Since Composer 1.2, binaries are re-installed from vendors if there aren't found.
This avoid us to commit binaries vendors into the repo.

⚠️ You have to update your Composer to the 1.2 (`composer selfupdate`)
2016-07-20 10:51:37 +02:00
0dc09439ef Merge pull request #2048 from wallabag/travis-php-7.1
Run PHP 7.1 on Travis
2016-07-19 11:24:26 +02:00
ab3eb4ba95 Merge pull request #2194 from benages/patch-2
Fixed spelling Artúclos --> Artículos
2016-07-18 22:56:02 +02:00
57b62cbf79 Fixed spelling Artúclos --> Artículos 2016-07-18 21:53:53 +02:00
1973897305 Run PHP 7.1 on Travis
- Using nightly (as of now it's PHP 7.1 alpha)
- Force guzzle to be at least 5.3.1 (which fix some bugs in PHP 7)
2016-07-18 18:07:25 +02:00
2bb138ef6d Merge pull request #2183 from wallabag/tags-entries-view-baggy
Bring tags on entries view to baggy
2016-07-18 15:17:33 +02:00
51cbc2ebfe Merge pull request #2185 from wallabag/fix-3rd-party-links
Fix 3rd-Party Apps links (Chrome & Firefox)
2016-07-02 12:33:33 +02:00
8d4152f70d Remove fr part 2016-07-02 11:56:14 +02:00
baef8ea26c Fix 3rd-Party Apps links (Chrome & Firefox) 2016-07-02 11:50:32 +02:00
1d4d9aaf29 Bring tags on entries view to baggy
Also, a couple of UI improvement and CSS fixing
2016-07-01 13:59:30 +02:00
9dbd3e9302 Merge pull request #2174 from wallabag/api-filter-tags
Add filter for tags on API
2016-07-01 10:35:45 +02:00
4f0558a0d4 fix merge issue 2016-06-29 20:52:37 +02:00
28803f106b Add filter for tags on API 2016-06-29 09:55:57 +02:00
a314b920bf Merge pull request #2176 from wallabag/add-since-parameter
Add since parameter
2016-06-29 09:34:39 +02:00
e43c78abd9 CS 2016-06-25 23:19:21 +02:00
e5fb89e5d3 Add since parameter 2016-06-25 21:05:50 +02:00
33e2aec18b Merge pull request #2170 from wallabag/addTagsOnEntriesView
Add tags on entries view and minor ui fixes
2016-06-24 14:23:38 +02:00
9f8c43e222 Merge pull request #2172 from wallabag/more-tests
Change the way to login user in tests
2016-06-24 14:22:47 +02:00
eef833d644 uniformize tags on article view too 2016-06-24 12:07:45 +02:00
fdc90ceb17 Change the way to login user in tests
Instead of using a HTTP request we just login user like FOSUser does.
It allows us to mock service in container for functional tests.

Also, fix a bad config name in fos_user for firewall

And finally, add functional test to PocketImport
2016-06-24 11:55:47 +02:00
e7aed21b33 add line to other languages 2016-06-24 11:45:42 +02:00
2bc9cad78e Remove useless spaces 2016-06-24 11:28:07 +02:00
b1c9b78203 Merge pull request #2169 from wallabag/fix-fonts
fix font paths
2016-06-24 09:20:52 +02:00
a15022db96 minor ui fixes 2016-06-23 23:13:25 +02:00
91826e3ca2 fix typo on icons 2016-06-23 22:51:09 +02:00
25dc07d3c9 Add tags on entries view
Should be tested on old browsers
2016-06-23 22:50:39 +02:00
dafc5cf993 fix font paths 2016-06-23 22:10:12 +02:00
20218495a7 Merge pull request #2168 from wallabag/fix-npm-dep-old-nodejs
Add modules when NodeJS versions are too low.
2016-06-23 15:09:57 +02:00
9ccb96cfe2 Add modules when NodeJS versions are too low.
And eventually one required anyway.
2016-06-23 14:34:59 +02:00
f49d9ca383 Merge branch 'master' into 2.1 2016-06-23 11:47:46 +02:00
fb5c17a9ab Merge pull request #2157 from wallabag/lower-upper-readingtime
Handle only upper or only lower reading filter
2016-06-23 11:38:10 +02:00
95859e54c5 Add some tests about readingTime 2016-06-23 10:46:47 +02:00
bf27f99d54 Merge pull request #2165 from wallabag/translation-typos
Fix a few french translations typos
2016-06-23 10:43:06 +02:00
2c00dddf01 fixup! Handle only upper or only lower reading filter 2016-06-23 09:41:30 +02:00
1bdbc39f02 Handle only upper or only lower reading filter
When we select only one value in the reading time filter, we need to perform a query with only one value (greater than OR lower than).
2016-06-23 09:41:30 +02:00
b46124cb9b Fix a few french translations typos 2016-06-23 09:38:49 +02:00
49e2854d5c Merge pull request #2142 from wallabag/v2-use-npm
Manage assets through npm
2016-06-23 09:25:01 +02:00
d37bb05c88 Merge pull request #2132 from wallabag/sf3.1
Jump to Symfony 3.1
2016-06-23 09:18:18 +02:00
4eaaa27bb5 Update symlink to php-cs-fixer 2016-06-23 09:15:50 +02:00
4e411208cc Try to find bad redirection after delete
Instead of checking for the whole absolute url, we just check with the relative url.
If the referer ends with the relative url of the deleted entry, don't redirect to the referer.
2016-06-23 09:15:50 +02:00
11493858a7 Use friendsofphp instead of fabpot
The fabpot's one is now depreacted
2016-06-23 09:15:50 +02:00
3247b90776 translate documentation to German 2016-06-23 09:15:50 +02:00
afbe800be2 Corrected Regex for lighttpd rewrite 2016-06-23 09:15:50 +02:00
eae86d3403 Prepare wallabag 2.0.5 2016-06-23 09:15:50 +02:00
e42b13bcff Change ManyToMany between entry & tag
Following https://gist.github.com/Ocramius/3121916

Be sure to remove the related entity when removing an entity.

Let say you have Entry -> EntryTag -> Tag.
If you remove the entry:

 - before that commit, the EntryTag will stay (at least using SQLite).
 - with that commit, the related entity is removed
2016-06-23 09:15:50 +02:00
6334f2cac1 Display a message when saving an entry failed
When saving an entry fail because of database error we previously just returned `false`.
Now we got an error in the log and the displayed notice to the user is updated too.
2016-06-23 09:15:50 +02:00
f06f840c9d Move fixtures to the right place 2016-06-23 09:15:50 +02:00
af95c09c80 Fix the deletion of Tags/Entries relation when delete an entry
Fix #2121
2016-06-23 09:15:50 +02:00
26ed851f52 Add unread filter test to EntryControllerTest
Add a new test to the EntryControllerTest collection which checks that
only entries which have not been archived (and are treated as "unread")
are retrieved.
2016-06-23 09:15:50 +02:00
710f8e69d7 Add unread filter to entries pages
Add the ability to filter for unread pages in the filters menu.
2016-06-23 09:15:50 +02:00
99451fe4b7 Fix bad loading fixtures
Since doctrine/data-fixtures 1.2.0 fixtures seems to be badly loaded.
No time for investigate but reverting back to 1.1.* is fixing issues.
2016-06-22 23:15:17 +02:00
23634d5d84 Jump to Symfony 3.1 2016-06-22 17:59:35 +02:00
891a026e31 Merge pull request #2160 from wallabag/bin-cs-fixer
Update symlink to php-cs-fixer
2016-06-20 12:11:53 +02:00
2f30eed236 Update symlink to php-cs-fixer 2016-06-20 11:22:30 +02:00
247cf4897a Merge pull request #2155 from wallabag/php-cs-fixer
Use friendsofphp instead of fabpot
2016-06-20 09:35:55 +02:00
3c552f0d04 Merge pull request #2156 from wallabag/delete-redirect
Try to find bad redirection after delete
2016-06-20 09:35:41 +02:00
ce0e9ec31b Try to find bad redirection after delete
Instead of checking for the whole absolute url, we just check with the relative url.
If the referer ends with the relative url of the deleted entry, don't redirect to the referer.
2016-06-17 22:18:48 +02:00
d71b600599 Use friendsofphp instead of fabpot
The fabpot's one is now depreacted
2016-06-17 22:03:29 +02:00
77c530f43c Merge pull request #2148 from wallabag/start-german-docu
translate documentation to German
2016-06-16 06:50:21 +02:00
429480357f translate documentation to German 2016-06-16 00:39:48 +02:00
d220a95121 Merge pull request #2145 from even-allmighty/master
Corrected Regex for lighttpd rewrite
2016-06-13 11:51:37 +02:00
02d10905b3 Corrected Regex for lighttpd rewrite 2016-06-13 10:35:05 +02:00
496cfdc017 trailing comma 2016-06-09 20:08:57 +02:00
2e24d12027 remove block added twice 2016-06-09 19:07:41 +02:00
0743287f95 clean & lint stuff 2016-06-09 19:02:38 +02:00
5ecdfcd041 manage assets through npm
first draft

remote assetic totally

work

nearly there

use at least nodejs > 0.12

use proper version of grunt

bump nodejs version for travis

update npm

workaround for materialize

install node 5.0

add grunt-cli

baggy theme & cache node modules

cache bower & npm

make travis build assets on php7 only

exclude installing node & npm if not needed & use bash

clean & try to make icomoon work on baggy

ready

config for travis

rebase

make travis work

more travis work

impove travis & update deps

add missing pixrem deps

add module through oddly lost

ui updates

install latest nodejs

add install_dev.sh, link local binaries for npm/bower/grunt

ui improvements (mostly baggy)

fix travis build

no need to install on travis

Add unread filter to entries pages

Add the ability to filter for unread pages in the filters menu.

Add unread filter test to EntryControllerTest

Add a new test to the EntryControllerTest collection which checks that
only entries which have not been archived (and are treated as "unread")
are retrieved.

Improve English translation

Update FAQ

-Fix grammar
-Add notes about MTA, firewall, and SELinux

Update installation instructions

-Fix grammar
-Add SELinux section

add screenshots of android docu in English

Fix the deletion of Tags/Entries relation when delete an entry
Fix #2121

Move fixtures to the right place

Display a message when saving an entry failed

When saving an entry fail because of database error we previously just returned `false`.
Now we got an error in the log and the displayed notice to the user is updated too.

Change ManyToMany between entry & tag

Following https://gist.github.com/Ocramius/3121916

Be sure to remove the related entity when removing an entity.

Let say you have Entry -> EntryTag -> Tag.
If you remove the entry:

 - before that commit, the EntryTag will stay (at least using SQLite).
 - with that commit, the related entity is removed

Prepare wallabag 2.0.5

enforce older materialize version
2016-06-09 17:12:51 +02:00
1584067028 Merge pull request #2118 from wallabag/prepare-205
Prepare wallabag 2.0.5
2016-05-31 21:45:01 +02:00
17dfff6918 Prepare wallabag 2.0.5 2016-05-31 21:18:22 +02:00
f329e769fd Merge pull request #2122 from wallabag/fix-tags-deletion
Fix the deletion of Tags/Entries relation when delete an entry
2016-05-31 11:31:16 +02:00
3be047456d Change ManyToMany between entry & tag
Following https://gist.github.com/Ocramius/3121916

Be sure to remove the related entity when removing an entity.

Let say you have Entry -> EntryTag -> Tag.
If you remove the entry:

 - before that commit, the EntryTag will stay (at least using SQLite).
 - with that commit, the related entity is removed
2016-05-31 10:01:03 +02:00
39ba51ca1a Display a message when saving an entry failed
When saving an entry fail because of database error we previously just returned `false`.
Now we got an error in the log and the displayed notice to the user is updated too.
2016-05-30 14:32:43 +02:00
2c045a210a Move fixtures to the right place 2016-05-30 14:18:47 +02:00
f41c840b8c Fix the deletion of Tags/Entries relation when delete an entry
Fix #2121
2016-05-28 13:38:59 +02:00
839475776b Merge pull request #2052 from danbartram/feature-filter-unread
Add unread filter to entries pages
2016-05-27 09:57:51 +02:00
235026e2c7 Enhance option in command 2016-05-27 09:43:49 +02:00
3fad6c74fe Add CLI import for wallabag v2 files 2016-05-27 09:43:48 +02:00
7b67f785ff Merge pull request #2112 from Poorchop/docs-proposal
Docs proposal
2016-05-26 20:50:11 +02:00
c15a150d2e Merge pull request #2111 from wallabag/translate-android-docu-pics-to-english
add screenshots of android docu in English
2016-05-24 13:41:56 +02:00
92491227c1 add screenshots of android docu in English 2016-05-23 21:16:53 +02:00
b5fa6607a9 Update installation instructions
-Fix grammar
-Add SELinux section
2016-05-23 13:22:12 -04:00
4127d7ad1b Update FAQ
-Fix grammar
-Add notes about MTA, firewall, and SELinux
2016-05-23 13:18:20 -04:00
2857aaa994 Merge pull request #2109 from Poorchop/grammar
Improve English translation
2016-05-23 07:50:47 +02:00
8fef96ee9f Improve English translation 2016-05-23 01:04:17 -04:00
4b2774f8db Don't cut entries title in card view
Stop cutting titles arbitrary at caracter 42.
2016-05-21 10:39:49 +02:00
9f95b14dec Merge pull request #2097 from bmillemathias/issue_2045
Fix image path in 2-factor authentification email
2016-05-19 09:19:01 +02:00
151f046f61 Merge pull request #2098 from wallabag/cs-2092
CS
2016-05-19 09:18:16 +02:00
6922168420 CS 2016-05-19 07:41:54 +02:00
e7658cb009 Merge pull request #2092 from Rurik19/issue2089
Starred and Archived clears if article is already exists
2016-05-19 07:39:30 +02:00
2dcb1dbf05 Forgot a double quote 2016-05-19 01:51:50 +02:00
871f667a55 Fix image path in 2-factor authentification email
Fix the broken url to image ressource hosted on wallabag.org
2016-05-18 21:18:41 +02:00
d30ec39008 Merge pull request #2093 from wallabag/replace-dots-material
Replace vertical dots in material theme with horizontal dots
2016-05-18 14:58:50 +02:00
8baf3d4bda Merge pull request #2094 from wallabag/update-contributing
Update CONTRIBUTING file
2016-05-18 14:58:45 +02:00
953305e904 Update CONTRIBUTING file
Fix #2059
2016-05-18 14:33:06 +02:00
9b40422594 Replace vertical dots in material theme with horizontal dots 2016-05-18 14:29:41 +02:00
bba271e619 Tests for issue #2089 2016-05-18 15:37:07 +05:00
614a0bfd86 PATCH also clears starred and archived signs 2016-05-18 15:28:49 +05:00
873e380658 Starred and Archived clears if article is already exists 2016-05-18 10:30:33 +05:00
cac3f603cf Merge pull request #2069 from merwan/patch-1
Do not specify language in Firefox addon link
2016-05-13 14:15:01 +02:00
5f2971e1d4 Do not specify language in Firefox addon link 2016-05-13 11:58:10 +02:00
f7e714bde7 Merge pull request #2068 from mariovor/documentation/datadb
Added information about permissions on data/
2016-05-13 09:16:35 +02:00
458854f1e4 Added information about permissions on data/ 2016-05-12 19:21:27 +02:00
e0f953a5a6 Added information about permissions on data/db 2016-05-12 19:10:23 +02:00
12f8631e8a Merge pull request #2054 from wallabag/jamiroconca-craueconfigbundle-update-1
Update CraueConfigBundle.it.yml
2016-05-11 09:15:24 +02:00
9b8d1d8bbf Update CraueConfigBundle.it.yml 2016-05-11 00:23:36 +02:00
30334567a3 Add unread filter test to EntryControllerTest
Add a new test to the EntryControllerTest collection which checks that
only entries which have not been archived (and are treated as "unread")
are retrieved.
2016-05-09 19:48:28 +01:00
e2f2f61001 Merge pull request #2049 from joshp23/patch-1
Update api.rst
2016-05-09 20:00:40 +02:00
4ca4d1b3b1 Update api.rst 2016-05-09 11:27:27 -04:00
733b2cf19b Add unread filter to entries pages
Add the ability to filter for unread pages in the filters menu.
2016-05-09 14:56:52 +01:00
acd3c26a74 Update api.rst
I just used google translate for this bit ... I really don't know any French ;)
2016-05-09 08:51:45 -04:00
b1fcd47a5c Merge pull request #2044 from joshp23/patch-1
Update api.rst
2016-05-09 04:39:59 +02:00
d948ee531e Update api.rst
Added my plugin, renamed the resource section for better english. Propose that the third party resource section have it's own page.
2016-05-08 18:04:14 -04:00
1875afaeff Merge pull request #2038 from foxmask/master
new details in the doc about the rights access again;)
2016-05-08 08:47:48 +02:00
ab46a256f4 new details in the doc about the rgihts access again;) 2016-05-07 22:55:19 +02:00
de20470ee1 Merge pull request #2035 from wallabag/prepare-204
Prepare wallabag 2.0.4
2016-05-07 19:58:31 +02:00
8f705d62af Update changelog 2016-05-07 18:54:23 +02:00
3c8be33500 Merge pull request #2023 from wallabag/fix-validators-translation
Fix translation for validators
2016-05-07 15:28:30 +02:00
961ec4ec86 Prepare wallabag 2.0.4 2016-05-07 13:26:55 +02:00
1221f5315d Fix translation for validators
Fix #2003
2016-05-07 13:24:14 +02:00
1556c925a4 Merge pull request #2016 from wallabag/update-documentation
Update documentation
2016-05-07 11:10:21 +02:00
f54de6817e Merge pull request #2020 from wallabag/fix-number-entries-per-tag
Fix number of entries in tag/list
2016-05-07 11:09:37 +02:00
dcd74397d6 Merge pull request #2024 from wallabag/jamiroconca-patch-messages-it
Update messages.it.yml
2016-05-07 11:08:40 +02:00
a0640406b4 Update messages.it.yml
other translations added
2016-05-05 17:32:49 +02:00
8cae66fa74 Merge pull request #2029 from wallabag/change-readme
Change Travis/Scrutinizer pictures in README
2016-05-05 15:43:17 +02:00
02222d9070 Change Travis/Scrutinizer pictures in README 2016-05-05 15:21:12 +02:00
613bff2d82 Merge pull request #2028 from wallabag/docu-for-android-app
Docu for android app
2016-05-05 14:38:17 +02:00
e0f4f25fd6 Change documentation about Pocket import
Fix wallabag/docker#8
2016-05-05 13:55:39 +02:00
c6b1112b11 android docu: Wallabag > wallabag (no uppercase) 2016-05-05 11:24:04 +02:00
3bd50951be add first draft of Android app documentation 2016-05-04 23:25:49 +02:00
7c1f64c967 Add documentation to know how to contribute to the documentation :trollface: 2016-05-04 14:42:14 +02:00
bb7a39d1ed Update messages.it.yml 2016-05-04 11:59:07 +02:00
d9926005b1 Rename getEntriesByUser method to getEntriesByUserId 2016-05-04 11:42:52 +02:00
8b563fc04e Fix lighttpd documentation 2016-05-04 11:40:13 +02:00
8ae9a3f52f Merge pull request #2022 from wallabag/fix-pagination-bar
Fix pagination bar on small devices
2016-05-04 10:18:08 +02:00
9039103c37 Add Third resources for wallabag API 2016-05-04 06:52:26 +02:00
09e5b9391e Add pagination bar at the bottom of the page
Fix #2021
2016-05-03 21:44:57 +02:00
e7cd089fa6 Fix pagination bar on small devices
Fix #2008
2016-05-03 21:27:07 +02:00
12c697562e Fix number of entries in tag/list
Fix #2006
2016-05-03 21:12:40 +02:00
fa04bddd01 Move some parts in FAQ 2016-05-03 20:51:23 +02:00
e546a2d6eb Add LigHTTPd documentation
Fix #1931
2016-05-03 20:39:49 +02:00
9b57bac8b9 Merge pull request #2017 from jamiroconca/patch-1
Create messages.it.yml
2016-05-03 20:31:09 +02:00
7f76f416d1 Merge pull request #2018 from jamiroconca/patch-2
Update config.yml, add italian as available language
2016-05-03 20:30:49 +02:00
27b96824fc Merge pull request #2019 from jamiroconca/patch-3
Create CraueConfigBundle.it.yml
2016-05-03 20:30:39 +02:00
760875af67 Create CraueConfigBundle.it.yml
baseline italian translations
2016-05-03 18:31:16 +02:00
8b09c6edfb Update config.yml
add italian as available language
2016-05-03 18:24:14 +02:00
439c7e41a3 Create messages.it.yml
baseline for italian translations (cloned from english)
2016-05-03 18:16:36 +02:00
bba9907d1f Update documentation 2016-05-03 15:50:13 +02:00
97c8eb3c23 Merge pull request #2013 from wallabag/fix-display-all-tags
Fix tags listing
2016-05-03 10:07:34 +02:00
e9023a16eb Remove useless method 2016-05-03 09:39:34 +02:00
2142c714ef Merge pull request #1976 from wallabag/fix-filter-readingTime
Fix filter reading time
2016-05-03 09:05:31 +02:00
045859a2b5 Merge pull request #2005 from wallabag/fix-readingspeed-not-defined
Fix reading speed not defined when user was created via config page
2016-05-03 09:04:02 +02:00
2a007fe43d Fix tags listing
Fix #1994
* Remove unused method in tag repository
2016-05-02 21:32:47 +02:00
c4c062cce0 Add test to check reading time filter 2016-05-02 21:14:23 +02:00
8389074180 Add test for creation of new user in config page 2016-05-02 20:19:57 +02:00
ba9fee0855 Merge pull request #2012 from biva/patch-2
integrate upgrade.rst
2016-05-02 20:08:04 +02:00
b8f35b6b27 Merge pull request #2011 from biva/patch-1
upgrade.rst (Creation of an upgrade page in the documentation)
2016-05-02 20:06:43 +02:00
06bf24103b integrate upgrade.rst 2016-05-02 18:31:52 +02:00
12d3bbccbd upgrade.rst
Creation of an upgrade page in the documentation
2016-05-02 13:29:38 +02:00
deb5d97667 Merge pull request #2010 from wallabag/set-title-via-post-api
Set the title via POST /api/entries
2016-05-02 13:22:45 +02:00
51a15609b3 Set the title via POST /api/entries
Fix #2009
2016-05-02 12:50:42 +02:00
823397f2d6 Fix reading speed not defined when user was created via config page
Fix #2004
2016-04-30 15:06:31 +02:00
f0de35d2ee Merge pull request #2001 from wallabag/fix-old-branch-name-urls
Fix old branch name urls
2016-04-30 14:02:16 +02:00
66bbaaae4d same with fr 2016-04-30 13:00:05 +02:00
d3ffd65a06 doc url still in v2 form 2016-04-30 12:59:17 +02:00
46bbbbf4a9 Merge pull request #1992 from jami7/patch-10
Update CraueConfigBundle.es.yml
2016-04-28 09:17:35 +02:00
4c05e8b18f Update CraueConfigBundle.es.yml 2016-04-27 20:58:51 -10:00
4c295cb928 Merge pull request #1985 from foxmask/master
Rights access to the folders of the project
2016-04-27 07:19:31 +02:00
87b8461ed8 fixed typo 2016-04-26 15:30:43 +02:00
9ddf49ba24 Rights access to the folder of the project 2016-04-26 09:58:57 +02:00
edf3e88d88 Merge pull request #1977 from wallabag/es-translation
Es translation
2016-04-25 14:12:50 +02:00
10cc2785a0 Fix indentations in ES translation 2016-04-24 20:53:11 +02:00
acc371a129 Update messages.es.yml 2016-04-24 20:48:16 +02:00
ef37b9af71 Update messages.es.yml 2016-04-24 20:48:16 +02:00
d6a9e139dc Fix tests 2016-04-24 20:46:25 +02:00
d8f8a59010 Fix wrong reading time when apply filters 2016-04-24 20:24:23 +02:00
f97653c895 Merge pull request #1970 from wallabag/typo-api-doc
Fix typos in API documentation
2016-04-23 14:57:06 +02:00
58f0d0bdeb Fix typos in API documentation 2016-04-23 14:12:55 +02:00
3cfbe3c7e8 Merge pull request #1969 from wallabag/doc-3rd-resources-api
Create 3rd Resources chapter in API documentation
2016-04-23 13:53:05 +02:00
8c2affe680 Create 3rd Resources chapter in API documentation 2016-04-23 13:21:08 +02:00
c9bdd9a83f Merge pull request #1967 from wallabag/add-faq-documentation
Add FAQ page in documentation
2016-04-23 10:57:25 +02:00
0e9339c46c Add FAQ page in documentation 2016-04-23 10:36:25 +02:00
9c0bc04cfe Merge pull request #1965 from wallabag/prepare-203
Prepare release 2.0.3
2016-04-22 18:40:48 +02:00
dafde7fb2f Prepare release 2.0.3 2016-04-22 18:08:16 +02:00
9481187896 Merge pull request #1962 from wallabag/update-api-documentation
Update API documentation with cURL examples
2016-04-22 08:38:04 +02:00
1c90663b79 Update API documentation with cURL examples 2016-04-21 18:48:17 +02:00
7d5b4631d0 Merge pull request #1948 from wallabag/prepare-202
Prepare release 2.0.2
2016-04-21 09:44:44 +02:00
9f151b469f Update changelog 2016-04-21 08:42:41 +02:00
45919a295e Merge pull request #1957 from wallabag/fix-gotoaccount-button-translation
Fix translation for Go to your account button after subscription
2016-04-21 08:37:36 +02:00
2499cdbf29 Fix translation for Go to your account button after subscription
Fix #1956
2016-04-20 15:53:20 +02:00
868e76af10 Merge pull request #1945 from ddeimeke/master
Added some curl examples
2016-04-20 10:10:46 +02:00
f88530de68 Merge pull request #1954 from wallabag/update-links-doc
Update links in documentation
2016-04-19 20:25:36 +02:00
4a25bef077 Update links in documentation 2016-04-19 20:03:34 +02:00
24f65a838c Merge pull request #1953 from maxi62330/master
Actualisation des liens morts (Documentation de traduction)
2016-04-19 19:54:44 +02:00
89bafa95ed Actualisation des liens morts (Documentation de traduction) 2016-04-19 19:25:04 +02:00
18bb5a90d5 Prepare release 2.0.2 2016-04-19 10:01:29 +02:00
938a16c0f6 Added some curl examples 2016-04-19 08:00:07 +02:00
ca8d61b958 Merge pull request #1942 from wallabag/optimize-import
Optimize import
2016-04-18 22:13:48 +02:00
23feba63bb Merge pull request #1944 from wallabag/travis-rename-branches
Update Travis configuration with branches renaming
2016-04-18 22:12:52 +02:00
3320d39418 Update Travis configuration with branches renaming 2016-04-18 21:46:36 +02:00
23d24b1750 Add tests 2016-04-18 15:29:57 +02:00
dc12084d93 Add doctrine clear after flush, thanks to @BitOne talk at Symfony Live 2016-04-18 14:48:18 +02:00
0907a72c64 Merge pull request #1938 from wallabag/hide-pagination
Display pagination only if we have more than one page
2016-04-18 09:41:56 +02:00
188b74b6df Display pagination only if we have more than one page 2016-04-18 09:03:21 +02:00
71601c171f Merge pull request #1935 from jami7/patch-8
Update messages.es.yml
2016-04-17 08:03:36 +02:00
5c2c1a6434 Update messages.es.yml 2016-04-16 14:04:39 -10:00
7fdecbb73c Merge pull request #1933 from wallabag/hide-pagination
Hide pagination if we only have one entry to display
2016-04-16 08:36:24 +02:00
1f034a3316 Hide pagination if we only have one entry to display 2016-04-16 07:19:30 +02:00
d1f4996b77 Merge pull request #1925 from wallabag/fix-redirect-without-referer
Redirect to homepage if referer is null
2016-04-15 17:52:33 +02:00
5180302650 Merge pull request #1929 from wallabag/change-guid-rss
Change guid and link in RSS feeds to give original entry URL
2016-04-15 17:51:56 +02:00
2d899e8d30 Change guid and link in RSS feeds to give original entry URL
Fix #1926
2016-04-15 16:07:34 +02:00
345d74268b Fix redirect when delete entry 2016-04-15 15:39:00 +02:00
4086e0782e Fix tests 2016-04-15 09:58:29 +02:00
af497a641c Redirect to homepage if referer is null
Fix #1924
2016-04-15 07:58:01 +02:00
f2e5fdc366 Merge pull request #1916 from wallabag/cleanup
Convert array + phpDoc
2016-04-13 09:43:14 +02:00
a417b86923 Merge pull request #1918 from wallabag/improve-pagination
Improve pagination when user has lot of entries
2016-04-13 09:42:18 +02:00
18078ded12 Fix indentation 2016-04-13 09:20:01 +02:00
245e2e2cae Merge pull request #1919 from wallabag/cleanup-composerjson
Remove useless dependancy
2016-04-12 22:20:05 +02:00
86732aa01c Move test parameters out of parameters.yml
The end user doesn't care to about the test database.
2016-04-12 22:14:22 +02:00
c31ea8a409 Remove useless dependancy 2016-04-12 21:47:16 +02:00
c95e39c51a Lost in translation pager 2016-04-12 20:38:56 +02:00
63995be5ee Fix display for Next/Previous link when they are disabled 2016-04-12 18:03:40 +02:00
1880da7420 Restore old behavior for OutOfRangeCurrentPageException 2016-04-12 16:40:18 +02:00
76cd8dbb05 Fix tests 2016-04-12 16:32:01 +02:00
624a7c6df1 Improve pagination when user has lot of entries
Fix #1905
* Usage of whiteoctober/WhiteOctoberPagerfantaBundle
2016-04-12 16:04:17 +02:00
80bd17f00d Merge pull request #1911 from wallabag/title-on-title-entry
add title hover on entry titles
2016-04-12 14:54:59 +02:00
1b8b3859c0 Add title hover on entry titles 2016-04-12 14:30:42 +02:00
443cff9840 Fix MySQL tests on HHVM 2016-04-12 12:37:10 +02:00
4094ea4771 Convert array + phpDoc
Thanks for https://github.com/thomasbachem/php-short-array-syntax-converter
2016-04-12 12:25:29 +02:00
7eccbda99f Merge pull request #1915 from wallabag/doc-links
Fix doc links
2016-04-12 11:24:11 +02:00
8846ad0a90 Fix doc links 2016-04-12 10:51:46 +02:00
41e79f9792 Merge pull request #1912 from wallabag/install-config
Move setup config outside setupAdmin
2016-04-11 20:16:49 +02:00
637dc4bb21 Move setup config outside setupAdmin
If user doesn't want to create a new admin (even if it's recommended) the internal config weren't created resulting in error when using the interface.
2016-04-11 19:37:29 +02:00
a83fbf4504 Merge pull request #1909 from wallabag/prepare-release-2.0.1
Prepare release 2.0.1
2016-04-11 14:14:25 +02:00
d098cb04a8 Prepare release 2.0.1 2016-04-11 11:13:02 +02:00
574d101561 Merge pull request #1902 from wallabag/v2-changelog
Add changelog
2016-04-10 23:13:21 +02:00
386d1120c3 Update changelog 2016-04-10 20:24:20 +02:00
15e9483323 Merge pull request #1823 from wallabag/translation-fa
Translation fa
2016-04-10 20:00:03 +02:00
c5dede8445 Merge pull request #1903 from wallabag/force-server-version
Force server version to avoid connexion error
2016-04-10 19:57:45 +02:00
e9497f6fc0 Merge pull request #1901 from wallabag/spanish
Update Spanish translation
2016-04-10 15:43:40 +02:00
c71d83b60c Merge pull request #1887 from wallabag/v2-duplicate-bookmarklet
Fix duplicate article when added via the bookmarklet
2016-04-10 15:37:33 +02:00
f642863ff2 Merge pull request #1895 from wallabag/v2-fix-entries-api
All the entries are fetched via GET /api/entries
2016-04-10 15:37:05 +02:00
69c21157ba Force server version to avoid connexion error
When installing a new project with MySQL, if the database doesn't exist before installation will fail because DBAL will try to get the server version by querying it.
And since this query is done using the default database connexion and since the database doesn't exist, DBAL can't connect to the server.
2016-04-10 15:34:32 +02:00
9b2fe57eb6 Add changelog 2016-04-10 15:12:54 +02:00
b351d0494b Fix FA translations indentation 2016-04-10 14:33:11 +02:00
6d0db75328 Update messages.fa.yml 2016-04-10 14:33:11 +02:00
615fc1d237 Merge pull request #1900 from wallabag/v2-remove-pt-empty-doc
Remove empty portugese documentation
2016-04-10 14:25:01 +02:00
61fcbe9f57 Fix typo in french documentation 2016-04-10 14:23:43 +02:00
eaec84fcd3 Uncommented translated ES lines
Also, turn yaml lint into a more versbose check
2016-04-10 14:21:42 +02:00
834efe84ac Change visibility of checkIfEntryAlreadyExists method to private 2016-04-10 14:20:39 +02:00
466c0c6684 Remove empty portugese documentation 2016-04-10 14:18:03 +02:00
661d5ae0cf Update messages.es.yml
On line 103, I'm not sure what symbol that is that looks like this (<<) but it looks smaller? Where is that? Should I just copy and paste it? And just to clarity, please look at line 101 too cause I'm not too sure if/how I change the stuff within <...> I stopped mid line in 103 just until I get clarification on this. Thanks.
2016-04-10 14:18:03 +02:00
dd4997d705 Update messages.es.yml 2016-04-10 14:17:35 +02:00
c29747357a Merge pull request #1899 from wallabag/v2-nginx-doc
Add documentation about importing large file into nginx
2016-04-10 14:15:38 +02:00
0135c98b24 Remove int cast 2016-04-10 14:15:21 +02:00
cea846d407 Add documentation about importing large file into nginx
Fix #1849: configuration to avoid 413 Request Entity Too Large.
2016-04-10 14:12:25 +02:00
54ecbb41d6 Merge pull request #1898 from wallabag/v2-fix-readingtime-display-material
Fix estimated reading time in material view
2016-04-10 14:12:13 +02:00
19a7ea2a44 Merge pull request #1896 from wallabag/v2-fix-internal-settings
Fix internal settings
2016-04-10 09:49:10 +02:00
2504fe46ed Merge pull request #1894 from wallabag/v2-fix-doc-link
Fix documentation link in developer page
2016-04-10 09:44:48 +02:00
82dbd47391 Merge pull request #1891 from wallabag/v2-fix-rules-typo
Fix typo on configuration page
2016-04-10 09:37:49 +02:00
7ead8a0d9d Fix estimated reading time in material view
Fix #1893
2016-04-10 08:48:53 +02:00
cb48a569e0 Fix internal settings
Fix #1867: remove download_picture setting and manage show_printlink in material theme
2016-04-09 21:34:50 +02:00
5c3ca4fe9e All the entries are fetched via GET /api/entries
Fix #1863: only the unread entries were fetched with GET /api/entries entrypoint. Now, all the entries are fetched
2016-04-09 21:13:56 +02:00
808f541ea9 Fix documentation link in developer page 2016-04-09 20:43:22 +02:00
7a2157b8d7 Fix typo on configuration page 2016-04-09 14:04:43 +02:00
b00a89e08f Refactor EntryController 2016-04-09 13:44:54 +02:00
015e4284f0 Merge pull request #1824 from wallabag/v2-alternative-env
Remove SMTP configuration environment overrides
2016-04-08 21:03:17 +02:00
f652f41dab Fix duplicate article when added via the bookmarklet 2016-04-08 15:41:05 +02:00
7704ef5d3f Add documentation 2016-04-08 14:09:31 +02:00
e969c2a7ef Merge pull request #1879 from wallabag/v2-tag-field-position
Move tag form in Material theme
2016-04-08 13:51:20 +02:00
5b732257db Merge pull request #1884 from wallabag/nicosomb-patch-1
Change the installation method in issue template
2016-04-08 13:50:22 +02:00
0c608f1183 Change the installation method in issue template 2016-04-08 13:14:47 +02:00
77b9db87b8 Merge pull request #1804 from wallabag/j0k3r-patch-1
Force user-agent for iansommerville.com
2016-04-08 11:18:44 +02:00
6a986910b6 Merge pull request #1868 from wallabag/v2-tagrule-baggy
Remove keyboard shortcut and add tagging rule panel in baggy
2016-04-07 14:10:08 +02:00
c6cbe75b2e Move tag form in Material theme 2016-04-07 13:47:35 +02:00
9479ae834c Lock ocramius/proxy-manager
To avoid problem with PHP < 7.0
2016-04-06 11:37:03 +02:00
c802181126 Documentation about wallabag API 2016-04-06 11:30:41 +02:00
8687bcd0c9 Remove keybaord shortcut and add tagging rule panel in baggy 2016-04-05 22:29:47 +02:00
4b0b77e4d7 Merge pull request #1862 from wallabag/v2-doc-import-wllbg1-cli
Add production environment for CLI import
2016-04-05 16:57:43 +02:00
e543d03fd7 Merge pull request #1861 from wallabag/v2-round-estimated-time
Round estimated time and add reading speed for Baggy
2016-04-05 16:18:26 +02:00
6d3a3cfcda Add production environment for CLI import 2016-04-05 15:45:59 +02:00
4a749cad8d Round estimated time and add reading speed for Baggy 2016-04-05 15:35:01 +02:00
3a7df76013 Merge pull request #1856 from wallabag/v2-doc-import-wllbg1-cli
Documentation about wallabag v1 CLI import
2016-04-05 13:49:40 +02:00
af47742dd0 Documentation about wallabag v1 CLI import 2016-04-05 13:46:59 +02:00
52d806ea6b Add migrate link in french documentation 2016-04-05 08:48:53 +02:00
48bb9675c1 Add migrate link in english documentation 2016-04-05 08:48:29 +02:00
6b82630838 Merge pull request #1840 from wallabag/v2-fix-archive-page-title
Fix Archive page title translation
2016-04-04 09:20:04 +02:00
b5cf84bdf6 Fix Archive page title translation 2016-04-04 08:00:31 +02:00
a119acd15d Merge pull request #1835 from wallabag/v2-prepare-v2
🚀 Prepare v2.0.0 🎂
2016-04-03 22:11:17 +02:00
7d997fd9f6 Merge pull request #1838 from wallabag/v2-hide-search
Hide search buttons
2016-04-03 20:47:16 +02:00
163517da79 Remove useless CSS 2016-04-03 20:35:53 +02:00
0795d04916 Hide search buttons 2016-04-03 20:25:43 +02:00
eff75729a1 🚀 Prepare v2.0.0 🎂 2016-04-03 18:56:53 +02:00
2ff626a451 Merge pull request #1832 from wallabag/pdo-driver
Check selected PDO driver on install
2016-04-02 14:57:10 +02:00
c61b68e8a6 Check selected PDO driver on install
Instead of checking that one of the DB driver is installed we retrieve the selected driver (in parameters) and see if the extension exists.
2016-04-01 16:44:51 +02:00
d92407041a Merge branch 'Quent-in-v2' into v2 2016-04-01 10:37:42 +02:00
187868d137 Add Occitan to available language 2016-04-01 10:36:07 +02:00
1695a6fecd Fix quotes for OC 2016-04-01 10:34:51 +02:00
cb68c76cd8 Merge pull request #3 from j0k3r/patch-1
Fix simple quote
2016-04-01 10:18:16 +02:00
69726ec78e Fix simple quote 2016-04-01 10:16:06 +02:00
12500bd772 Occitan version 2016-04-01 08:55:26 +02:00
1c7690d586 OC version 2016-04-01 08:54:21 +02:00
dc89968c58 Update oc version
Complet
2016-04-01 08:51:29 +02:00
9191d8a640 Trad. Occitan
WIP
2016-03-30 13:17:40 +02:00
0bb5669cf6 Remove SMTP configuration environment overrides
SMTP configuration has been added in #1518 to use ParameterHandle's
env-map. But Symfony actually has a native way of allowing parameters to
be overriden from environment so rather than having to define a mapping
for each possible parameter, users can define any override in
parameters.yml:

> parameters:
>     database_host: %WALLABAG_DB_HOST%

and define an environment variable SYMFONY__WALLABAG_DB_HOST.

Links:
env-map: https://github.com/Incenteev/ParameterHandler#using-environment-variables-to-set-the-parameters
Symfony external parameters: http://symfony.com/doc/current/cookbook/configuration/external_parameters.html
2016-03-29 13:44:12 +02:00
b637526524 Merge pull request #1822 from jami7/patch-4
Update messages.es.yml
2016-03-29 07:34:20 +02:00
4063d821a3 Update messages.es.yml 2016-03-28 10:53:35 -10:00
e2dda63152 Merge pull request #1820 from wallabag/import-refacto
Refacto wallabag import
2016-03-28 18:52:22 +02:00
0b05dae377 Merge pull request #1821 from jami7/patch-3
Update messages.es.yml
2016-03-28 18:04:13 +02:00
ff6b683bb3 Update messages.es.yml 2016-03-28 05:34:56 -10:00
b787a7757e Refacto wallabag import
Use an abstract class to store all common action from wallabag vX import.
Move specificity in v1 & v2 import.
2016-03-28 16:43:33 +02:00
0e49487bb0 Remove some complexicity in InstallCommand 2016-03-28 14:18:50 +02:00
ba2157b270 Merge pull request #1805 from wallabag/v2-assign-comma-tags
Fix #1768 Split tags with commas from UI
2016-03-28 09:42:13 +02:00
cc8c2d315f Merge pull request #1819 from wallabag/cleanup
Some cleanup
2016-03-28 09:41:49 +02:00
a2d6f6e9d8 Merge pull request #1818 from wallabag/v2-add-migration-doc
add migration docs
2016-03-28 09:39:35 +02:00
8f336fda64 Tags were not imported in wallabag v2 import
Also, simplify exportAs matching format
2016-03-27 23:58:37 +02:00
4d0ec0e721 Fix some Scrutinizer issues 2016-03-27 20:54:57 +02:00
5d6f6f56a2 Some cleanup
- travis tabulation
- extra namespace definition in entities
2016-03-27 20:36:35 +02:00
2baca964f3 Simplify tag creation from entry
Testing that a tag exist or is assigned to the current entry isn't important in the tag controler since the `assignTagsToEntry` is already doing that job.
So it simplify the controller.
2016-03-27 17:09:33 +02:00
4e38769ad0 add migration docs 2016-03-27 16:26:47 +02:00
18b812b1b9 Merge pull request #1817 from mruminski/v2
Correct translation
2016-03-27 11:04:11 +02:00
ce25b98132 Correct translation 2016-03-26 18:00:03 +01:00
4dc9f8d037 Fix Indentation problem 2016-03-26 17:38:34 +01:00
005c0d370f Update messages.pl.yml
Complete polish translation of messages file
2016-03-25 19:20:37 +01:00
26880205a7 Create FOSUserBundle.pl.yml
Add polish version of FOSUserBundle file
2016-03-25 19:17:58 +01:00
2f20bb2b7f Merge pull request #1813 from wallabag/v2-translation-de
[v2] German translation
2016-03-24 14:01:28 +01:00
58a0ca1651 Complete messages.de.yml 2016-03-24 13:09:49 +01:00
5791e4f458 Translate FOSUserBundle to german. 2016-03-24 12:50:58 +01:00
a6ab1e6d56 Translate CraueConfigBundle to german. 2016-03-24 12:50:47 +01:00
48581c90a1 Merge pull request #1807 from nikaro/patch-1
fix typo diaspora* share
2016-03-21 17:17:52 +01:00
842a62e293 fix type diaspora* share 2016-03-21 17:03:43 +01:00
4258033451 Merge pull request #1806 from wallabag/v2-translation-flash-baggy
Translate flash message in baggy theme
2016-03-21 16:18:58 +01:00
7dbed56857 Translate flash message in baggy theme 2016-03-21 15:44:23 +01:00
5a4ee4ae0f Split tags with commas from UI 2016-03-21 14:06:07 +01:00
439b36323e Merge pull request #1774 from wallabag/v2-key-translation
Switch to keys in translated files
2016-03-21 12:47:57 +01:00
4083887afe Update docs about translation 2016-03-21 10:08:56 +01:00
f3e49264f2 Add reading time translation 2016-03-21 10:00:41 +01:00
4cb3ef5125 Put more validations on travis
Run php-cs-fixer to avoid CS on commits
Add a check on translation message using the built-in yaml validator. It'll avoid typo in translation yaml files.
2016-03-21 10:00:41 +01:00
f92b5de7ac Convert more languages 2016-03-20 21:56:42 +01:00
1381db4835 Translation typos
Fix #1793
2016-03-20 21:56:42 +01:00
3fae7f1d08 Add missing developer page 2016-03-20 21:56:42 +01:00
a0c6c244d9 Convert french translation 2016-03-20 21:56:42 +01:00
b308b26339 CS 2016-03-20 21:12:22 +01:00
4204a06b77 Add flashes messages 2016-03-20 21:12:22 +01:00
4f9cf232f8 Improve test failure readability
If the response content isn't the one expected, instead of checking into the whole DOM (with node tag, etc ..) we only check the text.
So if it fails, phpunit will display only the text, not all node tag. It'll be easier to read.
2016-03-20 21:12:22 +01:00
0d42217e4e Convert english translation file
- convert english translation to translate key
- remove baggy template for login (never used since user isn't logged in and it'll use the default theme: material)
- fix tests about text in response (now checking translation key instead of translated text)
- remove all ugly `<div class="hidden">{{ form_rest(form) }}</div>`
2016-03-20 21:12:22 +01:00
d2b4f01d74 Disable translation in test
We don't want to test translation in test
2016-03-20 21:10:58 +01:00
e71c376db9 Force user-agent for iansommerville.com
When using the default User Agent, the website returns a 403. By forcing the User Agent for this domain, we got the proper behavior: a 200

Since we can't _append_ new user agent to the default graby configuration, we need to rewrite all the default config + the new one.

Fix #1801
2016-03-18 20:55:54 +01:00
bd46de6b25 Revert "Transferring API Description file from Apiary.io"
This reverts commit 169d60abc7.
2016-03-18 16:28:45 +01:00
169d60abc7 Transferring API Description file from Apiary.io 2016-03-18 16:24:05 +01:00
f39e94ace3 Merge pull request #1767 from wallabag/v2-setting-for-reading-time
Setting for reading time
2016-03-18 14:30:38 +01:00
1b64a84b78 Improved tests 2016-03-18 14:01:50 +01:00
ec7c67badc Merge pull request #1799 from wallabag/v2-fix-tabs-display-material
fix tabs display on mobile view
2016-03-18 12:52:40 +01:00
78becd5401 Fix documentation and add help message in Baggy 2016-03-18 12:36:52 +01:00
1978d0e3b6 Merge pull request #1791 from wallabag/v2-fix-api-entry-properties
fix api properties and typo
2016-03-16 23:23:42 +01:00
bc2b947cd5 add check 2016-03-16 22:47:12 +01:00
0cd0d6eb8c fix updating entry status through API 2016-03-16 22:43:32 +01:00
2f60e5ea75 check if archive/star parameters without quotes work 2016-03-16 22:22:12 +01:00
189ef6342a use integers for archived/starred status 2016-03-16 22:22:12 +01:00
0d3043a29c fix api properties and typo 2016-03-16 22:22:12 +01:00
2cc7de1e93 fix tabs display on mobile view 2016-03-16 22:15:01 +01:00
3500d4099f Merge pull request #1797 from wallabag/v2-fix-adding-entry-API
Don't add entry through API if it already exists
2016-03-16 21:40:36 +01:00
3107f92acb Don't add entry through API if it already exists 2016-03-16 21:07:01 +01:00
17051137ec Merge pull request #1792 from wallabag/v2-add-tests-for-api-user
add tests on user in API responses
2016-03-16 10:45:09 +01:00
bc44aa5784 add tests on user in API responses 2016-03-15 19:31:31 +01:00
6432b9277e Replace slider with select 2016-03-14 13:49:47 +01:00
37b371726b Translation and documentation 2016-03-14 13:01:32 +01:00
db1d4b1e19 Fix default value and add baggy implementation 2016-03-14 13:01:31 +01:00
889c1cf328 Fixed fixtures for config 2016-03-14 13:01:31 +01:00
bca5485946 Added setting to have a personal reading time 2016-03-14 13:01:31 +01:00
17b3d026fd Merge pull request #1786 from wallabag/v2-restrict-user-infos
API shows just what needed for user
2016-03-14 06:15:46 +01:00
5cc9b5151f Merge pull request #1784 from wallabag/v2-add-refresh-token
add refresh-token grant-type
2016-03-14 06:14:22 +01:00
7d1fdab2bb API shows just what needed for user 2016-03-13 20:17:52 +01:00
c9c8345a4a add refresh-token grant-type 2016-03-13 17:53:56 +01:00
6ab56c7b2c Merge pull request #1775 from wallabag/v2-few-fixes
Some fixes
2016-03-12 11:10:21 +01:00
b95ffda2a1 Fix hazardous bug with Postgres
Instead of retrieving a random annotation, sort them to be sure they are all the same no matter the database used
2016-03-12 10:45:14 +01:00
55e61971f3 Merge pull request #1776 from wallabag/v2-doc-clarify-php7
clarify that wllbg is compatible php 7
2016-03-11 20:39:48 +01:00
d6dba929a1 clarify that wllbg is compatible php 7 2016-03-11 20:14:14 +01:00
09d8bb6fa2 Improve tests
- add more tests for coverage
- add a test on annotation deletion
- fix post annontation with ranges
2016-03-11 17:59:42 +01:00
66e2be2371 Use --prefer-dist to improve CI perf
https://twitter.com/seldaek/status/708236348281495552
2016-03-11 17:59:42 +01:00
6aed6d69a5 Merge pull request #1763 from wallabag/v2-prepare-beta2
Prepare files for 2.0.0-beta.2
2016-03-11 13:43:57 +01:00
c118131317 git clone with prefer-dist option 2016-03-10 13:04:56 +01:00
24c16007bb Finally back to composer create-project but with --keep-vcs option 2016-03-10 12:43:03 +01:00
4c51979595 Add -o option in composer install command 2016-03-10 12:43:03 +01:00
0f4e919100 French documentation for new installation 2016-03-10 12:43:03 +01:00
83be3dc097 Prepare files for 2.0.0-beta.2 2016-03-10 12:43:03 +01:00
e7931dbdf8 Merge pull request #1771 from wallabag/docker-timezone
Docker timezone
2016-03-09 10:42:15 +01:00
b80841f23c Add comment about timezone definition 2016-03-09 09:04:31 +01:00
612f5f1ec7 Add the timezone as an argument in the docker-compose.
For that, need to use v2 of docker-compose (with version >= 1.6.0)
2016-03-09 09:04:19 +01:00
125460345f Add the timezone for PHP docker container 2016-03-09 09:02:06 +01:00
d460a7377a Merge pull request #1766 from wallabag/v2-add-wallabag-in-title
Fix #1756: Added 'wallabag' in page title
2016-03-08 15:49:13 +01:00
cebb42234c Added 'wallabag' in page title 2016-03-08 15:22:35 +01:00
f4109a9bbf Merge pull request #1762 from wallabag/v2-fix-quickstart-links
Change documentation links in quickstart
2016-03-08 12:00:59 +01:00
3b32c122ab Change documentation links in quickstart 2016-03-08 11:21:40 +01:00
d442cf4a92 Merge pull request #1761 from wallabag/v2-API-version
V2 api version
2016-03-08 10:09:57 +01:00
807037884f Merge pull request #1675 from wallabag/v2-create-api-client
Ability to create new client for the API
2016-03-08 10:09:39 +01:00
6f8310b445 typos & cs 2016-03-08 09:22:25 +01:00
9761bfa18e write test for version 2016-03-07 15:16:27 +01:00
2b4770301c Add version in API 2016-03-07 15:00:03 +01:00
d11eb2e461 Fix translations mistake
In Material template, move the developer link in the left menu (like in baggy)
2016-03-07 11:05:14 +01:00
f17281417c Translate "how to" page 2016-03-07 09:20:20 +01:00
2766668b59 Use external js & css 2016-03-07 08:58:08 +01:00
1256f6fe34 Add translations 2016-03-05 22:29:58 +01:00
9bf15f0269 Add listing clients
Rename route to be more consistive (ie: prefixed with developer_)
2016-03-05 21:44:39 +01:00
2c2308b783 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
2016-03-05 20:04:19 +01:00
1e5a4b36ab Update filters picture in documentation 2016-03-04 16:20:04 +01:00
e68568cd5b Merge pull request #1750 from wallabag/v2-quickstart-documentation
Documentation about filters / Quickstart changes
2016-03-04 16:14:39 +01:00
d89908aed3 Merge pull request #1670 from wallabag/v2-mark-imported-articles-as-read
Mark all imported articles as read
2016-03-04 16:12:45 +01:00
e166a58fd9 update picture 2016-03-04 15:45:45 +01:00
e18138dbca Merge pull request #1754 from wallabag/v2-api-new-properties-light
Add starred & archive properties to API
2016-03-04 12:31:27 +01:00
fba9e7d44d Remove 'content' from API
Waiting to find a good solution to avoid side problem since user can no define the content
2016-03-04 11:46:18 +01:00
11a452813c use booleans instead of empty 2016-03-04 11:39:21 +01:00
816ad4051b add more properties for entries #1634 2016-03-04 11:39:20 +01:00
79d0e38e7f Adding test
Reformat json file (thanks pro.jsonlint.com)
2016-03-04 10:04:51 +01:00
9e3355ee4f Merge pull request #1753 from Horgix/v2-typo-doc-en
Doc: fix typo in php-hash ext name
2016-03-04 06:17:19 +01:00
5dfd321d0e Doc: fix typo in php-hash ext name 2016-03-04 01:07:45 +01:00
c32ae320fe cs & tests for wllbg v1 import 2016-03-03 10:03:40 +01:00
c10fcb3bbb french translation & pocket 2016-03-03 10:03:40 +01:00
fe8b37c137 Mark all imported articles as read 2016-03-03 10:03:28 +01:00
3d15ea2fd7 Documentation about filters (and some fixes in french documentation 2016-03-03 08:06:18 +01:00
76a9bc4797 Add new links in quickstart 2016-03-03 07:30:05 +01:00
7d12fd0628 Merge pull request #1745 from benages/v2
V2 spanish translation
2016-03-02 09:06:46 +01:00
e5f3b04cce Spanish translation 2016-03-01 23:26:03 +01:00
3ca529970c Spanish translation 2016-03-01 22:36:21 +01:00
9931a37cf7 Spanish translation 2016-03-01 22:33:55 +01:00
348e2b4852 Spanish translation 2016-03-01 22:24:34 +01:00
bd5b3ea8ea Spanish translation 2016-03-01 22:20:42 +01:00
9c5cfd2823 Merge remote-tracking branch 'upstream/v2' into v2 2016-03-01 21:02:13 +01:00
0e576d2163 Start of the spanish translation 2016-03-01 21:00:35 +01:00
646df062df Merge pull request #1743 from wallabag/v2-releasing-documentation
Releasing documentation
2016-03-01 20:49:54 +01:00
6b6f725182 Add steps in RELEASE_PROCESS 2016-03-01 20:21:18 +01:00
461a171467 Releasing documentation 2016-03-01 20:10:26 +01:00
f8b835f537 Merge pull request #1615 from bdunogier/release_process_doc
Added RELEASE_PROCESS document
2016-03-01 20:06:44 +01:00
df814148c3 Merge pull request #1740 from goofy-bz/patch-6
minor typofix again
2016-03-01 17:00:49 +01:00
7b70feb9d2 fixing previous stuff and more 2016-03-01 16:12:15 +01:00
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
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
a6a971d45f Add the way to install (package or composer) 2016-03-01 12:01:42 +01:00
4be43814e2 Merge pull request #1738 from wallabag/v2-prepare-beta1
Prepare wallabag for first beta 🚀
2016-03-01 09:00:42 +01:00
2ebbbb26ae Merge pull request #1739 from goofy-bz/patch-5
minor typofix + missing quotes
2016-03-01 06:15:49 +01:00
c273b3a5c1 minor typofix again 2016-02-29 22:04:32 +01:00
5d0f104bf0 minor typofix + missing quotes
Added quotes to be reviewed
2016-02-29 21:55:06 +01:00
6e3d65ccb0 Prepare wallabag for first beta 🚀 2016-02-29 21:34:36 +01:00
5bf8f3f164 Remove comments 2016-02-29 21:28:37 +01:00
5bc2da5628 Add password for auth 2016-02-29 21:28:25 +01:00
8a4690b6a5 add tests 2016-02-29 21:28:25 +01:00
abc329453b Enhance documentation and create a form to create a new client 2016-02-29 21:28:25 +01:00
6a2c524a2c API: rename application to client 2016-02-29 21:28:25 +01:00
b6321bed7b Added developer documentation 2016-02-29 21:28:25 +01:00
24152cdb5e Fix #1597: first draft to create new client for the API 2016-02-29 21:28:25 +01:00
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
8edf89b29e Update Capistrano libraries with last versions 2016-02-29 17:20:20 +01:00
1e18360cc7 Merge pull request #1734 from wallabag/v2-todo
Remove extra definition
2016-02-29 17:19:39 +01:00
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
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
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
a19a371ae7 Remove extra definition
Since Symfony 3.0.3 has been released
2016-02-29 09:23:15 +01:00
30e5174ea7 Merge pull request #1732 from mjjzf/v2
Adding Danish translations to Wallabag v2
2016-02-28 00:38:10 +01:00
923a7e8d68 Added RELEASE_PROCESS document 2016-02-27 23:32:26 +01:00
8249b988cc added newline 2016-02-27 17:19:17 +01:00
449df236ac Fixed indentation issue 2016-02-27 16:33:16 +01:00
8ccc306468 config.yml edit to include Danish 2016-02-27 16:16:32 +01:00
2b788cadab Adding Danish translations to Wallabag v2 2016-02-27 16:00:19 +01:00
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
f06e268fc9 Replace token by a no scope one 2016-02-27 14:07:04 +01:00
6daadb6c44 Fix authentication for PR by external contributors 2016-02-27 11:26:09 +01:00
162954763e Merge pull request #1653 from wallabag/v2-annotator-comments
V2 annotator comments
2016-02-26 18:17:37 +01:00
b07c7dfe78 Regenerate Annotator with idAnnotation instead of idComment 2016-02-26 18:14:50 +01:00
4dc872238a Rename CommentBundle with AnnotationBundle 2016-02-26 18:14:42 +01:00
9eab365e28 changed french translation from commentaire to annotation 2016-02-26 18:14:42 +01:00
a772d16b12 display how much comments there are for an entry 2016-02-26 18:14:42 +01:00
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
7720cca532 Add annotator in baggy theme
+ Documentation about annotations
2016-02-26 18:14:12 +01:00
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
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
575e6907e5 Change remove tag icon in entry view with material theme 2016-02-26 08:58:36 +01:00
74932af231 Merge pull request #1723 from shtrom/v2-lang-fix
Make English welcome message more natural
2016-02-25 08:01:00 +01:00
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
b60bff0c2a Merge pull request #1712 from wallabag/v2-contributing
Fix #1711: Update CONTRIBUTING file
2016-02-24 19:47:56 +01:00
3174b764bc fixes 2016-02-24 19:45:42 +01:00
f2fcb65b44 Fix wrong variable name
> The variable $requirement does not exist.
2016-02-24 14:49:51 +01:00
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
7af794e525 Remove gettext & lowerize 2016-02-24 14:19:47 +01:00
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
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
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
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
0a7e695975 remove unused functions & clean composer.json 2016-02-23 23:29:25 +01:00
db847ca0b7 add composer extensions check & function_exists checks 2016-02-23 19:06:37 +01:00
fc6020b2c8 Enhance requirements in InstallCommand 2016-02-23 16:41:38 +01:00
ff94ee94a6 Update issue template 2016-02-23 16:28:07 +01:00
ecb266d0ec replace contributors with a link to github 2016-02-23 16:18:13 +01:00
4a2c089c68 Add contributors and 3rd party libraries 2016-02-23 16:04:01 +01:00
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
90280df080 Change wording for create a new user 2016-02-23 14:38:42 +01:00
bb17ddea61 changed error message 2016-02-22 22:14:56 +01:00
0504f5660e Update CONTRIBUTING file 2016-02-22 22:10:26 +01:00
924ef7cacd Added documentation about errors during fetching 2016-02-22 22:00:52 +01:00
2aadeea8cd Merge pull request #1683 from wallabag/v2-demo
Demonstration mode to prevent password changes
2016-02-22 14:18:34 +01:00
2b71f68c95 Merge pull request #1701 from wallabag/v2-maintenance
Fix #1351: add maintenance mode
2016-02-22 13:40:15 +01:00
b6c00b0b80 Add tests 2016-02-22 13:33:22 +01:00
fe5597c433 Display a human message when graby fails to fetch articles 2016-02-22 13:30:17 +01:00
cd4d7f4b69 Merge pull request #1709 from wallabag/v2-typo-doc-fr
Fix #1708: typos in french documentation
2016-02-22 13:06:11 +01:00
7bf4dd891a typos in french documentation 2016-02-22 13:02:22 +01:00
437f1985b0 documentation for maintenance mode 2016-02-22 12:49:49 +01:00
5bcf1afd91 Use a tag for lexik/maintenance-bundle 2016-02-22 12:33:27 +01:00
fbbda94110 Fix #1351: add maintenance mode 2016-02-22 12:33:09 +01:00
e5b5270962 Add translation 2016-02-22 11:44:39 +01:00
a4f42c59f0 Use internal config instead for demo 2016-02-22 11:44:39 +01:00
d8d56448c9 add a username for demonstration mode 2016-02-22 11:43:29 +01:00
c3b43c8a3e change comment about demo parameter 2016-02-22 11:43:29 +01:00
36f20a6570 typo 2016-02-22 11:43:28 +01:00
6c9f50a662 Demonstration mode to prevent password changes 2016-02-22 11:43:28 +01:00
12b5a8cea1 Merge pull request #1702 from wallabag/v2-piwik
Added Piwik implementation
2016-02-22 11:24:41 +01:00
077ddbe1ae Use a different way to use piwik 2016-02-22 11:11:08 +01:00
eabb9771f4 Merge pull request #1707 from wallabag/nicosomb-patch-1
typo in french documentation
2016-02-21 17:42:01 +01:00
4bf0d4e0b5 typo in french documentation 2016-02-21 17:41:38 +01:00
c56abae16b Merge pull request #1706 from wallabag/v2-install-doc
Documentation for wallabag installation
2016-02-21 17:38:13 +01:00
426bfdc3f0 fix typos 2016-02-21 17:25:22 +01:00
89d95cdd18 improve installation documentation 2016-02-21 16:54:22 +01:00
e6ebb14f0f Documentation for wallabag installation 2016-02-21 13:55:10 +01:00
c90f8036ef Merge pull request #1705 from wallabag/v2-french-doc
French translation for documentation
2016-02-20 10:13:48 +01:00
8b197f27d8 import and first article french translations 2016-02-20 09:45:05 +01:00
8dbca9c133 french translation for login doc 2016-02-20 09:16:22 +01:00
9e60429c6d download articles in french 2016-02-20 09:09:33 +01:00
66755f8955 create account in french 2016-02-20 09:05:11 +01:00
91485cf27d forgot link for config page 2016-02-20 08:54:18 +01:00
05e173f283 typos on french homepage 2016-02-20 08:52:16 +01:00
ce168b6ead typos on french homepage 2016-02-20 08:50:36 +01:00
3495f78d77 French translation for documentation 2016-02-20 08:39:08 +01:00
0cde91cc6f Merge pull request #1699 from wallabag/v2-assign-tag
Move assignTagsToEntry in ContentProxy helper
2016-02-19 21:21:47 +01:00
a8c6b8ee0c Merge pull request #1700 from delyriand/v2-fix-1551
Fix #1551 - Redirect to the last page when current page is out of range
2016-02-19 16:21:31 +01:00
671a2b887f Fix #1551 - Redirect to the last page when current page is out of range 2016-02-19 16:02:31 +01:00
07643dde08 Fix #1137: implemented Piwik 2016-02-19 15:27:57 +01:00
c2656f96d4 Move assignTagsToEntry in ContentProxy helper 2016-02-19 14:22:20 +01:00
fa64d86110 Merge pull request #1693 from wallabag/v2-issue-template
Fix #1691 create ISSUE_TEMPLATE and PULL_REQUEST_TEMPLATE
2016-02-18 20:35:35 +01:00
befa6f2fe9 Merge pull request #1696 from wallabag/v2-french-translations-missing
Add some missing french translations
2016-02-18 14:44:26 +01:00
04c0737817 Add some missing french translations 2016-02-18 13:59:02 +01:00
88a5b0c753 typo 2016-02-18 13:19:07 +01:00
fdec3acab1 Merge pull request #1688 from mruminski/patch-1
Create messages.pl.yml
2016-02-18 13:16:49 +01:00
c665b863c7 Fix #1691 create ISSUE_TEMPLATE and PULL_REQUEST_TEMPLATE 2016-02-18 13:15:11 +01:00
660d66cabd Update messages.pl.yml
change ' to ""
2016-02-18 11:47:35 +01:00
1f8f9eaac8 Update messages.pl.yml
fix some mistakes in translation
2016-02-18 11:27:11 +01:00
bbbcd6997b Merge pull request #1690 from wallabag/v2-translate-min
translate estimated time minutes
2016-02-18 06:40:46 +01:00
f37c9c3348 translate estimated time minutes 2016-02-18 01:36:02 +01:00
93d0aa40bb Merge pull request #1689 from mruminski/patch-2
Create validators.pl.yml
2016-02-18 00:02:53 +01:00
7dc8fac718 Merge pull request #1686 from mruminski/v2
Polish translation
2016-02-18 00:01:37 +01:00
db0e34e2ce Merge pull request #1687 from 0wnrepo/v2
Translated another two files into romanian.
2016-02-18 00:00:46 +01:00
e87638227f Create validators.pl.yml
Polish translation
2016-02-17 22:23:51 +01:00
75ff0e6e32 Create messages.pl.yml
Polish translation
2016-02-17 22:18:30 +01:00
6a88b61cf1 Translated another two files into romanian. 2016-02-17 22:40:26 +02:00
ee40ccf260 Update config.yml
add Polish
2016-02-17 21:29:29 +01:00
109bda0672 Create CraueConfigBundle.pl.yml
Polish translation
2016-02-17 21:28:16 +01:00
45c4a616ec Merge pull request #1681 from wallabag/mabkenar-fa-translations
two more Persian translated files
2016-02-17 16:10:05 +01:00
c94779e499 Create CraueConfigBundle.fa.yml 2016-02-17 15:50:55 +01:00
ebac4090b5 Added Persian (fa) (فارسی) translation 2016-02-17 15:37:29 +01:00
c44cc178b5 Merge pull request #1679 from wallabag/v2-translation-doc
Documentation about translation
2016-02-17 15:33:21 +01:00
861bbfcbd4 Merge pull request #1680 from wallabag/v2-capistrano-sf3
Update Capistrano configuration for symfony3
2016-02-17 15:22:19 +01:00
28a5ee6fcf Update Capistrano configuration for symfony3 2016-02-17 15:02:50 +01:00
71d03b8536 typo 2016-02-17 14:48:41 +01:00
6a21cc6cf7 Merge pull request #1678 from 0wnrepo/v2
Translation file for the 'Romanian' language. Also recognised by ro_RO. Known in romanian as "Română".
2016-02-17 14:42:50 +01:00
29c9e8f18a Documentation about translation 2016-02-17 14:39:30 +01:00
ab25e399f0 Fix \&amp; 2016-02-17 13:39:23 +02:00
d8f5b27012 Translation file for the 'Romanian' language. Also recognised by ro_RO. Known in romanian as "Română". 2016-02-17 01:56:51 +02:00
2717089156 Merge pull request #1676 from mabkenar/v2
Translation for Persian
2016-02-16 17:08:22 +01:00
e2b4f0e2e7 Added Persian (fa) (فارسی) 2016-02-16 16:58:10 +01:00
b7c47a2a86 Create messages.fa.yml
Translation file for the 'Persian' language. Also recognized by fa_IR. Also known (in the Persian language) as Farsi. Also written like فارسی in Persian. All said, please call the language just 'Persian'.
2016-02-16 16:38:08 +01:00
f6249b67f6 Merge pull request #1668 from wallabag/v2-stuff
Few updates
2016-02-16 12:27:43 +01:00
8935a97c17 Update bin/symfony_requirements
Because of sensio/distribution-bundle (v5.0.4)
2016-02-16 11:51:31 +01:00
9e33bc9dfd Typos 2016-02-16 11:39:24 +01:00
559cd55bc8 Merge pull request #1672 from wallabag/v2-improve-baggy-theme
improve baggy theme (add new tag panel)
2016-02-15 19:22:13 +01:00
a8d5f8971e fix typos 2016-02-15 17:04:48 +01:00
4ead9c648f Merge pull request #1671 from wallabag/v2-fix-theme-img
display pictures properly
2016-02-15 08:31:46 +01:00
56349e470a improve baggy theme (add new tag panel) 2016-02-14 20:12:03 +01:00
e8d8026242 display pictures properly 2016-02-14 19:10:33 +01:00
daa2b7e7c3 More translations 2016-02-12 16:59:15 +01:00
cfc90f8422 Merge pull request #1658 from wallabag/v2-import-v1-tags
import tags from v1 (#1657)
2016-02-12 15:05:04 +01:00
fca2b05200 import tags from v1 (#1657) 2016-02-12 14:49:41 +01:00
9856805540 CS 2016-02-12 12:24:30 +01:00
0c6845a98f Add env=prod for server:run on install 2016-02-12 12:01:02 +01:00
55da765e11 Add missing translations 2016-02-12 12:00:49 +01:00
c7a4f74f9f Redirect to the right tab on /config 2016-02-12 12:00:26 +01:00
43e4a806bd Add missing @ in version number
[UnexpectedValueException]
  Could not parse version constraint 2.0.*alpha: Invalid version string "2.0.*alpha"
2016-02-12 10:21:22 +01:00
7a97c7d06f Merge pull request #1656 from wallabag/v2-fix-new-user-password-prompts
fix labels on new user prompt
2016-02-11 18:19:35 +01:00
6fa4be38eb fix labels on new user prompt
fix tests

nl

add translation validation length
2016-02-11 17:52:00 +01:00
06c190887f Merge pull request #1654 from wallabag/fix-add-button-mobile-view
fix #1636
2016-02-11 17:15:28 +01:00
a7c7de4e9b Better design of the close button 2016-02-11 16:51:12 +01:00
9b5edf33a0 Merge pull request #1663 from wallabag/v2-remove-tags-from-entry
remove tag from entry #1377
2016-02-11 16:49:03 +01:00
5db084e05b Merge pull request #1665 from wallabag/v2-translations
lots of diverse translation stuff & some typos
2016-02-11 16:48:46 +01:00
6896ae1dda Merge pull request #1666 from wallabag/v2-reimport-v1-articles-if-not-fetched
reimport v1 entries if they were not fetched
2016-02-11 16:47:58 +01:00
eaf9dad777 add tests 2016-02-11 15:48:20 +01:00
da0a9e01e9 CS 2016-02-11 13:39:21 +01:00
d7807ff5f6 translate craue config button 2016-02-11 13:37:28 +01:00
0783c99a19 reimport v1 entries if they were not fetched 2016-02-11 13:27:17 +01:00
e63252164f translation craue_config_panel 2016-02-11 12:49:25 +01:00
3a19060ca0 better translation 2016-02-11 12:39:35 +01:00
4c07a83b69 lots of diverse translation stuff & some typos 2016-02-11 01:42:37 +01:00
e686a76d34 improve test and change method name. Also, display number of entries for each tag 2016-02-10 18:40:15 +01:00
567421af50 remove tag from entry #1377 2016-02-10 17:41:28 +01:00
6e2ca4d825 Merge pull request #1659 from 0wnrepo/patch-1
Update README.md with the environment parameters
2016-02-09 17:21:42 +01:00
d3c0bc03cf Update README.md with the environment parameters 2016-02-09 16:30:32 +02:00
dcb6bd7a9d fix #1636 2016-02-08 21:30:11 +01:00
ae5b37ef2e Merge pull request #1651 from wallabag/v2-fix-wllbgv2-import
Test if some keys are missing in v2 import
2016-02-05 15:22:51 +01:00
4c46e2609f an other test for non empty fields 2016-02-05 14:52:35 +01:00
f21a5388f9 add test to check empty fields 2016-02-05 14:39:52 +01:00
565c8efb4f Merge pull request #1650 from wallabag/v2-fix-duplicate-exports
Exported entries were added twice in export file
2016-02-05 14:22:55 +01:00
cc67a81818 Merge pull request #1652 from wallabag/v2-superadmin
User created via wallabag:install is now a SUPER_ADMIN 👑
2016-02-05 14:13:13 +01:00
a0e6a6eb67 updated fixtures 2016-02-05 14:03:58 +01:00
8f06a8c416 User created via wallabag:install is now a SUPER_ADMIN 👑 2016-02-05 13:55:50 +01:00
de3b19b2ce Test if some keys are missing in v2 import 2016-02-05 13:50:16 +01:00
f898102c85 Exported entries were added twice in export file 2016-02-05 13:35:59 +01:00
704ed658a9 Merge pull request #1648 from lologhi/patch-1
Fix project version in installation command
2016-02-05 09:30:33 +01:00
eb79e1cc10 Merge branch 'v2' into patch-1 2016-02-05 16:23:22 +08:00
ea3b573653 Working generic command 2016-02-05 15:49:26 +08:00
7e48c04089 Merge pull request #1647 from wallabag/v2-install-prod
Force prod env on project creation
2016-02-05 08:38:45 +01:00
e3fc3fd4ca Fix project version in installation command 2016-02-05 11:32:44 +08:00
7e8e1178b4 Force prod env on project creation
So the only solution I found so far is to force the `prod` env when create the project with composer.
There is other solution.

Since the `cache:clear` task is using `dev` env by default, so it tries to load dev bundle, which aren't there since we specify `--no-dev`.

Fix #1617
2016-02-04 21:39:02 +01:00
22a267aeff Merge pull request #1633 from wallabag/exporttxt
Exporttxt
2016-02-04 20:53:42 +01:00
eb15061d0b Adjust export order
To be the same as on the entry page.
Also, export name doesn't need to be translated.
2016-02-04 20:41:30 +01:00
d3f31ec485 CS 2016-02-04 20:31:26 +01:00
f161122412 put the equals bar outside the loop 2016-02-04 20:31:26 +01:00
3b07d01937 remove old dependancy 2016-02-04 20:31:26 +01:00
3a2ada0be0 fix tests 2016-02-04 20:31:26 +01:00
365a38984e better display for txt 2016-02-04 20:31:26 +01:00
6c08fb68b8 add txt export 2016-02-04 20:30:51 +01:00
27c837dcd1 Merge pull request #1642 from wallabag/v2-escape-preview
Unescape content for Material card
2016-02-04 17:46:02 +01:00
2ab20ed6f9 Merge pull request #1644 from wallabag/v2-enable-confirmation-parameter
Fix #1622: parameter for FosUser confirmation
2016-02-04 17:45:50 +01:00
eb3e3969a2 Merge pull request #1645 from wallabag/v2-fix-loadtemplate-sendemail
Fix #1643: fix the way to load the HTML template in 2factor auth
2016-02-04 17:45:26 +01:00
855a4c680f Fix #1643: fix the way to load the HTML template in 2factor auth 2016-02-04 17:29:14 +01:00
bc358c9180 CS 2016-02-04 16:06:05 +01:00
3eb06f2891 Fix #1622: parameter for FosUser confirmation 2016-02-04 16:00:45 +01:00
e008c037f5 Merge pull request #1612 from wallabag/v2-settings-page
Settings page
2016-02-04 15:59:57 +01:00
0796532460 Unescape content for Material card
Using slice & striptags, the content is automatically escaped.
If some html character need to be displayed, they'll be escape too, sth like `&amp;`.
Using |raw, the content isn't escape twice and is well displayed.
2016-02-03 20:45:15 +01:00
74f39b0952 Merge pull request #1641 from wallabag/v2-doc-typo
Update import.rst to fix a doc typo
2016-02-01 14:25:22 +01:00
f4243aa75f Update import.rst 2016-02-01 14:22:19 +01:00
85ad629a3c Merge pull request #1601 from wallabag/v2-import-from-v2
[#1590] Add JSON import from wallabag v2
2016-02-01 14:17:20 +01:00
e43d27f845 Merge pull request #1605 from wallabag/v2-fix-sensiolabsinsight
[#1604] First draft to fix SensioLabsInsight report
2016-02-01 13:51:35 +01:00
74d8afa5fa Merge pull request #1639 from wallabag/v2-change-test-dbname
Fix #1635: change database name for test environments (mysql/pgsql)
2016-02-01 13:46:32 +01:00
79b9e49d94 Fix Shaarli url traduction 2016-02-01 13:42:27 +01:00
c7eef67291 Fix fos_user 2016-02-01 13:38:33 +01:00
61c640ed31 Fix #1635: change database name for test environments (mysql/pgsql) 2016-02-01 13:22:34 +01:00
48e3007b7f Fix from_email & fos_user 2016-01-31 15:31:34 +01:00
a74a6ca2b1 Add new export config 2016-01-31 15:31:30 +01:00
07c9b1c98a Fix permission to settings page 2016-01-31 14:48:26 +01:00
1c7d66645b CS 2016-01-31 14:48:26 +01:00
2a58606983 Fix tests 2016-01-31 14:48:26 +01:00
67c99849ae Use alias to get container parameters 2016-01-31 14:48:26 +01:00
d6ba77e888 Create internal setting on install & fixtures 2016-01-31 14:48:26 +01:00
278b221e65 We don't need migration yet 2016-01-31 14:48:26 +01:00
1e3ed71470 Add warning message for PocketImport
Warn user if pocket_consumer_key isn't defined
2016-01-31 14:48:26 +01:00
63e40f2d7c Add CraueConfig for internal settings 2016-01-31 14:48:26 +01:00
26975877d7 Always include warning message
We'll remove it later, on the stable release
2016-01-31 14:37:19 +01:00
bc78968764 Move default configuration out of parameters
These default configuration value shouldn't be in parameters.yml.
2016-01-31 14:37:19 +01:00
feb02cb709 Merge pull request #1630 from wallabag/v2-add-gitter-badge
Add @GitterHQ badge on README
2016-01-24 20:02:43 +01:00
51d8343954 Add @GitterHQ badge on README 2016-01-24 20:02:31 +01:00
143869525f Merge pull request #1629 from wallabag/fixexportformats
fix #1620 and introduce new parameters to export
2016-01-24 18:48:28 +01:00
2532f72c59 Merge pull request #1628 from ogunkarakus/v2-turkish-translation
Add Turkish translation
2016-01-24 18:44:58 +01:00
b89444ad8b fix #1620 and introduce new parameters to export 2016-01-24 18:21:09 +01:00
f47101e0c4 Add Turkish translation
Signed-off-by: Ogün Karakuş <kirk5bucuk@gmail.com>
2016-01-24 17:27:26 +02:00
95780f5abe Merge pull request #1625 from wallabag/v2-fix-1621
[#1621] Add default address for FosUser
2016-01-23 20:29:32 +01:00
a40dd9896b [#1621] Add default address for FosUser 2016-01-23 14:30:56 +01:00
5f8a785719 SensioLabsInsight fixes 2016-01-22 21:12:11 +01:00
b0b893eafd [#1604] First draft to fix SensioLabsInsight report 2016-01-22 21:12:11 +01:00
96fcb60c33 Merge pull request #1619 from wallabag/v2-themes-folder
Move public assets for themes
2016-01-22 20:54:17 +01:00
30d81a47c6 Move public assets for themes
So they can be installed using the `assets:install` command and there'll no longer symlink in the repo
They moved from `web/themes/...` to `bundles/wallabagcore/themes/...`
2016-01-22 13:45:14 +01:00
124f8091cb Merge pull request #1618 from wallabag/v2-readme
Updated version in README
2016-01-22 11:46:38 +01:00
06657cb73c Updated version in README 2016-01-22 11:45:43 +01:00
6c32aaae95 Merge pull request #1614 from wallabag/v2-few-fixes
Few fixes
2016-01-22 09:36:50 +01:00
23afdf3a70 CS 2016-01-22 08:01:32 +01:00
a3cac44c78 Add for deleting rule from an other user 2016-01-22 08:01:17 +01:00
0f0e8eb82a Use FOSUserEvents instead of c/p a controller
The `resetAction` was overriden to redirect user to the homepage instead of `fos_user_profile_show`.
Instead of copying the whole method we can simply use FOSUserEvents to handle that.
2016-01-21 16:39:13 +01:00
a0d6ccc5ca Fix bad type after using findByUrlAndUserId
It returns an object since few commits this part of (untested) code still use an array.
Also add test for that part of code.
2016-01-21 16:37:25 +01:00
e56983af1f Fix bad redirection when adding a new user 2016-01-21 16:36:30 +01:00
27ea492cf7 Add tests on TagAllCommand
Some simple tests
2016-01-21 16:36:17 +01:00
7a0e6970b4 Use PHP7 random_bytes to generate RSS Token
random_bytes is a PHP 7 function wich has been ported to PHP 5 using paragonie/random_compat
2016-01-21 16:35:41 +01:00
9aa66d6244 Merge pull request #1565 from wallabag/v2-2fa-html
Use HTML email for 2FA
2016-01-21 12:27:47 +01:00
abd454c456 Update HTML 2FA template
Split paragraph in translation
Inject wallabag_url for image in HTML template
Remove username & password from config_dev.yml (null are already the default value)
2016-01-21 11:03:27 +01:00
5f736213af #1490 HTML in E-Mails 2016-01-21 11:03:27 +01:00
d1f1333f48 CS 2016-01-21 11:03:27 +01:00
7ce895bf5e Use HTML email for 2FA
Related to #1490
2016-01-21 11:03:27 +01:00
e72a943ad2 Merge pull request #1610 from wallabag/v2-composer-lock-release
Disable xdebug all the time
2016-01-21 11:02:18 +01:00
3ee1582e60 Disable xdebug all the time
Use travis_wait to avoid travis timeout on `composer up`
Jump to `memory_limit -1` for `composer up`
Also, since composer.lock is ignored, we can remove it.
2016-01-21 09:29:14 +01:00
eff6a406f3 Merge pull request #1606 from wallabag/v2-tag-cascade
Remove tag relation when removing an entry
2016-01-21 08:38:37 +01:00
ff1c7d16be Merge pull request #1607 from wallabag/v2-composer-lock
Ignore composer.lock
2016-01-21 08:28:52 +01:00
173629a400 Ignore composer.lock
Having a big composer.lock on a final project can have side effect on incoming PR that add a new vendor.
Mostly because conflict are too frequent.

By ignoring composer.lock we ease the PR submission and rebase.

BUT we need to be careful when we release a new version of wallabag. We should manually `git add -f composer.lock` to update it.

Since composer.lock will no longer be commited I switch the `composer install` to a `composer up` in the travis configuration.
2016-01-20 18:49:45 +01:00
7e80861588 Remove tag relation when removing an entry
Fix #1453
2016-01-20 18:35:57 +01:00
6785f4aa74 [#1590] Add JSON import from wallabag v2 2016-01-20 14:37:01 +01:00
d481f42b7d Merge pull request #1599 from wallabag/v2-fix-pt-documentation
Add configuration for portuguese documentation
2016-01-20 13:00:43 +01:00
acc0160c29 Add configuration for portuguese documentation 2016-01-20 12:54:19 +01:00
3a59d13fd1 Merge pull request #1594 from araujo0205/patch-1
Create index.rst
2016-01-20 12:09:18 +01:00
e1101bee83 Create index.rst 2016-01-19 16:01:28 -02:00
3080a4afa4 Merge pull request #1587 from wallabag/v2-translator
Use translator interface instead of final class
2016-01-18 09:16:01 +01:00
e678c4752a Use translator interface instead of final class
Symfony use a different class when in dev mode and prod mode.

Prod loads `Symfony\Bundle\FrameworkBundle\Translation\Translator`.
Dev loads `Symfony\Component\Translation\DataCollectorTranslator` to gather information for the debug bar.

Fix #1585
2016-01-17 12:56:04 +01:00
3bcc4d4cb2 Merge pull request #1584 from wallabag/v2-cleanup
some cleanup
2016-01-15 16:29:06 +01:00
160e2d8f0b some cleanup:
* move capistrano config files
* remove useless files
2016-01-15 16:07:57 +01:00
f902d78153 Merge pull request #1564 from wallabag/v2-remove-flattr
Remove Flattr references
2016-01-15 16:01:13 +01:00
86719c63bf Merge pull request #1583 from wallabag/v2-fix-delete
Fix `findOneByUrl` side effect in tests
2016-01-15 15:47:13 +01:00
b91465c067 remove flattr on about page 2016-01-15 15:46:46 +01:00
1930c19d82 Merge pull request #1524 from wallabag/sf2.8
Upgrade to Symfony 3.0
2016-01-15 15:38:31 +01:00
7883367246 Fix findOneByUrl side effect in tests
Fix #1566
2016-01-15 15:28:32 +01:00
790573d458 Merge pull request #1560 from wallabag/v2-quickstart
Fix #1501 Quickstart for beginners
2016-01-15 15:21:43 +01:00
5c072d2b57 Quickstart for beginners 2016-01-15 15:01:30 +01:00
131eaa3e94 Update graby stuff 2016-01-15 11:05:51 +01:00
c7f622d369 Update readme & fix console permission 2016-01-15 09:36:32 +01:00
1fc8ed8794 Last deps update 2016-01-15 09:35:39 +01:00
d8dbe76bf5 Add assets config
To avoid :
> Twig_Error_Syntax: Unknown "asset" function in
2016-01-15 09:35:39 +01:00
ccf50a9fd8 Update path in build file 2016-01-15 09:35:39 +01:00
31e33fc42e Update to Symfony 3.0.x 2016-01-15 09:35:39 +01:00
73cd160bfc Switch to Symfony 3 structure 2016-01-15 09:35:39 +01:00
1d405d0e62 Remove some commented code 2016-01-15 09:35:39 +01:00
c38d27d421 Update to friendsofsymfony/oauth-server-bundle@1.5.0-BETA 2016-01-15 09:35:39 +01:00
27e475a941 Fix Pocket generateUrl parameters 2016-01-15 09:35:38 +01:00
6108b0f26c Update deps
LexikFormFilterBundle & RulerZBundle are now Symfony 3 compatible

There are still some issue with FOSOAuthServerBundle
2016-01-15 09:35:38 +01:00
1d76102a24 Fix recent update
- some missing url parameters from WallabagRestController & EntryController
- use a service for `EntryFilterType` to use fully qualified name instead (so changing class signature)
- update ImportBundle (url & form)
2016-01-15 09:35:38 +01:00
8ba854c068 TwoFactorBundle -> 2.0 2016-01-15 09:35:38 +01:00
b4faefc04d Switch to psr-4 2016-01-15 09:35:38 +01:00
5c895a7fd1 Update bundle & stock file
- update stock file (AppKernel, app.php, etc ..) from SymfonyStandard edition)
- update bundle to latest release
- remove security on profiler
2016-01-15 09:35:38 +01:00
619cc45359 Symfony Upgrade Fixer FTW
symfony-upgrade-fixer fix src/Wallabag/
2016-01-15 09:35:38 +01:00
516022d60e Improve composer.json
Following great article from Jordi: http://seld.be/notes/new-composer-patterns

Changelogs summary:

 - paragonie/random_compat updated from 1.1.1 to 1.1.4
   See changes: https://github.com/paragonie/random_compat/compare/1.1.1...1.1.4
   Release notes: https://github.com/paragonie/random_compat/releases/tag/1.1.4

 - doctrine/cache updated from v1.5.2 to v1.5.4
   See changes: https://github.com/doctrine/cache/compare/v1.5.2...v1.5.4
   Release notes: https://github.com/doctrine/cache/releases/tag/v1.5.4

 - sensio/framework-extra-bundle updated from v3.0.11 to v3.0.12
   See changes: https://github.com/sensiolabs/SensioFrameworkExtraBundle/compare/v3.0.11...v3.0.12
   Release notes: https://github.com/sensiolabs/SensioFrameworkExtraBundle/releases/tag/v3.0.12

 - nelmio/cors-bundle updated from 1.4.0 to 1.4.1
   See changes: https://github.com/nelmio/NelmioCorsBundle/compare/1.4.0...1.4.1
   Release notes: https://github.com/nelmio/NelmioCorsBundle/releases/tag/1.4.1

 - friendsofsymfony/rest-bundle updated from 1.7.4 to 1.7.6
   See changes: https://github.com/FriendsOfSymfony/FOSRestBundle/compare/1.7.4...1.7.6
   Release notes: https://github.com/FriendsOfSymfony/FOSRestBundle/releases/tag/1.7.6

 - nelmio/api-doc-bundle updated from 2.11.0 to 2.11.1
   See changes: https://github.com/nelmio/NelmioApiDocBundle/compare/2.11.0...2.11.1
   Release notes: https://github.com/nelmio/NelmioApiDocBundle/releases/tag/2.11.1

 - neitanod/forceutf8 updated from v1.5 to v2.0
   See changes: https://github.com/neitanod/forceutf8/compare/v1.5...v2.0
   Release notes: https://github.com/neitanod/forceutf8/releases/tag/v2.0

 - j0k3r/graby-site-config updated from 1.0.9 to 1.0.10
   See changes: https://github.com/j0k3r/graby-site-config/compare/1.0.9...1.0.10
   Release notes: https://github.com/j0k3r/graby-site-config/releases/tag/1.0.10

 - j0k3r/graby updated from 1.0.6 to 1.0.7
   See changes: https://github.com/j0k3r/graby/compare/1.0.6...1.0.7
   Release notes: https://github.com/j0k3r/graby/releases/tag/1.0.7

 - sebastian/diff updated from 1.4.0 to 1.4.1
   See changes: https://github.com/sebastianbergmann/diff/compare/1.4.0...1.4.1
   Release notes: https://github.com/sebastianbergmann/diff/releases/tag/1.4.1

 - phpunit/phpunit updated from 4.8.19 to 4.8.21
   See changes: https://github.com/sebastianbergmann/phpunit/compare/4.8.19...4.8.21
   Release notes: https://github.com/sebastianbergmann/phpunit/releases/tag/4.8.21

 - kphoen/rulerz updated from 0.16.1 to 0.16.2
   See changes: https://github.com/K-Phoen/rulerz/compare/0.16.1...0.16.2
   Release notes: https://github.com/K-Phoen/rulerz/releases/tag/0.16.2
2016-01-15 09:35:37 +01:00
bd2c8b4677 Wallabag now require PHP >= 5.5
See https://github.com/K-Phoen/rulerz/pull/21/files#diff-b5d0ee8c97c7abd7e3fa29b9a27d1780
2016-01-15 09:35:37 +01:00
30a40b0298 Remove weak deprecation 💥 2016-01-15 09:35:37 +01:00
e23edfd287 Update deps
Changelogs summary:

 - doctrine/cache updated from v1.5.1 to v1.5.2
   See changes: https://github.com/doctrine/cache/compare/v1.5.1...v1.5.2
   Release notes: https://github.com/doctrine/cache/releases/tag/v1.5.2

 - doctrine/common updated from v2.5.1 to v2.5.2
   See changes: https://github.com/doctrine/common/compare/v2.5.1...v2.5.2
   Release notes: https://github.com/doctrine/common/releases/tag/v2.5.2

 - symfony/polyfill-mbstring installed in version v1.0.0
   Release notes: https://github.com/symfony/polyfill-mbstring/releases/tag/v1.0.0

 - symfony/polyfill-util installed in version v1.0.0
   Release notes: https://github.com/symfony/polyfill-util/releases/tag/v1.0.0

 - paragonie/random_compat installed in version 1.1.1
   Release notes: https://github.com/paragonie/random_compat/releases/tag/1.1.1

 - symfony/polyfill-php70 installed in version v1.0.0
   Release notes: https://github.com/symfony/polyfill-php70/releases/tag/v1.0.0

 - symfony/polyfill-php56 installed in version v1.0.0
   Release notes: https://github.com/symfony/polyfill-php56/releases/tag/v1.0.0

 - ircmaxell/password-compat installed in version v1.0.4
   Release notes: https://github.com/ircmaxell/password_compat/releases/tag/v1.0.4

 - symfony/polyfill-php55 installed in version v1.0.0
   Release notes: https://github.com/symfony/polyfill-php55/releases/tag/v1.0.0

 - symfony/polyfill-php54 installed in version v1.0.0
   Release notes: https://github.com/symfony/polyfill-php54/releases/tag/v1.0.0

 - symfony/polyfill-intl-icu installed in version v1.0.0
   Release notes: https://github.com/symfony/polyfill-intl-icu/releases/tag/v1.0.0

 - symfony/symfony updated from v2.7.7 to v2.8.0
   See changes: https://github.com/symfony/symfony/compare/v2.7.7...v2.8.0
   Release notes: https://github.com/symfony/symfony/releases/tag/v2.8.0

 - symfony/security-acl installed in version v2.7.7
   Release notes: https://github.com/symfony/security-acl/releases/tag/v2.7.7

 - doctrine/orm updated from v2.5.1 to v2.5.2
   See changes: https://github.com/doctrine/doctrine2/compare/v2.5.1...v2.5.2
   Release notes: https://github.com/doctrine/doctrine2/releases/tag/v2.5.2

 - kriswallsmith/assetic updated from v1.3.1 to v1.3.2
   See changes: https://github.com/kriswallsmith/assetic/compare/v1.3.1...v1.3.2
   Release notes: https://github.com/kriswallsmith/assetic/releases/tag/v1.3.2

 - symfony/assetic-bundle updated from v2.7.0 to v2.7.1
   See changes: https://github.com/symfony/assetic-bundle/compare/v2.7.0...v2.7.1
   Release notes: https://github.com/symfony/assetic-bundle/releases/tag/v2.7.1

 - symfony/swiftmailer-bundle updated from v2.3.8 to v2.3.9
   See changes: https://github.com/symfony/swiftmailer-bundle/compare/v2.3.8...v2.3.9
   Release notes: https://github.com/symfony/swiftmailer-bundle/releases/tag/v2.3.9

 - symfony/monolog-bundle updated from 2.8.1 to v2.8.2
   See changes: https://github.com/symfony/monolog-bundle/compare/2.8.1...v2.8.2
   Release notes: https://github.com/symfony/monolog-bundle/releases/tag/v2.8.2

 - sensio/distribution-bundle updated from v3.0.33 to v3.0.34
   See changes: https://github.com/sensiolabs/SensioDistributionBundle/compare/v3.0.33...v3.0.34
   Release notes: https://github.com/sensiolabs/SensioDistributionBundle/releases/tag/v3.0.34

 - friendsofsymfony/rest-bundle updated from 1.7.2 to 1.7.4
   See changes: https://github.com/FriendsOfSymfony/FOSRestBundle/compare/1.7.2...1.7.4
   Release notes: https://github.com/FriendsOfSymfony/FOSRestBundle/releases/tag/1.7.4

 - nelmio/api-doc-bundle updated from 2.10.3 to 2.11.0
   See changes: https://github.com/nelmio/NelmioApiDocBundle/compare/2.10.3...2.11.0
   Release notes: https://github.com/nelmio/NelmioApiDocBundle/releases/tag/2.11.0

 - j0k3r/graby-site-config updated from 1.0.6 to 1.0.9
   See changes: https://github.com/j0k3r/graby-site-config/compare/1.0.6...1.0.9
   Release notes: https://github.com/j0k3r/graby-site-config/releases/tag/1.0.9

 - j0k3r/safecurl updated from v1.1.1 to 2.0.2
   See changes: https://github.com/j0k3r/safecurl/compare/v1.1.1...2.0.2
   Release notes: https://github.com/j0k3r/safecurl/releases/tag/2.0.2

 - j0k3r/graby updated from 1.0.4 to 1.0.6
   See changes: https://github.com/j0k3r/graby/compare/1.0.4...1.0.6
   Release notes: https://github.com/j0k3r/graby/releases/tag/1.0.6

 - scheb/two-factor-bundle updated from v1.4.7 to v1.5.0
   See changes: https://github.com/scheb/two-factor-bundle/compare/v1.4.7...v1.5.0
   Release notes: https://github.com/scheb/two-factor-bundle/releases/tag/v1.5.0

 - sebastian/recursion-context updated from 1.0.1 to 1.0.2
   See changes: https://github.com/sebastianbergmann/recursion-context/compare/1.0.1...1.0.2
   Release notes: https://github.com/sebastianbergmann/recursion-context/releases/tag/1.0.2

 - sebastian/environment updated from 1.3.2 to 1.3.3
   See changes: https://github.com/sebastianbergmann/environment/compare/1.3.2...1.3.3
   Release notes: https://github.com/sebastianbergmann/environment/releases/tag/1.3.3

 - sebastian/diff updated from 1.3.0 to 1.4.0
   See changes: https://github.com/sebastianbergmann/diff/compare/1.3.0...1.4.0
   Release notes: https://github.com/sebastianbergmann/diff/releases/tag/1.4.0

 - phpunit/phpunit updated from 4.8.18 to 4.8.19
   See changes: https://github.com/sebastianbergmann/phpunit/compare/4.8.18...4.8.19
   Release notes: https://github.com/sebastianbergmann/phpunit/releases/tag/4.8.19

 - symfony/phpunit-bridge updated from v2.7.7 to v2.8.0
   See changes: https://github.com/symfony/phpunit-bridge/compare/v2.7.7...v2.8.0
   Release notes: https://github.com/symfony/phpunit-bridge/releases/tag/v2.8.0

 - doctrine/doctrine-cache-bundle updated from 1.2.1 to 1.2.2
   See changes: https://github.com/doctrine/DoctrineCacheBundle/compare/1.2.1...1.2.2
   Release notes: https://github.com/doctrine/DoctrineCacheBundle/releases/tag/1.2.2

 - doctrine/doctrine-bundle updated from v1.5.2 to 1.6.1
   See changes: https://github.com/doctrine/DoctrineBundle/compare/v1.5.2...1.6.1
   Release notes: https://github.com/doctrine/DoctrineBundle/releases/tag/1.6.1

 - phpzip/phpzip updated from 2.0.7 to 2.0.8
   See changes: https://github.com/Grandt/PHPZip/compare/2.0.7...2.0.8
   Release notes: https://github.com/Grandt/PHPZip/releases/tag/2.0.8

 - kphoen/rulerz updated from 0.14.0 to 0.16.1
   See changes: https://github.com/K-Phoen/rulerz/compare/0.14.0...0.16.1
   Release notes: https://github.com/K-Phoen/rulerz/releases/tag/0.16.1

 - friendsofsymfony/user-bundle updated from dev-master to dev-master
   See changes: 45d6f40...e39b040
2016-01-15 09:35:37 +01:00
9ee44a109a Merge pull request #1574 from jjanvier/readme
Fix typo and set version in the README
2016-01-14 07:50:55 +01:00
6663d49329 Fix typo and set version in the README 2016-01-14 00:47:17 +01:00
0aafb8dfcb Merge pull request #1561 from FabienM/docker-compose
Add basic docker-compose configuration
2016-01-11 09:08:39 +01:00
8b909e7ea7 Add documentation to run docker-compose 2016-01-10 15:01:20 +01:00
1d41effebc Add Docker configuration for Postgres and MariaDB 2016-01-10 15:01:11 +01:00
540ef5e084 Add basic docker-compose configuration 2016-01-10 14:41:42 +01:00
4aa2997106 Merge pull request #1563 from wallabag/v2-fix-1394
#1394 Fixed 'mark as read' and 'mark as unread' links
2016-01-10 10:20:16 +01:00
c60b549313 Merge pull request #1562 from wallabag/v2-add-import-baggy
add import link on baggy theme
2016-01-10 10:17:27 +01:00
6c9bad13e1 Fixed 'mark as read' and 'mark as unread' links 2016-01-09 22:20:19 +01:00
da82839bf8 add import link on baggy theme 2016-01-09 20:33:09 +01:00
5ad863c63a Merge pull request #1558 from wallabag/v2-documentation
[v2] documentation cleaning
2016-01-09 17:33:27 +01:00
1caf557de7 Merge pull request #1559 from wallabag/v2-doctrine-migrations
Installation & configuration of Doctrine Migrations
2016-01-09 14:43:06 +01:00
e1b9f4fb37 Update deps
Changelogs summary:

 - doctrine/dbal updated from v2.5.3 to v2.5.4
   See changes: https://github.com/doctrine/dbal/compare/v2.5.3...v2.5.4
   Release notes: https://github.com/doctrine/dbal/releases/tag/v2.5.4

 - doctrine/orm updated from v2.5.3 to v2.5.4
   See changes: https://github.com/doctrine/doctrine2/compare/v2.5.3...v2.5.4
   Release notes: https://github.com/doctrine/doctrine2/releases/tag/v2.5.4

 - nelmio/api-doc-bundle updated from 2.11.1 to 2.11.2
   See changes: https://github.com/nelmio/NelmioApiDocBundle/compare/2.11.1...2.11.2
   Release notes: https://github.com/nelmio/NelmioApiDocBundle/releases/tag/2.11.2

 - friendsofsymfony/user-bundle updated from dev-master to dev-master
   See changes: e5e7a2b...6ccff96
2016-01-09 14:24:09 +01:00
a42938f42c documentation cleaning 2016-01-09 13:50:45 +01:00
292c1324e9 Installation & configuration of Doctrine Migrations 2016-01-08 16:27:29 +01:00
39643c6b76 Merge pull request #1493 from wallabag/v2-pocket-import
v2 – 1st draft for Pocket import via API & Wallabag v1 import
2016-01-07 22:15:08 +01:00
b88cf91fc8 updated tests 2016-01-07 21:00:04 +01:00
488a468e3e Merge pull request #1553 from wallabag/v2-hide-export-button
Hide export button if we are not on entries list
2016-01-06 21:25:41 +01:00
10b2411c10 Hide export button if we are not on entries list 2016-01-06 07:47:09 +01:00
d1af8ad4db Added french translations 2016-01-05 22:38:09 +01:00
8eedc8cfac Few phpDoc fix
And some little mistakes
2016-01-03 11:15:44 +01:00
c5c7f90a81 Fix tag related test for Pocket 2016-01-03 10:32:56 +01:00
5b2b5858fe Update deps 2016-01-02 23:31:41 +01:00
6d7c7a6e3f Remove real consumer key
We should never commit them :)
2016-01-02 23:27:41 +01:00
7019c7cf6c Add tagged services for import
- list services in /import
- add url to import service
- ImportBundle routing are now prefixed by /import
- optimize flush in each import (flushing each 20 contents)
- improve design of each import
- add more tests
2016-01-02 23:27:41 +01:00
b1d05721cf Rewrote Wallabag v1 import 2016-01-02 23:27:41 +01:00
252ebd6071 Rewrote Pocket Import
For the moment, we won't do a queue system, just a plain synchronous import.
We also use ContentProxy to grab content for each article from Pocket.
Error from Pocket are now logged using the logger.
The ImportInterface need to be simple and not related to oAuth (not all import will use that method).
2016-01-02 23:27:41 +01:00
b4b592a0c0 Fix the way to check for an existing entry
Instead of requiring more than 1 entry (> 1) we have to check for at least one entry (> 0)
2016-01-02 23:27:41 +01:00
77a7752a59 Update after previous merge
PR #1443 was merged into this branch to handle all import type in the same place.
2016-01-02 23:27:41 +01:00
7ec2897ee0 First test on PocketImport
Giving ability to define the Client add abitliy to easliy test the import.
2016-01-02 23:27:41 +01:00
0aa344dc24 Update url & service name
Prefix ur with service namel: [service]_[route name]
Add comment in Interface
2016-01-02 23:27:41 +01:00
5a4bbcc9a7 Change the way to check for an existing entry
The repository method return the entry found or false if nothing exists.
2016-01-02 23:27:41 +01:00
27a8708b67 Update deps 2016-01-02 23:27:41 +01:00
303768dfe9 - remove importers configuration
- add check on userId for findOneByURL for entries
2016-01-02 23:27:41 +01:00
dda57bb944 fix #1502 avoid duplicate entry and store pocket url in config 2016-01-02 23:24:17 +01:00
87f23b005c assign tags to entries and add lastPocketImport attribute to user 2016-01-02 23:24:17 +01:00
d51b38ed30 create ImportController to list importers 2016-01-02 23:24:17 +01:00
557e549db7 service call 2016-01-02 23:24:17 +01:00
9c9c23cf08 forgot test parameters 2016-01-02 23:24:17 +01:00
ff7b031d57 refactor pocket import 2016-01-02 23:24:17 +01:00
1f4408de9e 1st draft for Pocket import via API 2016-01-02 23:24:17 +01:00
10b40f85d6 add docs for Import feature 2016-01-02 23:24:17 +01:00
d275bdf4d3 form to upload file 2016-01-02 23:24:17 +01:00
8c3c77c1bd create controller to launch import command 2016-01-02 23:24:17 +01:00
a1bb1b3c2a userId is now set in parameters 2016-01-02 23:24:17 +01:00
56ea1de99b first draft for json import, needed for wallabag v1 migration 2016-01-02 23:24:17 +01:00
dad1c546a5 Merge pull request #1545 from wallabag/v2-user-tag
v2 – Remove user reference in tag
2016-01-02 12:46:52 +01:00
5432f61509 Merge pull request #1546 from wallabag/v2-reload-content
v2 – Ability to reload an entry
2016-01-02 12:46:09 +01:00
00a051add4 Merge pull request #1547 from wallabag/v2-mistakes
v2 – Fix wrong if when deleting an entry
2016-01-02 12:45:08 +01:00
e82160e5e9 Fix wrong if when deleting an entry
Bad condition when deleting an entry returned `true` instead of the referer url
2015-12-30 11:32:53 +01:00
0cf434c00f Backport all icomoon from v1
And add a reload icon
2015-12-30 09:53:52 +01:00
831b02aaf2 Ability to reload an entry
Could be useful when we want to update the content or when the content failed to be fetched.

Fix #1503
2015-12-30 09:41:17 +01:00
6be9750155 Removed comment
And move the SQL query inside the php doc
2015-12-29 21:59:34 +01:00
e6a228c43b Merge pull request #1544 from wallabag/2fa-email
v2 – Add custom email for 2FA
2015-12-29 20:32:58 +01:00
4059a061c0 Fix the way to remove a tag from all user entries 2015-12-29 15:43:32 +01:00
1bb1939ab7 Cleanup tests
- WallabagRestController: remove the tag deletion from the API since we can't remove a tag now, we only remove reference to entries
- RuleBasedTaggerTest: remove workaround for asserting tag are equal since problem was related to mock expects (_call instead of findOneByLabel which was removed from the tag repository)
2015-12-29 15:04:46 +01:00
01fddd0cb2 Fix parameters regarding documentation
Parameters are `star` & `archived`, not `is_starred` & `is_archived`
2015-12-29 14:54:55 +01:00
fc73222723 Remove user reference in tag
Fix #1543
2015-12-29 14:50:52 +01:00
ab64c3d9ac PHP 7.0 must not fail 2015-12-29 11:41:35 +01:00
23ff8d3619 Add custom email for 2FA
Related #1490
2015-12-29 11:17:06 +01:00
c997cfcc9c Merge pull request #1540 from wallabag/v2-fix-delete
v2 – 	Don't redirect to the content page after deletion
2015-12-28 13:51:48 +01:00
2863bf2ab5 Don't redirect to the content page after deletion
Fix #1512

We generate the url of the removed content and compare it to the referer url. If they matche, we redirect user to the homepage otherwise to the referer url.
2015-12-28 13:42:50 +01:00
71eff67f8b Entry data should have unique url 2015-12-28 13:42:50 +01:00
d25b828821 Merge pull request #1542 from wallabag/v2-avoid-duplicate-tag
v2 – 	Avoid multiple tag creation
2015-12-28 13:37:13 +01:00
e9fa8c40aa Add test on tagAllForUser
And fix multiplication of entries returned by `tagAllForUser`.
2015-12-28 13:20:48 +01:00
fc031e5706 Avoid multiple tag creation
When a new tag is created but not yet persisted, it can be duplicated.
It could happen when multiple rules match the content and at least 2 of them should attach same new tag.

Fix #1528
2015-12-28 13:20:48 +01:00
82899c0402 Merge pull request #1488 from wallabag/v2-slug-tags
Slug for tags
2015-12-28 13:12:30 +01:00
3c65dfb735 add slug for tags 2015-12-28 12:49:45 +01:00
22c1d29b89 Merge pull request #1537 from bdunogier/update_lock
Updated composer.lock
2015-12-24 08:37:27 +01:00
d4aa174367 Updated composer.lock
Had to restrict scheb/two-factor-bundle to ~1.4.0 because of a circular service reference.
See https://github.com/scheb/two-factor-bundle/issues/33.

Also updated php version requirement to 5.5.0.
2015-12-23 22:49:03 +01:00
da2240f9d4 Merge pull request #1529 from wallabag/v2-taggingrule-tablename
changed table name for tagging rule
2015-12-08 09:35:27 +01:00
347fa6beb0 php cs 2015-12-08 09:20:03 +01:00
c5d0db8b71 changed table name for tagging rule 2015-12-08 09:05:56 +01:00
a7f1921f7d Merge pull request #1478 from K-Phoen/rule-based-tags
Rule based tags
2015-12-06 14:31:26 +01:00
2e15e30bf0 Merge pull request #1523 from wallabag/tcitworld-patch-1
Typo
2015-12-04 06:43:40 +01:00
a24c1ee30a Typo 2015-12-04 00:17:07 +01:00
f4b617f2ff Merge pull request #1518 from mathbruyen/smtp-from-env
Set SMTP from environment variables
2015-12-03 08:43:40 +01:00
752b90d1f2 Fix tagging rules ordering 2015-11-29 16:19:02 +01:00
59507c5b24 SMTP configuration through environment
Configuring SMTP parameters required to be written in files which is not
convenient when using docker containers as the credentials need to be in
the filesystem.

Created environment parameters override for those parameters. A new build
script created in order to generate those parameters right before
launching the application.
2015-11-26 10:44:03 +01:00
c13eda461f Clean the tagging rule creation form 2015-11-16 14:01:43 +01:00
69edb774eb Assert that the tag has is the good one 2015-11-16 13:34:00 +01:00
958671a7ae Add a quick test 2015-11-13 22:53:28 +01:00
aeff8aa765 Document the matches operator in the FAQ 2015-11-13 20:57:46 +01:00
f27aca26f6 Add phpdoc for all Matches implementations 2015-11-13 20:50:09 +01:00
a6e27f7466 Add matches operator 2015-11-13 14:37:58 +01:00
5c514b0be3 Improve the tagging rules documentation 2015-11-11 17:06:36 +01:00
b7b2005494 Fix the creation of the repository services 2015-11-11 16:44:57 +01:00
6cbbf1481a Update rulerz-bundle 2015-11-11 16:39:28 +01:00
0c5bcd82ba Use Psr\Log\NullLogger instead of creating a mock 2015-11-11 16:27:53 +01:00
7b1648961d Fix incorrect comment. 2015-11-11 16:27:19 +01:00
8a99c7a86b Add a few functional tests for the tagging rules creation form 2015-11-11 16:27:19 +01:00
9b88658c04 Update baggy theme 2015-11-11 16:27:19 +01:00
52e423f307 Provide a way to delete tagging rules 2015-11-11 16:27:19 +01:00
625acf3352 Add a command to automatically tag all entries for a user 2015-11-11 16:27:19 +01:00
cad8cda7af Use a tagged version of kphoen/rulerz-bundle 2015-11-11 16:25:44 +01:00
c23fc05df8 Validate used operators when creating tagging rules 2015-11-11 16:23:49 +01:00
5a166c5c1a Add tests for the RuleBasedTagger class 2015-11-11 16:23:49 +01:00
1c9cd2a7f0 Errors in the automatic tagging do not prevent the entry from being added 2015-11-11 16:23:49 +01:00
1dc4e5da2e Also validate used variables when creating tagging rules 2015-11-11 16:23:49 +01:00
3447d1ee07 Add naïve validation for tagging rules (only checks the syntax) 2015-11-11 16:23:49 +01:00
71ef0ed254 Rename the « Tags » tab to « Tagging rules » 2015-11-11 16:23:49 +01:00
003fa77438 Add tests for the StringToListTransformer class 2015-11-11 16:23:49 +01:00
f530f7f5e1 Fix ContentProxyTest 2015-11-11 16:23:49 +01:00
1d7b350b25 Add missing use statement 2015-11-11 16:23:49 +01:00
e9fbd2d12e Add a table explaining the available variables 2015-11-11 16:23:49 +01:00
981cacf7b9 Display the tagging rules in the config 2015-11-11 16:23:49 +01:00
9cbb404b4a Add missing tagging rule repository 2015-11-11 16:23:49 +01:00
f19f9f62d1 Add a form to create tagging rules 2015-11-11 16:23:49 +01:00
ac9fec610a Add TaggingRule entity 2015-11-11 16:23:49 +01:00
c3510620ad PoC of rule-based tagging 2015-11-11 16:23:49 +01:00
0a0c600887 Merge pull request #1422 from wallabag/v2-ebook
V2 – Export entries
2015-11-09 16:45:48 +01:00
16bbb4aa41 Update deps 2015-11-09 16:35:09 +01:00
fba3f536a5 Fix tests 2015-11-09 16:32:48 +01:00
cceca9ea1d Fix route parameters
Improve export tests
Improve CSV export
2015-11-09 16:32:48 +01:00
268e9e7277 use JMS Serializer 2015-11-09 16:32:48 +01:00
5b7da07620 use the groups annotation instead of setIgnoredAttributes 2015-11-09 16:32:48 +01:00
8ac95cbfcc improved function 2015-11-09 16:32:48 +01:00
b3cc1a14e7 add json & xml 2015-11-09 16:32:48 +01:00
33c36f6b48 Fix tests on pgsql 2015-11-09 16:32:48 +01:00
add597bad9 Rework on export
- all export now return a `HttpFoundation\Response`
- return a 404 on unsupported format
- add tests
2015-11-09 16:32:48 +01:00
03690d1387 Start work on export
For now:
 - ebook
 - mobi
 - pdf
 - csv
2015-11-09 16:32:48 +01:00
f1eccfd63f Merge pull request #1500 from wallabag/v2-quote-pgsql
Fix quote strategy for reserved keyword in Postgres
2015-11-09 16:31:59 +01:00
53cf510689 Lock DoctrineBundle to 1.5.2
Because of a bad change, SQLite database cannot be created anymore.

➡️ https://github.com/doctrine/DoctrineBundle/pull/434
2015-11-08 10:47:56 +01:00
970e0e994f Remove duplicate comments 2015-11-07 14:18:38 +01:00
75c48e3ae0 CS 2015-11-07 14:16:13 +01:00
d502762598 Skipping PostgreSQL test that drop database
For a not-clear reason, I can't properly drop the current database. Even if Doctrine made a special case for that (https://github.com/doctrine/dbal/pull/849).

So instead of trying crazy things to achieve the test, better way is to skip test (too much wasted days ..)
2015-11-07 14:16:13 +01:00
8a493541fa Re-enable test on doctrine command
It will slow down the whole test suite (because it'll use doctrine command).
Remove unecessary `KernelTestCase`.
Also rename `AbstractControllerTest` to `WallabagApiTestCase` for consistency.
2015-11-07 14:16:13 +01:00
735068d181 Add tests on TablePrefixSubscriber 2015-11-07 14:15:33 +01:00
bd0f3d32c9 Quoted entity to avoid reserved keyword
Should fix #1498
2015-11-07 14:15:33 +01:00
54a2241e13 Fix database already exist detection
This is not the same message exception from MySQL & SQLite with Postgres.
2015-11-07 14:15:33 +01:00
4529d0f4b6 Merge pull request #1510 from wallabag/v2-sf3
v2 – Fix some deprecated for Symfony3
2015-11-07 13:39:30 +01:00
164d260c49 CS
Also force SYMFONY_DEPRECATIONS_HELPER for travis
2015-11-07 00:27:41 +01:00
b2a903feef Avoid other bundle deprecation to cancel the build 2015-11-07 00:18:46 +01:00
33fe61f92f Fix form_enctype deprecation
Use form_start instead
2015-11-07 00:18:06 +01:00
18f8f32f70 Fix security.context deprecation 2015-11-07 00:17:37 +01:00
5ead137fe6 Fix pattern deprecation
Replaced by path
2015-11-07 00:16:26 +01:00
78507d2835 Fix deprecated helper in command 2015-11-06 23:39:19 +01:00
872384b0c1 Update deps & add PHPUnit Bridge
Changelogs summary:

 - symfony/phpunit-bridge installed in version v2.7.6
   Release notes: https://github.com/symfony/phpunit-bridge/releases/tag/v2.7.6

 - twig/twig updated from v1.23.0 to v1.23.1
   See changes: https://github.com/twigphp/Twig/compare/v1.23.0...v1.23.1
   Release notes: https://github.com/twigphp/Twig/releases/tag/v1.23.1

 - doctrine/inflector updated from v1.0.1 to v1.1.0
   See changes: https://github.com/doctrine/inflector/compare/v1.0.1...v1.1.0
   Release notes: https://github.com/doctrine/inflector/releases/tag/v1.1.0

 - doctrine/cache updated from v1.5.0 to v1.5.1
   See changes: https://github.com/doctrine/cache/compare/v1.5.0...v1.5.1
   Release notes: https://github.com/doctrine/cache/releases/tag/v1.5.1

 - doctrine/doctrine-cache-bundle updated from v1.0.1 to 1.2.1
   See changes: https://github.com/doctrine/DoctrineCacheBundle/compare/v1.0.1...1.2.1
   Release notes: https://github.com/doctrine/DoctrineCacheBundle/releases/tag/1.2.1

 - doctrine/doctrine-bundle updated from v1.5.2 to 1.6.0
   See changes: https://github.com/doctrine/DoctrineBundle/compare/v1.5.2...1.6.0
   Release notes: https://github.com/doctrine/DoctrineBundle/releases/tag/1.6.0

 - friendsofsymfony/user-bundle updated from dev-master to dev-master
   See changes: d5b28c3...45d6f40
2015-11-06 23:39:14 +01:00
3d9ccf9390 Merge pull request #1505 from wallabag/v2-graby-log
Add graby log
2015-11-02 07:52:28 +01:00
386cd24663 Update deps
Changelogs summary:

 - twig/twig updated from v1.22.3 to v1.23.0
   See changes: https://github.com/twigphp/Twig/compare/v1.22.3...v1.23.0
   Release notes: https://github.com/twigphp/Twig/releases/tag/v1.23.0

 - doctrine/cache updated from v1.4.2 to v1.5.0
   See changes: https://github.com/doctrine/cache/compare/v1.4.2...v1.5.0
   Release notes: https://github.com/doctrine/cache/releases/tag/v1.5.0

 - symfony/symfony updated from v2.7.5 to v2.7.6
   See changes: https://github.com/symfony/symfony/compare/v2.7.5...v2.7.6
   Release notes: https://github.com/symfony/symfony/releases/tag/v2.7.6

 - sensio/distribution-bundle updated from v3.0.31 to v3.0.33
   See changes: https://github.com/sensiolabs/SensioDistributionBundle/compare/v3.0.31...v3.0.33
   Release notes: https://github.com/sensiolabs/SensioDistributionBundle/releases/tag/v3.0.33

 - nelmio/api-doc-bundle updated from 2.9.0 to 2.10.3
   See changes: https://github.com/nelmio/NelmioApiDocBundle/compare/2.9.0...2.10.3
   Release notes: https://github.com/nelmio/NelmioApiDocBundle/releases/tag/2.10.3

 - lexik/form-filter-bundle updated from v4.0.1 to v4.0.2
   See changes: https://github.com/lexik/LexikFormFilterBundle/compare/v4.0.1...v4.0.2
   Release notes: https://github.com/lexik/LexikFormFilterBundle/releases/tag/v4.0.2

 - j0k3r/graby-site-config updated from 1.0.5 to 1.0.6
   See changes: https://github.com/j0k3r/graby-site-config/compare/1.0.5...1.0.6
   Release notes: https://github.com/j0k3r/graby-site-config/releases/tag/1.0.6

 - j0k3r/graby updated from 1.0.2 to 1.0.4
   See changes: https://github.com/j0k3r/graby/compare/1.0.2...1.0.4
   Release notes: https://github.com/j0k3r/graby/releases/tag/1.0.4

 - phpunit/phpunit updated from 4.8.13 to 4.8.16
   See changes: https://github.com/sebastianbergmann/phpunit/compare/4.8.13...4.8.16
   Release notes: https://github.com/sebastianbergmann/phpunit/releases/tag/4.8.16
2015-10-30 08:00:43 +01:00
c929c88faf Enable graby log 2015-10-24 10:53:55 +02:00
e686b5e6fe Merge pull request #1495 from wallabag/v2-docs
add docs
2015-10-22 17:02:06 +02:00
71200c4155 Merge pull request #1496 from wallabag/v2-redirect-after-deletion
fix #1005 V2 redirect after deletion
2015-10-22 09:28:54 +02:00
18d5f4541e redirect on last page after deletion 2015-10-21 15:26:37 +02:00
59e91bc893 add docs 2015-10-21 14:14:51 +02:00
a4e1ddf2d6 Merge pull request #1491 from jlnostr/v2-german-translation
Add german translation.
2015-10-19 09:21:43 +02:00
57cf6fd76c Add language to config.yml 2015-10-18 22:04:50 +02:00
37a564a868 Add german translation. 2015-10-18 21:26:09 +02:00
fcc6949d4a Merge pull request #1446 from wallabag/v2-language-config
[WIP] language selection on config screen
2015-10-18 15:35:42 +02:00
2aac2f278f Add tests on listeners 2015-10-16 07:40:09 +02:00
c89d35e851 Language selection on config screen 2015-10-15 21:42:29 +02:00
3d3ed955f1 Merge pull request #1484 from wallabag/v2-2factor-auth
2factor authentication via email
2015-10-15 13:52:52 +02:00
e9b395ec4b forgot parameters for travis 2015-10-15 13:20:44 +02:00
18cf594f8a move 2factor activation in parameters 2015-10-15 13:17:21 +02:00
0d6a7929e1 add tests for 2factor authentication 2015-10-14 17:10:12 +02:00
f6af634aec Merge pull request #1475 from modos189/v2_material
V2 material
2015-10-14 12:01:30 +02:00
2db616b586 2factor authentication via email 2015-10-13 22:43:15 +02:00
c26a3edc0a Other improvements 2015-10-09 13:00:15 +03:00
ba873ae667 Icons in footer 2015-10-09 12:43:42 +03:00
cf0ea8f113 Merge pull request #1472 from wallabag/v2-clean-views
fix #1470: clean material theme
2015-10-08 13:44:04 +02:00
9dbcf9d418 Merge pull request #1471 from wallabag/v2-bookmarklet
implement bookmarklet
2015-10-08 13:43:53 +02:00
fa853bb603 fix #1470: clean material theme 2015-10-08 13:32:34 +02:00
880a0e1c0b implement bookmarklet 2015-10-08 13:29:41 +02:00
3bfbd22f13 Merge pull request #1468 from wallabag/v2-fix-detect-theme
fix bug on detect active theme
2015-10-06 20:57:54 +02:00
ce782c84b8 fix bug on detect active theme 2015-10-06 20:51:40 +02:00
3123b3c0c8 Merge pull request #1464 from wallabag/v2-fix-type-hint
fix type hint for User
2015-10-06 12:24:18 +02:00
1ce8f30342 fix type hint for User 2015-10-06 12:16:08 +02:00
16dabc3263 Merge pull request #1436 from wallabag/v2-register
Public registration & oAuth2 \o/
2015-10-06 09:19:06 +02:00
fdef5f4605 Merge pull request #1461 from wallabag/v2-test-for-www
fix #1433: add test for removeWww Twig Extension
2015-10-06 09:16:52 +02:00
794dc4ee8a Merge pull request #1459 from wallabag/v2-tags-chips
fix #1457 & update materialize
2015-10-06 09:09:56 +02:00
784bb4c38d add test for removeWww Twig Extension 2015-10-06 09:09:26 +02:00
8263e71192 use form widget for registration 2015-10-06 07:44:10 +02:00
68e9dcf615 restore blue color 2015-10-06 06:16:17 +02:00
e0d188809c move css 2015-10-05 22:49:46 +02:00
d30262154a last changes for baggy theme 2015-10-05 22:45:44 +02:00
ec3ce598f6 material design for register/login/recover pages 2015-10-05 22:16:18 +02:00
9c8f7af196 fix #1457 2015-10-05 21:37:17 +02:00
4c5e544183 Cleanup
- remove unecessary routing for UserBundle
- remove unused form type
2015-10-03 13:37:21 +02:00
0a878469d4 move some files to UserBundle 2015-10-03 13:31:48 +02:00
1210dae105 remove old implementation for login/register/recover 2015-10-03 13:31:48 +02:00
772d8c4b93 Add test on RegistrationConfirmedListener
And PLEASE @nicosomb, NEVER EVER inject the whole container inside a service.
2015-10-03 13:30:43 +02:00
2c13918acc add test for confirmed registration 2015-10-03 13:30:43 +02:00
359b3f43cc * rename AuthenticationListener
* add tests
2015-10-03 13:30:43 +02:00
772732531e check authentication on each API route 2015-10-03 13:30:43 +02:00
cd1298d6df allow API documentation for anonymous 2015-10-03 13:30:43 +02:00
fcb1fba5c2 * public registration
* remove WSSE implementation
* add oAuth2 implementation
2015-10-03 13:30:43 +02:00
8a60bc4cc2 Merge pull request #1447 from wallabag/v2-typo
typo
2015-10-01 19:58:58 +02:00
4b55e704ab typo 2015-10-01 18:48:38 +02:00
0e8f778199 Merge pull request #1441 from wallabag/v2-french-translation
Add french translation
2015-10-01 11:49:13 +02:00
4e9f656ecb restore footer 2015-10-01 11:38:59 +02:00
cfb28c9da0 french translation 2015-10-01 09:26:52 +02:00
8e417206d5 flash messages translation 2015-09-30 18:17:40 +02:00
4aafa7f0df french translation 2015-09-30 18:09:18 +02:00
4f0dfac6a6 add french translation 2015-09-30 17:06:41 +02:00
7c99da0c95 Merge pull request #1437 from wallabag/v2-clean-material
some cleanup on material theme
2015-09-30 09:05:03 +02:00
24429857d8 Merge pull request #1439 from wallabag/v2-fix-deploy
fix Capistrano configuration
2015-09-30 08:49:00 +02:00
d2755b1c30 Merge pull request #1440 from wallabag/v2-fix-1433
fix #1433: remove www. on entries view
2015-09-29 23:23:58 +02:00
2afdea1ccc forgot one file 2015-09-29 23:11:27 +02:00
72fcaf8a6c remove www. on entries view 2015-09-29 22:59:44 +02:00
e75b215a25 fix Capistrano configuration 2015-09-29 22:13:07 +02:00
b0b352fc8e some cleanup on material theme 2015-09-29 20:26:32 +02:00
917040d4a0 Merge pull request #1434 from wallabag/travis-db
Add multiple database tests on Travis
2015-09-28 22:57:11 +02:00
fef4124130 Enabled Tidy on travis for HHVM 2015-09-28 20:35:56 +02:00
02d17813a1 Fix tests for all 2015-09-28 20:26:37 +02:00
159986c4fb Fix Postgres tests 2015-09-28 19:35:55 +02:00
da3d4998c0 Move readingTime & domainName in ContentProxy
So, everything is centralized in one place when we save a new entry.
2015-09-28 19:35:33 +02:00
4180fddac1 Merge pull request #1435 from wallabag/v2-enabled-user
Enabled created user from Config
2015-09-26 20:19:42 +02:00
34c2cc7a1a Use tecnickcom/tcpdf
tecnick.com/tcpdf is abandonned.
2015-09-26 19:51:26 +02:00
0f30f48b93 Enabled created user from Config
By default, creating user with FOSUser are disabled by default.

Fix #1423
2015-09-26 19:45:14 +02:00
609594fa5e Fix authentication error from Github
From: http://blog.wyrihaximus.net/2015/09/github-auth-token-on-travis/
2015-09-26 19:23:20 +02:00
dc22b46bf3 Fix HHVM & PHP 7.0 2015-09-26 19:06:32 +02:00
03fb6fde5f Add multiple database tests on Travis 2015-09-26 11:56:15 +02:00
5716249455 Merge pull request #1429 from wallabag/v2-language
V2 – Handle language in entry
2015-09-23 09:13:34 +02:00
d4ebe5c5dc Entries filter on language
+ updated deps
2015-09-23 07:55:55 +02:00
0d3bafdfdf Remove tab from baggy css
And add a border left on the filter slider
2015-09-23 07:51:17 +02:00
98f0929f16 Handle entry in language
Fix #1333
2015-09-22 20:52:13 +02:00
db96045a0a Adjust preview picture 2015-09-20 22:36:51 +02:00
1db9d411c5 Merge pull request #1420 from modos189/v2_display_picture
improved display pictures
2015-09-14 17:15:40 +02:00
451bad02f0 improved display pictures 2015-09-14 02:12:39 +03:00
b004a236ba Merge pull request #1401 from wallabag/v2-baggy-themes
Cleanup baggy
2015-09-13 21:07:27 +02:00
1a5f7e2d88 A little more width for filter view 2015-09-13 19:53:09 +02:00
5e98404dfb Re-add preview picture on baggy
Which should has been removed on merge
2015-09-13 15:17:58 +02:00
463573bf69 Update deps 2015-09-13 15:07:15 +02:00
5def3f5862 Filters view on side for baggy 2015-09-13 14:56:34 +02:00
71e51207ce Fix tests 2015-09-13 14:56:34 +02:00
1137fae94d Lower domain search length
When searching for "bbc" I got no result .. sigh.
2015-09-13 13:35:12 +02:00
d2fcbf5d84 Handle filter form using some JS
Instead of displaying an ugly form
2015-09-13 13:35:12 +02:00
19c283140e Cleanup base layout 2015-09-13 13:35:12 +02:00
89ee994f77 Remove some global assets
Some global assets where dedicated to baggy
Remove some non-used css
2015-09-13 13:35:12 +02:00
a78d6afeaa Move baggy theme in its folder 2015-09-13 13:35:12 +02:00
4d5fd9be81 Merge pull request #1417 from wallabag/v2-display-picture
fix #972: add preview pictures
2015-09-13 11:41:23 +02:00
40f59b219b Merge pull request #1418 from wallabag/v2-previewpicture-filter
filter for entries with previewPicture
2015-09-13 10:14:42 +02:00
497e0cad7c add test for previewPicture filter 2015-09-13 10:11:22 +02:00
b026d3b115 add previewPicture on baggy theme 2015-09-13 10:03:53 +02:00
616f9fea26 forgot case for previewPicture filter 2015-09-13 08:43:15 +02:00
a3bcd60a37 filter for entries with previewPicture 2015-09-12 17:08:12 +02:00
fb96ea8845 Merge pull request #1362 from wallabag/v2-fosuser
implement FosUser
2015-09-12 16:13:40 +02:00
e610143f51 add preview pictures 2015-09-12 13:39:01 +02:00
af43bd3767 Fix tests
Ensure that created use during install command will always be unique.
We assume that the install command must be run to initialize a wallabag instance. NEVER to add more user.

Also, use a better way to retrieve the real name of the database and not the one defined in parameters.yml (which isn't the same for test envi because the dbname isn't defined in parameters.yml but directly in config_test.yml)
2015-09-12 11:36:16 +02:00
3f7a62908c fix tests for FosUser 2015-09-11 20:32:37 +02:00
a1691859ca implement FosUser 2015-09-11 20:32:37 +02:00
9c08a891f9 Merge pull request #1397 from wallabag/v2-graby
Integrate graby
2015-09-11 20:17:42 +02:00
f1e29e69cb CS 2015-09-10 22:00:53 +02:00
558d9aabab Move fetching content in a separate class 2015-09-10 21:57:25 +02:00
75c3478a0c Update deps 2015-09-10 15:09:44 +02:00
49e564ec15 Merge pull request #1403 from wallabag/v2-material-full-size-domain-filter
Use full size of the panel for domain-filtering
2015-08-26 07:13:11 +02:00
e643992350 typo 2015-08-26 00:24:33 +02:00
b125ed0394 Use full size of the panel for domain-filtering
For longer domains
2015-08-26 00:19:17 +02:00
c6da9bea71 Merge pull request #1400 from wallabag/v2-fix-1357
fix #1357, truncate domain name if it's too loooong
2015-08-25 07:51:55 +02:00
50243f0e34 fix #1357, truncate domain name if it's too loooong 2015-08-24 22:09:57 +02:00
d13de40db6 Update url from graby 2015-08-24 19:52:31 +02:00
a1413a3da9 CS 2015-08-24 12:35:02 +02:00
fad316151c Integrate graby 2015-08-24 12:27:17 +02:00
8c55a9e6c9 Merge pull request #1395 from wallabag/v2-fix-1378
fix #1378: nice display for tags list
2015-08-24 12:16:08 +02:00
230413bdd1 Merge pull request #1396 from wallabag/j0k3r-patch-1
Apply margin only on settings page
2015-08-24 12:04:24 +02:00
dc1c2debfb Apply margin only on settings page 2015-08-24 12:03:00 +02:00
a754db33c9 fix #1378: nice display for tags list 2015-08-24 11:59:53 +02:00
7083d183b9 Merge pull request #1392 from wallabag/v2-fix-redirect
Fix redirect after deletion
2015-08-24 10:44:14 +02:00
8bb1f3d69a Merge pull request #1393 from wallabag/fix-filter-same-day
Fix date filter on same day
2015-08-24 10:39:24 +02:00
f90af145ca Add test for same day filter 2015-08-23 22:06:27 +02:00
bccb5bba75 Merge pull request #1384 from wallabag/v2-fix-config-display
fix #1371 config screen: display bug in RSS tab
2015-08-23 13:17:21 +02:00
7d6c3edcdd Fix date filter on same day
Fix #1379
2015-08-22 15:36:07 +02:00
ec00964de2 Merge pull request #1372 from wallabag/v2-assign-tags
assign tags to an entry
2015-08-22 12:56:42 +02:00
7244d6cb61 assign tags to an entry 2015-08-22 12:40:48 +02:00
83aaf84195 Fix display issue in config rss tab 2015-08-22 12:30:06 +02:00
16a3d04cbd Fix redirect after deletion
Fix #1391
2015-08-22 12:09:27 +02:00
f9d5155abf Merge pull request #1390 from wallabag/coderating
Enable code rating on Scrutinizer
2015-08-21 18:11:52 +02:00
b45c188516 Enable code rating on Scrutinizer 2015-08-21 18:00:02 +02:00
f506da40e2 Merge pull request #1385 from wallabag/v2-status-filter
filters: implement status filter and a new view (to display all entries)
2015-08-21 17:49:20 +02:00
3b84dc08fc restore composer.lock 2015-08-21 11:02:22 +02:00
78f66dcc52 Merge pull request #1389 from wallabag/v2-fix-duplicate
remove dead code
2015-08-21 11:00:49 +02:00
c937de3443 remove dead code 2015-08-21 08:36:57 +02:00
2b7a488917 filters: adapt queryBuilder for 'all' view 2015-08-21 07:38:18 +02:00
e177976099 filters: add test for status filter and adapt other tests results 2015-08-21 07:30:48 +02:00
89659c9eae filters: implement status filter and a new view (to display all entries) 2015-08-21 07:30:48 +02:00
109d67dbb1 Merge pull request #1386 from wallabag/v2-refactor
WIP – Fixing things around 💨
2015-08-20 21:51:02 +02:00
6682139ec5 CS 2015-08-20 20:39:52 +02:00
e6f55346fd Add test on getting starred entries using the API 2015-08-20 20:39:26 +02:00
eccf5eb2e0 Add title in "picto-link"
Picto aren't always obvious for every one. So it's better to have some title when we move the mouse over.
2015-08-20 20:39:26 +02:00
1dbcd63b59 Update baggy about page
According to what have been done on the material theme
2015-08-20 20:39:26 +02:00
4793ee6509 Fixed my name & website 👌 2015-08-20 20:39:26 +02:00
6eebd8c909 Remove unsed things 2015-08-20 20:39:26 +02:00
0ab7404f93 Refactorize the way to retrieve entries
One place to retrieve entries in Entry & Rss controller.
More simple and easy to maintain.
2015-08-20 20:39:22 +02:00
4fcb7eaf13 Merge pull request #1383 from wallabag/cs
CS
2015-08-20 08:22:39 +02:00
8ce32af612 CS
We shouldn't forget to run `php-cs-fixer` time to time
2015-08-20 07:53:55 +02:00
34437f408c Merge pull request #1369 from wallabag/v2-bottombar
fix #1332: bottom bar to display message
2015-08-19 21:27:49 +02:00
ab4aeb8bd8 Merge pull request #1375 from wallabag/v2-fix-1371
fix #1368 config: redirect on correct tab in material theme
2015-08-19 21:26:29 +02:00
fdab81e910 warning bar: add parameter to dis/enable it 2015-08-19 16:00:15 +02:00
c3fdbcc60f Merge pull request #1374 from wallabag/v2-fix-filters-display
filters: enhance view for domain name
2015-08-19 15:32:38 +02:00
e62d27ff9b bottom bar to display message 2015-08-19 15:14:08 +02:00
8b8cdabc89 config: redirect on correct tab in material theme 2015-08-19 15:10:11 +02:00
bdd23b076a filters: enhance view for domain name 2015-08-19 14:55:39 +02:00
7b2d336893 Merge pull request #1342 from wallabag/v2-domain-filter
fix #981: add filter on domain name
2015-08-19 14:33:46 +02:00
443cecd2d8 add filter on domain name 2015-08-19 14:27:00 +02:00
b71ebd9af9 Merge pull request #1366 from wallabag/fix-tags-view
fix tag view in material theme
2015-08-19 12:02:24 +02:00
22ed64522a Merge pull request #1365 from wallabag/v2-typo-pagination
change </div> into </ul>
2015-08-19 11:21:31 +02:00
2e02b50409 Merge pull request #1367 from wallabag/v2-fix-actions-label
action labels depend on status
2015-08-19 11:20:22 +02:00
a3b4e8a2c0 Merge pull request #1363 from wallabag/v2-add-date-filter-view
add creation date filter view
2015-08-19 11:19:43 +02:00
d5e9a99ce6 Merge pull request #1370 from wallabag/v2-composer-cleanup
fix 1356: diet for composer
2015-08-19 11:19:04 +02:00
68568bf0b7 diet for composer 2015-08-18 21:53:11 +02:00
02947111c0 change </div> into </ul> 2015-08-18 18:20:07 +02:00
e68d9179a1 fix tag view in material theme 2015-08-18 18:18:35 +02:00
c713273619 action labels depend on status 2015-08-18 18:13:30 +02:00
3f357ee241 add test 2015-08-18 16:33:32 +02:00
c3cb46809b Merge pull request #1341 from wallabag/v2-capistrano
capistrano config
2015-08-18 16:14:23 +02:00
72ea6dd1a7 add creation date filter view 2015-08-18 15:26:45 +02:00
54f2b4a254 Merge pull request #1353 from wallabag/v2-pluriel
check if one entry or not
2015-08-18 14:29:10 +02:00
3162601c59 Merge pull request #1343 from wallabag/v2-filter-date
[WIP] filter by creation date
2015-08-18 14:28:43 +02:00
6819604185 Merge pull request #1354 from wallabag/v2-clean
some cleanup
2015-08-18 09:11:40 +02:00
f967422fae Update CONTRIBUTING.md 2015-08-18 08:49:42 +02:00
428af5a8c3 usage of transchoice 2015-08-18 08:32:50 +02:00
fd72e99d53 remove capistrano in gitignore 2015-08-18 08:26:41 +02:00
2a2903ceaa some cleanup 2015-08-17 23:31:10 +02:00
fac3f8abfa Merge pull request #1355 from wallabag/v2-clear-button
clean -> clear
2015-08-17 23:22:24 +02:00
e40ff14d7d Merge pull request #1358 from wallabag/nicosomb-patch-1
Disable external_code_coverage on Scrutinizr
2015-08-17 23:21:59 +02:00
a2cdaa8cdd disable external_code_coverage 2015-08-17 23:11:20 +02:00
4a230f9844 change timeout because scrutinizer failed 2015-08-17 21:39:07 +02:00
5f246a5543 clean -> clear 2015-08-17 20:12:11 +02:00
2ba06b1ee2 check if one entry or not 2015-08-17 18:02:54 +02:00
3c5b025ac3 filter by creation date 2015-08-17 15:54:49 +02:00
ceb79aa016 capistrano config 2015-08-17 15:36:27 +02:00
925d8ab316 Merge pull request #1337 from modos189/v2_material
fixes material
2015-08-17 15:32:59 +02:00
d5b28518e9 fix 2015-08-17 16:30:30 +03:00
0a3a5f6cd7 Merge pull request #1352 from wallabag/v2-fix-pagination
fix #1350: fix pagination with filters
2015-08-17 15:19:35 +02:00
ab2c93c7eb add test 2015-08-17 15:15:51 +02:00
727b39a90e Fix calendar in chromium and reducing the size of the calendar 2015-08-17 15:43:44 +03:00
c14a7c4251 fix #1350: fix pagination with filters 2015-08-17 12:13:37 +02:00
c37381b946 Merge pull request #1349 from wallabag/v2-add-original-link
add link to original article in material theme
2015-08-17 09:20:41 +02:00
790d18a319 GUI for filter by creation date #1343 2015-08-17 03:12:14 +03:00
6fd3d82c01 Hide open menu on page reading articles 2015-08-17 02:02:55 +03:00
fcb3faf109 My implementation progress bar at the top of the page #1348 2015-08-17 01:50:46 +03:00
d75a9fa38b Fix:
When I click on "new article" icon, and on the cross after, the filter icon is no more visible.
    When I change the size of my browser window, the filter appears but I didn't click on the icon
    Bug: can't click on pagination > 1
    display bug: when we load homepage, we see quickly the filter form
    new entry form: when we click on the field, the history of the field is at the left of the screen, not below the field (see screenshot)
2015-08-17 01:29:51 +03:00
0e7cf1fc50 Merge remote-tracking branch 'origin/v2' into v2_material 2015-08-17 00:33:03 +03:00
9cc6bd87fe add link to original article in material theme 2015-08-16 21:05:37 +02:00
80127e4fb1 Merge pull request #1338 from wallabag/v2-add-titles
change title for material pages / about page
2015-08-13 11:53:34 +02:00
4ca0c9139c fix diaspora url 2015-08-13 09:18:41 +02:00
a64f1d9f2d change title for material pages / about page 2015-08-13 09:16:22 +02:00
bac5a34552 Fix form rendere 2015-08-12 23:52:40 +03:00
a737d2a0ee Merge remote-tracking branch 'origin/v2' into v2_material 2015-08-12 23:02:19 +03:00
545b852f46 Merge pull request #1331 from wallabag/v2-disable-download
disable download links on entry view
2015-08-12 21:58:46 +02:00
392f4a2681 #1320 Design for filters 2015-08-12 22:55:44 +03:00
120544cccd disable download links on entry view 2015-08-12 21:52:39 +02:00
82b07eb272 Merge pull request #1334 from wallabag/v2-store-domainname
store domainName in database
2015-08-12 21:45:21 +02:00
c2257428b2 store domainName in database 2015-08-12 21:16:00 +02:00
8ba913d87a improved view 2015-08-12 20:27:30 +03:00
06fdfd025e fix #1321 2015-08-12 19:18:31 +03:00
d990dc6f05 Merge pull request #1328 from wallabag/v2-fix-1324
fix #1324: do not display pagination when only 1 page
2015-08-12 14:12:08 +02:00
bdf39ff10d remove pagination if page == 1 with baggy theme 2015-08-12 14:06:56 +02:00
2ac2e0bc2b fix #1324: do not display pagination when only 1 page 2015-08-12 14:05:53 +02:00
1a0ea1f35a Merge pull request #1326 from wallabag/v2-fix-1299
fix #1299: change send buttons on config page
2015-08-12 13:42:32 +02:00
43e6f47d5b fix #1299: change send buttons on config page 2015-08-12 13:35:48 +02:00
9f1d650ae8 Merge pull request #1325 from wallabag/v2-fix-1314
fix #1314: change max-width in material theme
2015-08-12 13:31:34 +02:00
b69fc0628a fix #1314: change max-width in material theme 2015-08-12 13:26:49 +02:00
a8596c35c8 Merge pull request #1323 from wallabag/v2-1302-checkbox
fix #1302: add 'stay connected' checkbox
2015-08-12 13:23:52 +02:00
a15692b1b7 Merge pull request #1312 from wallabag/v2-fix-1311
fix #1311, redirect after login
2015-08-12 13:21:16 +02:00
6622cf9968 add translation 2015-08-12 13:21:07 +02:00
7fc14130c7 add test 2015-08-12 13:18:39 +02:00
579764b264 fix indentation 2015-08-12 13:03:26 +02:00
3e1f25e22f Merge pull request #1322 from wallabag/v2-fix-1303
fix #1303, add link to homepage on forgot password page
2015-08-12 12:43:02 +02:00
5a58461491 add 'stay connected' checkbox 2015-08-12 12:27:12 +02:00
773ed2e7a6 fix #1303, add link to homepage on forgot password page 2015-08-12 12:16:50 +02:00
496f21e6fa Merge pull request #1319 from wallabag/v2-form-header
add new post form in material header
2015-08-12 10:14:44 +02:00
053b9568b2 add new post form in material header 2015-08-12 09:52:36 +02:00
930334cd6d Merge pull request #1297 from wallabag/v2-estimated-time
store estimated reading time in database (#393)
2015-08-12 09:05:21 +02:00
2686457448 store estimated reading time / filters on reading time 2015-08-12 09:01:29 +02:00
fedaf00537 Merge pull request #1317 from wallabag/v2-fix-typo
fix link in howto page
2015-08-11 21:26:31 +02:00
ea8da8c6d5 fix link in howto page 2015-08-11 21:12:08 +02:00
95135988f9 Merge pull request #1316 from wallabag/v2-focus-searchform
fix #1310 add focus to search form
2015-08-11 20:00:30 +02:00
d85454fbf8 add focus to search form 2015-08-11 18:07:02 +02:00
728a432850 fix #1311, redirect after login 2015-08-10 22:37:56 +02:00
f59601fced Merge pull request #1298 from modos189/v2_fix_material
fix material
2015-08-10 19:35:23 +02:00
0e654f6273 Merge remote-tracking branch 'origin/v2' into v2_fix_material
# Conflicts:
#	src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
2015-08-10 15:25:23 +03:00
f48a018929 Merge pull request #1295 from wallabag/v2-howto
add howto page
2015-08-10 14:15:11 +02:00
b958d9e59b remove useless line 2015-08-10 14:13:23 +02:00
4919584b87 Merge remote-tracking branch 'origin/v2' into v2_fix_material
# Conflicts:
#	src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
2015-08-10 12:27:12 +03:00
1473e8c9fb add tests for static pages 2015-08-10 08:19:40 +02:00
47cadf36c8 Merge pull request #1292 from wallabag/v2-tags-route
Add tags list display
2015-08-09 22:47:28 +02:00
20a69dffe7 Merge pull request #1304 from wallabag/v2-rename-starred-menu
rename favorite in starred
2015-08-09 20:47:13 +02:00
009696d0a8 rename favorite in starred 2015-08-09 20:31:53 +02:00
e9d5c2bf02 Merge pull request #1296 from wallabag/v2-fix-564
fix #564: replace Untitled by the domain name
2015-08-08 20:58:03 +02:00
946d6a5124 Preparation for adding links 2015-08-08 01:30:52 +03:00
a6523cfe86 fix #1281 2015-08-08 00:16:14 +03:00
c54ea989a3 fix #1281 (notifications when we star articles are buggy)
All notification corrected
2015-08-08 00:08:29 +03:00
342f0cc55a fix #1281 (When I save 10 articles, I've got 4 lines: 3 articles on 1st line, 3 on 2nd one, only 1 on 3rd line and 3 on last lines (chrome and firefox)) 2015-08-08 00:00:11 +03:00
0e7650683d Title in navigation bar 2015-08-07 23:59:11 +03:00
768303a573 fix #1282 2015-08-07 23:29:21 +03:00
0bc2baa65c fix #564: replace Untitled by the domain name 2015-08-07 21:57:53 +02:00
b7dd5f824c add howto page 2015-08-07 21:22:43 +02:00
54139268f8 Merge pull request #1294 from wallabag/v2-fix-1282
fix #1282: add title on wallabag logo
2015-08-07 20:56:45 +02:00
44a16e82d8 fix #1282: add title on wallabag logo 2015-08-07 20:47:19 +02:00
d0b90fbe18 unit test 2015-08-07 20:29:03 +02:00
55333dfd21 Merge pull request #1293 from wallabag/v2-items-per-page
get itemsPerPage for unread/fav/archive views
2015-08-07 20:10:07 +02:00
47e12c3677 fix display 2015-08-07 20:07:39 +02:00
3f3fbef11f Add tags list display 2015-08-07 18:17:23 +02:00
48ffc5a4b6 get itemsPerPage for unread/fav/archive views 2015-08-07 18:04:46 +02:00
6ecdd48a3f Merge pull request #1286 from wallabag/v2-issue-1283
fix #1283: display the good title for each category
2015-08-06 04:38:04 +03:00
b17874a7d5 Many corrections material theme 2015-08-06 04:22:45 +03:00
308db01684 change order of condition 2015-08-05 21:16:48 +02:00
b1a65df9df fix #1283: display the good title for each category 2015-08-05 21:10:20 +02:00
8d9b8912af Merge pull request #1279 from wallabag/material-default
set material to default theme \o/
2015-08-04 23:13:15 +02:00
4ab58dcf6c set material to default theme \o/ 2015-08-04 22:51:21 +02:00
9e07dc982c Merge pull request #1276 from modos189/v2
Added Material theme
2015-08-04 22:42:33 +02:00
9948d899d3 Fixes and improve css @media 2015-08-04 19:39:26 +03:00
53e121881b Added Material theme 2015-08-04 17:18:15 +03:00
7e63b892f9 Merge pull request #1250 from frankoa/v2_pagination_and_api
Adds pagerfanta paginator everywhere, modifies article routing.
2015-07-29 09:02:30 +02:00
9fb6ac830f Adds pagerfanta paginator everywhere, modifies article routing. Change API for is_starred and is_archived 2015-07-28 23:23:49 +02:00
9b9b05008a Merge branch 'v2-edit-title' into v2 2015-06-08 16:35:41 +02:00
ac9d58211e Merge branch 'v2' into v2-edit-title 2015-06-08 16:35:02 +02:00
3cf22a0541 Merge pull request #1206 from wallabag/sf-2.7
Upgrade to Symfony 2.7
2015-06-03 21:24:11 +02:00
82d6d9cb06 Add basic title edition
Fix #218
I mean basic, because there is no javascript at all. It could be a nice edit-in-place. But for the moment, it is simple.
2015-06-02 18:56:07 +02:00
75e9d1df03 Update to Symfony 2.7
And fix some deps instead of using dev tags
2015-06-02 16:58:19 +02:00
170746f99d Remove phinx
Doctrine handle quite correctly database migration. Thanks to `doctrine:schema:update`
2015-06-02 16:54:52 +02:00
51d9699fa1 Update deps 2015-06-01 17:39:05 +02:00
2878416f8b Merge pull request #1167 from wallabag/v2-api-bundle
Move API stuff in ApiBundle
2015-06-01 15:49:49 +02:00
4346a86068 CS 2015-05-30 13:59:33 +02:00
399bd777d7 Update deps 2015-05-30 13:42:38 +02:00
2f3c816579 Update naming strategy since Doctrine 2.5
See 20fb8270dc
2015-05-30 13:40:39 +02:00
9a014e48d6 Disable coverage
It takes ages to process and most of the time the build fail for "execution time" too long.
Too much time already burned to investigate it.
We'll investigate later, it's not a priority atm.
2015-05-30 13:31:54 +02:00
98510a4189 Merge pull request #1180 from wallabag/v2patch
Add some required
2015-04-15 17:29:28 +02:00
c7d3bf1671 name not required 2015-04-15 17:19:37 +02:00
4d6e818e40 changed email fields with the email type and added required parameter on some stuff 2015-04-15 16:50:20 +02:00
1cbef2d3b5 Enable debug on phpunit 2015-04-04 21:55:06 +02:00
04aaa199b7 Add Travis & Scrutinizer badges 2015-04-02 11:45:53 +02:00
132f614dee Avoid / in feed token
Of course, it breaks the url and the route matcher for each feed route
2015-04-01 21:59:13 +02:00
9744e97131 Fix tests 2015-04-01 21:59:13 +02:00
769e19dc4a Move API stuff in ApiBundle 2015-04-01 21:59:12 +02:00
e3c34bfc06 Merge pull request #1164 from wallabag/v2-remove-username-in-config
Remove ability to change username
2015-04-01 21:58:08 +02:00
d6fa2f70ac Merge pull request #1165 from wallabag/v2-prefix-db
Prefix table
2015-04-01 21:53:48 +02:00
276a1e9d3f And phpunit with html coverage to ant
Launching `ant phpunit` will now generate HTML Coverage
2015-04-01 21:32:02 +02:00
164bd80118 Ability to prefix tables
Will fix #799
2015-04-01 21:32:02 +02:00
c844dc0c50 Remove ability to change username
Since password are linked to username it was hard to change username while checking that the password is the good one.

Instead of doing crazy things to achieve that, I act that user won't be able to update username.

Also, username (and email) must be unique, since people logged in using username and can request a new password using email.

This should fix #1149
2015-04-01 21:23:27 +02:00
1a93ee423b Merge pull request #1166 from wallabag/v2-rss
Add RSS feeds
2015-04-01 21:08:56 +02:00
7d74a2f32b Force raw on content
We don't want Symfony to escape html content
2015-04-01 16:11:19 +02:00
14d7a69b8c Avoid timeout on code coverage from Scrutinizer 2015-03-31 22:48:01 +02:00
34c06cabef Use lemonde instead of mailjet
Mailjet seems to be laggy, hope that LeMonde will be more reliable in the future.

@see https://travis-ci.org/wallabag/wallabag/jobs/56246231
2015-03-31 22:48:01 +02:00
0ee043f745 Update InstallCommand test
They are god damn too long to execute because it launch external command (mostly related to doctrine).

So I've added a PHPUnit @group (`command-doctrine`) so that we can avoid launching them on a regular basis, like that:

`phpunit --exclude-group command-doctrine`
2015-03-31 22:48:01 +02:00
371ac69a6b Add tests
and fix few mistakes
2015-03-31 22:48:00 +02:00
2385f891e5 Sort by id is faster
Since it's the primary key
2015-03-31 22:47:43 +02:00
0c83fd5994 Add rss for entries
will fix #1000
2015-03-31 22:47:43 +02:00
f98a2a0fc3 Merge pull request #1152 from wallabag/v2-forgot-password
Handle forgot password
2015-03-30 17:05:37 +02:00
bdf2add2e8 Merge pull request #1163 from wallabag/v2-speed-up-tests
Speed up tests
2015-03-28 10:46:33 +01:00
3e6b7ea0e9 Rewrite travis & add scrutinizer 2015-03-28 00:25:47 +01:00
6141388969 Enable hhvm & nightly for curiosity 2015-03-27 19:59:45 +01:00
2d733277e6 Switch to Docker-based infrastructure 2015-03-27 19:59:42 +01:00
a05be8abec Use doctrine cache for tests 2015-03-27 19:49:11 +01:00
d0c2243b10 Add some tests 2015-03-08 22:47:32 +01:00
6894d48e03 Handle forgot password 2015-03-08 07:35:24 +01:00
f37d1427a1 Merge pull request #1110 from wallabag/v2-api-hypermedia
[WIP] API : hypermedia & tags
2015-03-06 21:48:33 +01:00
6e22bd737b Use pager in getEntries() and return Hateoas collection 2015-03-06 21:11:02 +01:00
bcf53ab75b Return pager into EntryRepository (for entries only) 2015-03-06 21:11:01 +01:00
a24f2c8808 Add Pagerfanta 2015-03-06 21:11:01 +01:00
48b67328e2 add getUser on Tag entity 2015-03-06 21:09:15 +01:00
efad7e53a1 add more log on AccessDeniedException 2015-03-06 21:09:15 +01:00
2ab8cb6816 fix tests 2015-03-06 21:09:15 +01:00
db2b4bf678 remove JsonResponse 2015-03-06 21:09:15 +01:00
b0cce9e636 fix tests for GET /entries/tags 2015-03-06 21:09:15 +01:00
1df1204d94 remove useless code 2015-03-06 21:09:15 +01:00
6ee416a069 commit bug with getSalt 2015-03-06 21:09:15 +01:00
0ca374e6a1 replace Response with JsonResponse 2015-03-06 21:09:15 +01:00
d8f9f37ab2 remove debug lines 2015-03-06 21:09:15 +01:00
092ca70725 add relation between user and tags, tests are broken 2015-03-06 21:09:15 +01:00
a36737f485 POST entries/tags with test 2015-03-06 20:50:31 +01:00
46bbd8d321 relation between tags and entries 2015-03-06 20:50:31 +01:00
6c87418ff0 fixtures for tag 2015-03-06 20:50:30 +01:00
1bd12b6229 fix GET /api/entries/{entry}/tags 2015-03-06 20:50:30 +01:00
0a018fe039 add relation between entry and tag 2015-03-06 20:50:30 +01:00
6d37a7e6c1 remove dumb code 2015-03-06 20:50:30 +01:00
b3dc0749d3 remove GET /tags/id 2015-03-06 20:50:30 +01:00
2691cf0438 GET /api/tags/id_tag method 2015-03-06 20:50:30 +01:00
1d14779154 remove isDeleted flag 2015-03-06 20:50:30 +01:00
aa4d6562c1 improve hateoas implementation 2015-03-06 20:50:30 +01:00
0ed6302212 returns serialzed object for GET /entries 2015-03-06 20:50:30 +01:00
0f00688096 first draft of hypermedia implementation 2015-03-06 20:50:29 +01:00
73b7744383 Merge pull request #1144 from wallabag/v2-build
Simplify build system
2015-03-04 06:25:17 +01:00
8378485e33 Simplify build system 2015-03-03 19:20:08 +01:00
ba7b9d48d4 Merge pull request #1132 from wallabag/v2-theme
V2 theme
2015-03-02 21:23:19 +01:00
3e30422cda Only one pattern for LiipTheme
Others patterns aren't required (but I think it's still important to have them around)
2015-03-01 20:25:43 +01:00
495aecfe74 Cleanup & simplify theme 2015-03-01 10:49:17 +01:00
71798e4ec4 Remove old themes 2015-03-01 10:49:16 +01:00
32da2a70ef Add LiipThemeBundle
Re-defined the config / user relation to be OneToOne bidirectionnal.
ConfigType is now a service so I can inject the list of available themes that are also used by LiipThemeBundle

Force sqlite for test
In case of people use a different driver in parameter.yml (yes I do :))
2015-03-01 10:49:16 +01:00
fca3c75723 config for CORS 2015-02-28 13:14:43 +01:00
dcae2fc25d enable CORS 2015-02-27 21:26:43 +01:00
0e7971d835 Merge pull request #1095 from wallabag/v2-config
V2 config
2015-02-23 20:56:09 +01:00
c641baad0e More tests on the install command 2015-02-22 23:29:48 +01:00
732c2ad897 sqlite doesn't support getListDatabasesSQL 2015-02-22 17:18:54 +01:00
0bf99bb144 Improve install command & add test
Also add fixtures for Config

InstallCommand now check if database, schema are here and ask the user what to do (keep or trash & re-create)
2015-02-22 14:35:36 +01:00
0bd2cb1ecd Handle default value for new user 2015-02-22 10:50:27 +01:00
e4977b8a86 Adding new user 2015-02-22 09:30:25 +01:00
c0d9eba07f Updating logged in user (email, name, etc ..) 2015-02-17 22:45:20 +01:00
d9085c63e3 Handle password change 2015-02-17 21:03:23 +01:00
7781faa0b0 Use a form type for entry 2015-02-16 21:31:58 +01:00
78cedc2262 Cleanup 2015-02-16 21:31:58 +01:00
4d85d7e9ba Implement simple config 2015-02-16 21:31:58 +01:00
7a577c519f Fix indentation in templates 2015-02-16 21:31:58 +01:00
55f58c9c5e Update UserConfig schema 2015-02-16 21:31:58 +01:00
2f6a596760 Merge pull request #1070 from wallabag/v2-api-tests
1st draft for testing API
2015-02-12 08:50:06 +01:00
8c7e0f95b9 remove debug lines 2015-02-12 08:46:40 +01:00
d9b7175593 test if GET /api/entries returns 1 or more results 2015-02-11 18:22:59 +01:00
59f18f9a85 create single test for bad headers 2015-02-11 16:08:13 +01:00
9ca5fd43f9 test with bad headers 2015-02-11 15:35:40 +01:00
f170f31594 add test for empty salt 2015-02-11 15:15:06 +01:00
874e3e10a4 phpdoc 2015-02-11 11:52:10 +01:00
f8c2736a10 remove docs 2015-02-11 09:39:42 +01:00
70b54da2b1 test line, forgot to remove it 2015-02-11 07:52:58 +01:00
c9fa9677c1 DELETE entry and use of query for fetch entries 2015-02-11 07:43:43 +01:00
fa8d563934 Merge pull request #1072 from wallabag/v2-entry-test
Add more tests to Entry controller + security
2015-02-11 06:45:14 +01:00
19aee7cd54 refactor and test one entry 2015-02-11 06:41:44 +01:00
2725de8efb cs 2015-02-11 06:31:16 +01:00
91f78f26f2 first test for API, need refactor 2015-02-11 06:28:23 +01:00
2734044aca add test for api/salts 2015-02-11 06:28:23 +01:00
0536b809b0 Test for GET on empty database 2015-02-11 06:27:50 +01:00
e1dd7f70c5 first test for API, need refactor 2015-02-11 06:27:05 +01:00
f5deb024a2 add test for api/salts 2015-02-11 06:27:04 +01:00
68c6f1bd7f Test for GET on empty database 2015-02-11 06:27:04 +01:00
da93261a7d Quick fix in build.xml
We don't need to purge the database since it was just re-created
2015-02-10 22:56:48 +01:00
3d2b2d62be Avoid user to see other entries
hehe :)
2015-02-10 22:56:44 +01:00
eb3bd7efb7 Add more tests on Entry controller
Also add more fixtures
2015-02-10 22:32:42 +01:00
f59f45d740 Merge pull request #1069 from wallabag/v2-fix-return-entries
GET /api/entries returns object, no more array
2015-02-10 14:51:32 +01:00
017e20895f findEntries returns array 2015-02-10 13:53:00 +01:00
2c0ffcf397 Merge pull request #1068 from wallabag/v2-api-authentication
V2 api authentication
2015-02-10 13:49:57 +01:00
3d3368cfd5 change test if we have no entry in GET /api/entries 2015-02-10 13:47:57 +01:00
92504e0dd4 move dir check into constructor 2015-02-10 13:35:34 +01:00
11204db45a change phpdoc 2015-02-10 12:14:09 +01:00
d4c029f46e review from @j0k3r 2015-02-10 12:12:44 +01:00
c5e8ba25bb getSalt method 2015-02-10 08:35:43 +01:00
eaf95758dc GET /api/entries returns object, no more array 2015-02-10 06:44:38 +01:00
7ffb1e80bf replace services.xml into services.yml 2015-02-09 22:54:29 +01:00
5078e8360a PSR 3 2015-02-09 22:43:06 +01:00
d29bfaf139 fix return on API call and fix id in clear for user 2015-02-09 22:40:20 +01:00
2a94b1d1b7 log for authentication on API 2015-02-09 22:07:39 +01:00
cbce162b40 Merge pull request #1063 from wallabag/v2-rename-tags-entity
Rename Tags entity
2015-02-09 15:52:10 +01:00
fb8389f463 change settings for TagsEntries model 2015-02-09 15:41:07 +01:00
970c40bb93 restore TagsEntries 2015-02-09 15:07:48 +01:00
0ac38198ab authentication on API 2015-02-09 13:59:48 +01:00
653e8be4c1 rename Tags entity
why did I delete this file?

rename Tags entity

rename Tags entity
2015-02-09 12:58:44 +01:00
89c03230c3 Merge pull request #1062 from wallabag/v2-relation-entry-user
add a real relation between user and entry
2015-02-09 12:52:06 +01:00
3b815d2de5 Add some fixtures
Improve test, so user can login
Fix some leftJoin
Cleanup EntryController
2015-02-08 23:13:40 +01:00
d91691573f Add custom auth encoder & provider
These custom classes allow Wallabag v2 to be compatible with Wallabag v1 salted password
2015-02-08 23:13:40 +01:00
7812f508bc create an Entry with a User in parameter 2015-02-08 23:13:40 +01:00
5f09650eef add a real relation between user and entry 2015-02-08 23:13:40 +01:00
8af35ad932 Merge pull request #1066 from wallabag/v2-api-tests-entry
V2 api tests entry
2015-02-07 20:39:03 +01:00
9c0c882006 Add some tests on EntryController
Also, create database schema on test initialisation
2015-02-07 18:30:46 +01:00
94f2364cd8 Fix #1057
Unexisting function
2015-02-07 18:29:05 +01:00
8125b415d8 Avoid raw javascript in template
It kills the Symfony Crawler :)
2015-02-07 18:28:31 +01:00
d01db0c71d Update deps 2015-02-06 22:52:51 +01:00
ed4d5cf2d7 Merge pull request #1065 from FabienM/v2-bundles-cleanup
Cleanup default assets symlinks
2015-02-06 22:43:19 +01:00
427b61a35b Cleanup default assets symlinks 2015-02-06 22:36:02 +01:00
7f2d9f9613 Do not display download progress in Travis 2015-02-06 15:38:10 +01:00
c64a14787d Merge pull request #1061 from wallabag/v2-cleanup-entities
Remove temporary entities
2015-02-06 14:56:47 +01:00
02b225a82e Remove temporary entities 2015-02-06 14:26:37 +01:00
15d33c24dc Merge pull request #1060 from wallabag/api-rename-user
rename User entity
2015-02-06 14:23:55 +01:00
2f69eb4afa rename User entity 2015-02-06 14:18:01 +01:00
29c4517f7a Merge pull request #1059 from wallabag/rename-entry
Rename entry
2015-02-06 09:55:16 +01:00
be463487cc rename Entries to Entry 2015-02-06 07:45:32 +01:00
905ae369bd normalize entries fields 2015-02-05 22:33:36 +01:00
c8dee95396 Merge pull request #1055 from wallabag/v2-api-patch-methid
PATCH method, boolean for some parameters and change entity methods name
2015-02-05 21:51:05 +01:00
c0284f6182 remove persist() for PATCH and DELETE 2015-02-05 21:36:39 +01:00
93e28e4d2e remove unused files 2015-02-05 21:33:22 +01:00
5644c2d88e Merge pull request #1054 from wallabag/v2-api-set-title-post
we can now set a title to the article when we use POST /api/entries
2015-02-05 19:07:30 +01:00
de00c9208d Merge pull request #1048 from wallabag/v2-sort-entries
sort entries in repository
2015-02-05 19:06:48 +01:00
2c093b03de PATCH method, boolean for some parameters and change entity methods name 2015-02-05 18:21:31 +01:00
9e0fff7cb0 simplify code 2015-02-05 18:19:34 +01:00
77bb7b92a2 we can now set a title to the article when we use POST /api/entries 2015-02-05 18:05:27 +01:00
3bb7c5ffec Update branch name in README 2015-02-05 09:19:17 +01:00
c2e2906c8d fix travis configuration 2015-02-05 09:06:13 +01:00
bc782eaa72 sort entries in repository 2015-02-05 07:54:04 +01:00
34d15eb4d0 change database structure for Entries 2015-02-04 22:25:44 +01:00
1b0e6e9ae6 forgot one parameter 2015-02-04 21:34:03 +01:00
61b9fdd5e4 restore full database settings 2015-02-04 21:26:15 +01:00
eacaf7f864 change type for isRead, isFav and isDeleted fields, as said @j0k3r 2015-02-04 18:21:45 +01:00
6079aaa33d change delete status for GET /api/entries method 2015-02-04 18:12:13 +01:00
6e334aba68 for GET /api/entries, star, delete and archive status are no more necessary 2015-02-04 18:06:42 +01:00
42a9064620 implement delete method 2015-02-04 17:54:23 +01:00
889249804f disable authentication for the moment 2015-02-02 12:54:14 +01:00
c5772d118f Installation should be launch manually
Also upadte readme for v2 and define a test database (for the future)
2015-02-02 07:48:16 +01:00
2e45e7bebc New wallabag installer
Instead of the legacy bin/install here is a symfony command that can initialize wallabag.

There are still work to do on the requirements part (to be sure that wallabag can run like a charm).

I've also added (but commented) the fixtures load part (which will need an extra doctrine package). We'll see that point later.
2015-02-01 20:16:27 +01:00
8394ab4619 Merge pull request #1036 from j0k3r/refactor-update-composer
Update composer
2015-01-31 21:49:44 +01:00
4cfbd5d893 Merge pull request #1037 from j0k3r/refactor-cs
CS
2015-01-31 21:24:20 +01:00
7df80cb32c CS 2015-01-31 19:12:49 +01:00
daacffefa6 Use tagged version in composer 2015-01-31 19:02:59 +01:00
1990517b22 remove Acme and AppBundle 2015-01-31 15:36:04 +01:00
c3235553dd first implementation of security 2015-01-31 15:14:10 +01:00
71691fe44a Merge pull request #1035 from j0k3r/refactor
Tests are working again
2015-01-31 10:29:30 +01:00
aa6e27cf4f Tests are working again 2015-01-31 09:35:50 +01:00
4ffc77d9f5 Move phpunit into app folder 2015-01-30 15:47:27 +01:00
fdcbdda1ad grrr, remove call to bootstrap 2015-01-30 11:29:50 +01:00
367664ee87 finally fix phpunit and travis? 2015-01-30 11:23:18 +01:00
e11e03cb32 fix phpunit 2015-01-30 10:58:59 +01:00
3ba208b205 fix phpunit configuration 2015-01-30 10:49:47 +01:00
127915f4ea remove bootstrap in phpunit 2015-01-30 09:11:59 +01:00
03493be075 tell to travis that I code in PHP 2015-01-30 09:09:53 +01:00
843dbe5195 create entry via API 2015-01-30 09:05:54 +01:00
a8c90c5c1b add documentation for API 2015-01-30 07:50:52 +01:00
a65f5d5563 fix config for rest bundle 2015-01-29 21:49:44 +01:00
27f15aa4ca improve API 2015-01-29 20:32:11 +01:00
f8bf895254 routing for API, trying to respect #414 2015-01-29 16:56:58 +01:00
589dce52c6 disable dev environment 2015-01-28 21:28:12 +01:00
38ba7ed972 skeleton for DELETE and PATCH methods 2015-01-28 18:18:57 +01:00
3e5a342f65 bundle for API 2015-01-28 18:14:04 +01:00
e4788de51e 1st implementation of wallabag api, yeah 2015-01-28 17:09:27 +01:00
569f8d6851 add dependencies for API 2015-01-28 16:15:06 +01:00
19f2f11ee8 fix themes symlinks 2015-01-28 13:58:12 +01:00
9e11bfa4a6 wrong path for database file 2015-01-28 13:54:24 +01:00
7dfc3c2b58 fix config.yml 2015-01-28 13:46:51 +01:00
80709502c7 fix parameters config 2015-01-28 13:43:23 +01:00
2cdb0b8f40 change gitignore, last time, I promised 2015-01-28 13:28:12 +01:00
b2d9357c78 change gitignore 2015-01-28 13:27:00 +01:00
c4b1e79018 change gitignore 2015-01-28 13:26:36 +01:00
dc61832a9e change gitignore 2015-01-28 13:23:07 +01:00
33767049a5 change gitignore 2015-01-28 13:10:59 +01:00
0c678cf24a rename test file 2015-01-27 13:17:37 +01:00
b9ec99e25b replace legacy calls with new one 2015-01-27 13:08:02 +01:00
d692b3b08d remove legacy code 2015-01-27 13:07:27 +01:00
6b767d1cc0 refactoring for fetching content 2015-01-26 22:15:19 +01:00
ad4d1caa9e move WallabagBundle into Wallabag:CoreBundle 2015-01-23 16:28:37 +01:00
b84a80559a some parameters, new entry form, etc. 2015-01-23 14:58:17 +01:00
163eae0bb1 toggle archive / fav actions 2015-01-23 12:45:24 +01:00
bd9f08157c article view, fav list, archive list 2015-01-22 21:11:22 +01:00
9d50517cea migrating legacy to symfony 2015-01-22 17:18:56 +01:00
2b9fe72b39 remove foo test 2015-01-22 10:14:37 +01:00
93fd4692f6 symfony is there 2015-01-22 08:30:07 +01:00
0440249631 move templates into resources 2015-01-21 16:04:05 +01:00
3eb951572d add some documentation at the end of installation 2015-01-21 15:50:51 +01:00
9de6a0a7cc gitignore for app/cache 2015-01-21 15:02:29 +01:00
19875ef0da add install script after composer install 2015-01-21 14:45:39 +01:00
00fcfd299b whoops, deleted install folder 2015-01-20 14:43:57 +01:00
79e051a1f2 restructure folders 2015-01-20 14:11:26 +01:00
97a2dd74c8 phinx needs a sqlite3 file 2015-01-20 07:51:07 +01:00
8d6ff10e8e test for migration 2015-01-20 07:50:50 +01:00
9a5c1bc62a move install files into bin folder 2015-01-20 07:42:20 +01:00
6ad93dff69 new folders 2015-01-20 07:40:39 +01:00
c78c1a3f08 @fivefilters via composer 2015-01-19 21:27:22 +01:00
9e7f6caf03 htmlawed via composer 2015-01-19 16:53:59 +01:00
820d81aa61 simplepie via composer 2015-01-19 14:48:03 +01:00
3329f1bf3d tcpdf via composer 2015-01-19 14:36:17 +01:00
90c67dbd12 update composer.lock 2015-01-19 13:50:31 +01:00
96b2c59c04 update composer 2015-01-19 13:38:57 +01:00
3d99ce9dad travis configuration 2015-01-19 13:37:32 +01:00
99410a21eb phpepub via composer 2015-01-19 13:00:33 +01:00
1345a10788 phinx for database migration 2015-01-19 12:21:49 +01:00
f3052b4542 foo test 2015-01-19 11:59:22 +01:00
e342acf7ba add phpunit 2015-01-19 11:47:44 +01:00
2b17e0aa77 bin folder 2015-01-19 11:29:43 +01:00
dda7884ace pagination with composer and move FlattrItem 2015-01-19 11:29:25 +01:00
10939766de replace session class 2015-01-18 22:25:29 +01:00
a20f96b76d replace flash messages library 2015-01-18 22:11:41 +01:00
adf17b677e remove 3rd libraries 2015-01-18 20:07:46 +01:00
894cd087f4 remove autoload section in composer.json 2015-01-16 20:56:46 +01:00
44f1fef018 packagist 2015-01-16 20:45:23 +01:00
170a1407fe Merge pull request #690 from doc75/log_auth_error
Add message in web server log in case of authentication failure
2015-01-16 20:06:57 +01:00
b68f0a81e5 Merge pull request #1003 from vpmalley/dev
[RSS] introducing query param 'limit' for max items in RSS feed
2015-01-16 20:04:56 +01:00
7fe8a9adc4 [RSS] introducing query param 'limit' to restrict the number of items to display in RSS feeds. 2015-01-16 11:42:39 -05:00
af5c371e95 Merge pull request #999 from moparisthebest/additions_dev
Miscellaneous additions
2015-01-13 22:45:33 +01:00
13c7f9a462 Add ability to mark all articles from a tag as read 2015-01-12 19:52:41 -05:00
512e5e5bd1 Add ability to delete all articles matching a search 2015-01-12 19:52:41 -05:00
7f782e4496 Add ability to tag an article on creation 2015-01-12 19:52:41 -05:00
c86b40f014 add message in web server log in case of authentication failure to enable the usage of fail2ban on failed login attempts 2015-01-05 10:21:04 +01:00
8ae45e7fe2 fixes #963 and use our own readability.php file for mobiClass 2015-01-03 13:03:26 +01:00
166ff0a093 updated french mo file (see #986) 2015-01-03 11:40:19 +01:00
82978fbd57 Merge branch 'master' into dev
To get the errors
2015-01-03 11:38:32 +01:00
1186b3b67a Merge pull request #986 from goofy-bz/patch-2
Update fr_FR.utf8.po
2015-01-02 21:23:42 +01:00
30b948e68b Update fr_FR.utf8.po
formulation (trivial)
2015-01-02 21:13:54 +01:00
1aa1461a2e Merge pull request #974 from jbfavre/fix_ftrss_call_can_break_import
Make call to FTRSS silent to avoid warnings which can break import
2014-12-26 10:31:15 +01:00
92ae99bd29 Merge branch 'dev' of https://github.com/wallabag/wallabag into dev 2014-12-26 10:27:30 +01:00
d4d33a4130 deleted (again) courgette 2014-12-26 10:25:49 +01:00
7a21c308be Merge pull request #975 from wallabag/fixflattrcalls
don't call flattr if flattr is disabled
2014-12-23 15:34:05 +01:00
37cad52229 don't call flattr if flattr is disabled 2014-12-22 16:26:23 +01:00
81315897f0 Make call to FTRSS silent to avoid warnings which can break import 2014-12-21 22:41:04 +01:00
9254b6cf46 Merge pull request #971 from wallabag/fix-jquery-installation
Fix jquery installation
2014-12-19 21:06:06 +01:00
0e65fa85d3 remove idea files 2014-12-18 10:37:17 +01:00
4eb71ab555 change jquery path into installation script 2014-12-18 10:36:47 +01:00
e9a64ef8a9 Merge pull request #923 from wallabag/add-html-doc
add HTML documentation
2014-12-17 22:59:28 +01:00
a50d7f0f20 link to doc inside wallabag:about 2014-12-17 22:55:33 +01:00
2903ffc54f Merge branch 'add-html-doc' of https://github.com/wallabag/wallabag into documentation-integration 2014-12-17 22:44:36 +01:00
5ea5310ab4 enable showing or not for epub/mobi/pdf export buttons 2014-12-14 15:17:39 +01:00
1256e4c645 Merge branch 'tcitworld-ebook' into dev 2014-12-14 00:16:39 +01:00
dc69d3e8d8 merge epub with all the dev evolutions 2014-12-14 00:16:22 +01:00
9c55ed0923 diaspora on all themes 2014-12-07 22:24:25 +01:00
7c2c49d9b1 added diaspora sharing 2014-12-06 18:42:29 +01:00
41bd2be68a Merge pull request #958 from etiess/patch-2
Update wallabag_compatibility_test.php
2014-11-26 14:08:51 +01:00
66d7a4dcd8 Update wallabag_compatibility_test.php
Explain how to install Tidy
2014-11-26 14:07:27 +01:00
b9c026ce32 Merge branch 'remove-courgette' into dev
Conflicts:
	themes/courgette/_view.twig
2014-11-24 22:56:10 +01:00
c4457fba85 upgrade documentation 2014-11-24 13:46:39 +01:00
d4b42995f7 add link to documentation into installation 2014-11-24 13:46:11 +01:00
485d57972e Merge pull request #939 from jsit/globaljs
_global-izing some more js & css
2014-11-24 13:23:53 +01:00
85c5a1ff8d failover if theme folder doesn't exist 2014-11-24 13:11:57 +01:00
7b8bb75228 Merge pull request #942 from wallabag/carrot
implementing carrot into wallabag
2014-11-21 22:15:17 +01:00
fe16457efc Merge pull request #945 from jsit/carrot
Fixing icon text on unread page
2014-11-21 22:10:02 +01:00
46533cac7d Fixing icon text on unread page 2014-11-21 16:07:15 -05:00
747a15841d Merge pull request #944 from jsit/carrot
Globalizing and creating two variants of Carrot.org icon
2014-11-21 21:47:37 +01:00
fc01f94387 Globalizing and creating two variants of Carrot.org icon; tidying up some CSS 2014-11-21 15:30:59 -05:00
e9d4d17693 fix merge confict 2014-11-19 16:54:28 +01:00
25f9c66834 Merge pull request #943 from wallabag/fixFlattrs
fix Flattrs
2014-11-19 16:40:36 +01:00
d25a3f13c2 default deactivated 2014-11-19 16:40:02 +01:00
b13376e918 fix Flattrs 2014-11-19 16:35:44 +01:00
c8b4ef7fed implementing carrot into wallabag 2014-11-19 16:27:56 +01:00
b0f9f5ac21 Merge pull request #938 from jsit/firefoxiconfix
Fix for favicons in Firefox
2014-11-18 22:36:53 +01:00
6062f74c6b Updating Baggy theme's head.twig to locate _global js/css 2014-11-18 10:07:32 -05:00
eb365a01fb _global-izing some more js & css 2014-11-18 10:01:37 -05:00
eb0c88a9d4 Fix for favicons in Firefox (FF only uses the last declared favicon, not the most appropriate: https://bugzilla.mozilla.org/show_bug.cgi?id=751712) 2014-11-18 09:28:39 -05:00
db3bffa284 Merge pull request #937 from jsit/favicons
Moving favicons to new _global theme dir and adjusting <link> tags
2014-11-17 23:15:47 +01:00
ca6c0de380 Adjusting Template class so that _global is ignored as a theme 2014-11-17 17:11:33 -05:00
d91ff81ca6 Modifying Courgette theme to comply with new app icon image location 2014-11-17 16:59:53 -05:00
9d2140c9a1 Fixing earlier commit wherein I lowercased some JS calls 2014-11-17 16:54:15 -05:00
7a0f454d39 Removing app icons from previous locations 2014-11-17 16:51:38 -05:00
d5b717dc77 Moving app icon images to /themes/_global/img/appicon/, updating Baggy and Default themes to point there 2014-11-17 16:49:34 -05:00
7cb517ce54 Adding/fixing favicon <link>s in Baggy theme header 2014-11-17 14:28:07 -05:00
a460404252 Merge pull request #933 from wallabag/dev
1.8.1b
2014-11-16 21:12:47 +01:00
d0287608b6 update constant version 2014-11-16 02:29:01 +01:00
1532376710 Merge pull request #932 from wallabag/dev
1.8.1
2014-11-15 20:48:49 +01:00
d3122db7b2 add DS_Store in gitignore 2014-11-08 08:25:00 +01:00
b46b8933ab Merge pull request #926 from jsit/aboutlink
Fixing URL typo on about page
2014-11-05 17:24:05 +01:00
62f3e6db75 Fixing URL typo on about page 2014-11-05 11:22:22 -05:00
a0c57b35a3 add HTML documentation 2014-11-04 08:33:05 +01:00
217f3ca0b4 Merge pull request #921 from wallabag/about-page
add about page
2014-11-03 23:01:23 +01:00
3eba7538a4 Merge pull request #920 from jsit/uifixes
Many small UI changes/fixes to Baggy theme and English translation files
2014-11-03 22:48:07 +01:00
fa6f5db97f Merge pull request #922 from jsit/menuhiding
Fixing menu hiding behavior when switching from mobile width to desktop width
2014-11-03 22:42:49 +01:00
ebea829d80 Improving class names for menu hiding 2014-11-03 13:32:20 -05:00
e319c49891 Fixing menu hiding behavior when switching from mobile width to desktop width 2014-11-03 13:28:58 -05:00
efd0a9f5f1 Applying changes to config.twig to default theme as well 2014-11-03 12:06:44 -05:00
94888d5fd4 Removing title text from bookmarklet 2014-11-03 09:13:42 -05:00
ac8b064f47 Restoring change password section in config 2014-11-03 09:11:25 -05:00
3c133bff49 add about page 2014-11-03 07:44:56 +01:00
20bb3f7f2a Merge pull request #919 from jsit/popupjs_
Improving JavaScript for popup forms
2014-11-03 06:46:18 +01:00
cc1f78a83d Many small UI changes/fixes to Baggy theme and English translation files. May need review. 2014-11-02 13:37:44 -05:00
ff02fd8aca Improving JavaScript for popup forms 2014-11-02 11:19:21 -05:00
063a2fadaa Removing spaces before colons on config screen 2014-11-02 10:30:13 -05:00
266b7328ef Merge branch 'dev' into uitextcase 2014-11-01 18:29:41 -04:00
893b8e4cef Merge pull request #917 from jsit/menuopacity
Fixing opacity issue when using mobile menu (#912)
2014-10-31 20:45:40 +01:00
1772de2531 Changing my tabs to spaces :) 2014-10-31 15:38:25 -04:00
75dc3a71b7 Fixing opacity issue when using mobile menu 2014-10-31 15:37:08 -04:00
0be82dedb6 Capitalizing "EPUB" as is defined by IDPF: http://idpf.org/epub 2014-10-31 15:26:33 -04:00
8a76674568 Merge pull request #913 from jsit/hotfix
Fixing regression in popup close button styling
2014-10-31 19:35:35 +01:00
40800c97b2 Fixing regression in popup close button styling 2014-10-31 14:34:10 -04:00
6926f6dcc7 Merge branch 'jsit-duplicateformstyles' into dev 2014-10-31 18:54:20 +01:00
a63cd1b06f fix merge errors 2014-10-31 18:54:08 +01:00
9cf370cfb6 Merge branch 'jsit-duplicateformstyles' into dev 2014-10-31 18:48:02 +01:00
ccaefcf69a merge 2014-10-31 18:47:54 +01:00
15eb5ca4b8 Merging changes with dev 2014-10-31 13:47:45 -04:00
224528f1de Merge pull request #909 from jsit/closebutton
Standardizing class names and styles for close buttons
2014-10-31 18:44:42 +01:00
ad2b61db80 Removing left border on popup forms on mobile widths 2014-10-31 13:32:34 -04:00
344c8f6b5c Fixing popup form width issue on narrow width 2014-10-31 13:28:39 -04:00
4bc70ed401 Making visual styling of search and bag it popup forms more consistent 2014-10-31 12:48:35 -04:00
b95a6f57bf Removing duplicate popup form styles 2014-10-31 12:37:54 -04:00
87e37e82fd Merge pull request #910 from jsit/default-theme-search-form-css
Moving search-form style out of messages css and into style.css
2014-10-31 17:34:03 +01:00
8519cc796f Moving search-form style out of messages css and into style.css 2014-10-31 12:31:13 -04:00
827bd1f899 Standardizing class names and styles for close buttons 2014-10-31 11:10:38 -04:00
ed0436d21e Merge pull request #908 from jsit/closemessage
Changing close message button to use &times; instead of X
2014-10-31 16:10:16 +01:00
242746fd17 Changing close message button to use &times; instead of X 2014-10-31 10:44:20 -04:00
f23fd0ee5e Merge pull request #907 from jsit/login
Some small design tweaks to the login page: Moving 'Stay signed in'...
2014-10-31 15:10:01 +01:00
1087b3cb4e Adding right margin to labels (to compensate for now-missing left margin on input fields) 2014-10-31 09:53:01 -04:00
f60c9b00ab Some small design tweaks to the login page: Moving 'Stay signed in' label and removing left margin on input boxes 2014-10-31 09:30:57 -04:00
6fe9b616aa Merge pull request #894 from wallabag/change-password-field
Fix #891: change type for password field in installation
2014-10-31 11:51:13 +01:00
655550e23a Merge pull request #904 from wallabag/vagrantfile
Vagrantfile
2014-10-31 11:50:53 +01:00
4bada2b954 Merge pull request #906 from jsit/tagstitle
Uppercasing 'tags' page title
2014-10-30 21:55:46 +01:00
a87a1b7d3b Uppercasing 'tags' page title 2014-10-30 16:54:24 -04:00
4fae3b0a85 Merge pull request #898 from jsit/previewtext
Fixing issue #874, displaying preview text when in list mode
2014-10-30 21:43:21 +01:00
052bdfc17e Merge pull request #897 from jsit/displaymode
Fixing display mode switching in Baggy theme (issue #896)
2014-10-30 21:43:15 +01:00
476b8902bb Merge pull request #905 from jsit/closebutton
Making the close button more visually consistent on the menu popup forms
2014-10-30 21:25:26 +01:00
6f0b92138f Merge pull request #903 from jsit/uitextcase
Fixing some more text case issues
2014-10-30 21:08:11 +01:00
cd271fc485 Making the close button more visually consistent on the menu popup forms 2014-10-30 16:00:18 -04:00
0bf65303ca change database name 2014-10-30 20:43:39 +01:00
c4800fc6da ignore vagrant directory 2014-10-30 20:42:17 +01:00
d51c2e05d3 Vagrantfile, from @fguillot for kanboard 2014-10-30 20:40:56 +01:00
ce096afed7 Fixing some more text case issues 2014-10-30 15:37:59 -04:00
06e7e7ff7b Merge pull request #902 from jsit/en_us
Adding 'en_US' locale (issue #901)
2014-10-30 20:34:08 +01:00
bbbda080bf Adding 'en_US' locale (issue #901) 2014-10-30 15:32:00 -04:00
574f3faf06 Adding 'en_US' locale (issue #901) 2014-10-30 15:30:09 -04:00
b56c86457c Merge pull request #900 from jsit/uitextcase
Fixing a bunch of English translation letter casing and syntax (issue #899)
2014-10-30 18:37:58 +01:00
7212386e98 Fixing a bunch of English translation letter casing and syntax (issue #899) 2014-10-30 12:17:26 -04:00
b73a175386 Fixing issue #874, displaying preview text when in list mode 2014-10-30 11:23:18 -04:00
c9e6fec4bf Fixing display mode switching in Baggy theme (issue #896) 2014-10-30 11:20:05 -04:00
fcd37d0c7b change type for password field in installation 2014-10-29 21:02:07 +01:00
b40cd4e73f Merge pull request #889 from wallabag/fix#871
Fix#871
2014-10-27 20:58:13 +01:00
1b6e21d7a6 translation fix finished for #871 and bring add tag from search feature to all themes 2014-10-27 15:12:46 +01:00
7ee1972599 translation fix for #887 and tiny display fix 2014-10-27 14:00:47 +01:00
24479b479d Merge pull request #888 from wallabag/updated-site-config
updated site_config
2014-10-27 09:28:30 +01:00
90a1a78b1e updated site_config 2014-10-27 06:46:13 +01:00
4a50075784 Merge pull request #883 from wallabag/hotfixepub
fix #882
2014-10-22 15:12:49 +02:00
606bea72e1 fix #882 2014-10-22 15:10:38 +02:00
4eb603430d Merge pull request #879 from Marmo/patch-1
update zeit.de.txt for removal of inline ads
2014-10-21 19:42:21 +02:00
76b1e0babe update zeit.de.txt for removal of inline ads 2014-10-21 19:33:40 +02:00
f2248e604d Merge pull request #878 from wallabag/greybuttonread
fix #873
2014-10-20 15:07:24 +02:00
f56791e6c4 fix #873 2014-10-19 11:12:25 +02:00
750d904a16 fix translation issues 2014-10-17 21:08:08 +02:00
691a03f176 Merge pull request #868 from wallabag/popupoverlap
fix for #830
2014-10-15 16:53:06 +02:00
48fb171d7a fix for #830 2014-10-15 16:47:38 +02:00
8fd0512a3c Merge pull request #848 from 11mariom/dev
Add support for custom http port
2014-10-14 19:57:16 +02:00
5b16d508b5 Merge pull request #843 from rros/mysql-utf8mb4
Convert the MySQL charset to utf8mb4 to support the full range of unicode
2014-10-14 19:56:50 +02:00
05e313ad28 Merge pull request #867 from wallabag/zindex-menu-bug
fix z-index-menu mobile view bug #834
2014-10-14 19:50:28 +02:00
b9fa7d2c9c fix z-index-menu mobile view bug #834 2014-10-12 10:24:07 +02:00
8ce508cab0 Create adme.ru.txt
Siteconfig
2014-10-12 10:00:35 +02:00
dffbec1c44 Merge pull request #865 from Marmo/patch-1
update heise.de.txt
2014-10-11 15:30:51 +02:00
ad0eccb4cd update heise.de.txt
Multi-page Telepolis-articles (www.heise.de/tp/...) are not fetched correctly atm. My addition to the single_page_link makes it work (tested with http://www.heise.de/tp/artikel/42/42579/1.html).
2014-10-11 15:22:53 +02:00
44d35257e8 Merge branch 'dev' 2014-10-10 13:33:54 +02:00
cf8a5e1eed Merge branch 'master' into dev
Conflicts:
	index.php
2014-10-10 13:33:36 +02:00
6b0894c66a Merge pull request #860 from wallabag/compatibility_file
Move compatibility file (fixes #858)
2014-10-08 21:36:51 +02:00
a7058a5a13 Right redirect from the new path 2014-10-08 21:35:21 +02:00
1403af5be3 Merge pull request #861 from wallabag/fix-query-sqlite-install
query for populate mysql/postgres was called when we choosed sqlite
2014-10-08 21:32:03 +02:00
20b4d7d621 query for populate mysql/postgres was called when we choosed sqlite 2014-10-08 21:23:34 +02:00
7331ed3e80 change href in install/index.php 2014-10-08 21:11:56 +02:00
79dd109e37 Fixes #858: move compatibility file into install folder 2014-10-08 21:08:21 +02:00
a305326973 Merge pull request #787 from wallabag/data-for-mysql
Add data for mysql installation, see #624
2014-10-08 19:32:39 +02:00
3dca040a0b Fix bug for #787 2014-10-08 19:31:15 +02:00
8327f1c371 Merge branch 'dev' into data-for-mysql 2014-10-08 19:26:26 +02:00
73c833780c Merge pull request #855 from wallabag/fix-828
Fix #828
2014-10-04 21:27:05 +02:00
f2cc1db1a8 Merge pull request #856 from wallabag/fix-826
Fix #826
2014-10-04 20:34:40 +02:00
34c2d1bdd1 get content 2014-10-04 20:17:00 +02:00
29e95769b5 Merge pull request #854 from wallabag/saveclick2search
Saveclick2search (fix for #831)
2014-10-04 20:13:10 +02:00
e3c44f9c0f get full content 2014-10-04 19:45:02 +02:00
40d2042228 small fix for better width for search translations full display 2014-10-04 19:08:56 +02:00
ab494e4ede translate search messages 2014-10-04 19:01:43 +02:00
1cd02d55fb autofocus on all themes 2014-10-04 18:51:43 +02:00
f183f72bf4 Merge branch 'dev' into saveclick2search 2014-10-04 18:47:56 +02:00
8b6c710b09 fixed bug in config screen for default theme 2014-10-04 18:45:43 +02:00
04b589420e search field selected 2014-10-04 18:44:18 +02:00
e38e46ecdb Merge pull request #853 from wallabag/fix-for-#797
Fix for #797
2014-10-04 17:50:01 +02:00
ace428669b fix for #758 2014-09-28 19:12:28 +02:00
b37110cc82 Merge branch 'issue-844' of https://github.com/rros/wallabag into dev 2014-09-28 17:48:06 +02:00
cde2fc3842 Merge branch 'dev' of https://github.com/wallabag/wallabag into dev 2014-09-28 17:32:50 +02:00
ffcd442989 get up to date for merge 2014-09-28 17:31:02 +02:00
76dd27e7f7 Merge pull request #802 from tcitworld/traductionfix
Traductionfix
2014-09-28 17:25:40 +02:00
9f86454b48 deleting send to kindle function 2014-09-28 17:20:35 +02:00
b852df020c add extension for pdf file 2014-09-28 12:18:47 +02:00
fa926fb47c offering download for pdf file and comment in code 2014-09-27 19:59:43 +02:00
6fc2c29daa revert routing bad deleting 2014-09-27 19:47:50 +02:00
a1b31d93b6 get up to date 2014-09-27 19:42:37 +02:00
824f8c45ed changed mpdf with tcpdf 2014-09-27 19:34:17 +02:00
a0822259e7 Merge pull request #841 from wallabag/fixGDdetection
Fix #766 - GD detection
2014-09-27 18:13:35 +02:00
9b8283d0fc Merge branch 'refactor' into dev 2014-09-27 17:54:24 +02:00
04a7674bdd merge refactor and dev 2014-09-27 17:54:13 +02:00
2d4cfc58ec Add support for custom http port
Now you can use wallabag behind reverse proxy (i.e Squid or Varnish)
without problem with urls like wallabag.example.com:8080.
2014-09-23 18:44:14 +02:00
0dc4797a4c Fix the PostgreSQL install errors 2014-09-21 00:39:40 +02:00
b668db242d Convert the MySQL charset to utf8mb4 to support the full range of unicode characters 2014-09-18 22:29:22 +02:00
bbfe6fa50b Fix #766 - GD detection 2014-09-17 16:36:10 +02:00
a15108e65b Merge pull request #839 from wallabag/fixlocalpictures
fix pictures display when DOWNLOAD_PICTURES is enabled
2014-09-16 21:18:41 +02:00
aa1083bdac fix pictures display when DOWNLOAD_PICTURES is enabled 2014-09-16 20:27:03 +02:00
b3c720b1c3 Merge pull request #836 from akoenig/x-forwarded-port
Implemented additional check for using the 'X-Forwarded-Port' header.
2014-09-16 20:09:58 +02:00
657245dcbd Merge pull request #771 from tcitworld/refactor
fixed bug for epub export #755 ; also better metadata title
2014-09-16 15:21:12 +02:00
5af2555f59 Implemented additional check for using the 'X-Forwarded-Port' header. 2014-09-11 13:17:19 +02:00
49882dc151 Merge pull request #819 from wallabag/fixSQLiteDownloadDB
Fix downloading SQLite database from all users
2014-09-10 20:05:07 +02:00
19438d3021 Merge pull request #816 from zinnober/dev
Complete rework of faz.net-template
2014-09-03 13:14:29 +02:00
d5c481c2f4 remove old function 2014-08-28 21:01:43 +02:00
8763e4efde Fix downloading SQLite database from all users 2014-08-26 12:43:56 +02:00
ecb8c1389c Complete rework of faz.net-template adding multipage support and major article cleanup 2014-08-23 16:47:29 +02:00
d4690a8fa1 removed unnecessary fonts 2014-08-21 18:54:25 +02:00
d05f5eeb1d added moreQueries for postgressql 2014-08-21 19:07:19 +03:00
4362417495 Merge branch 'dev' of https://github.com/wallabag/wallabag into dev 2014-08-21 16:42:22 +02:00
a9bbe11169 Merge pull request #814 from wallabag/fix-issue813
vendor dir is not accessible before install, sqlite db dir write check moved into db class
2014-08-21 16:28:16 +02:00
45e60cb52a Merge branch 'dev' of https://github.com/wallabag/wallabag into dev 2014-08-21 16:24:13 +02:00
211068ce50 vendor dir is not accessible before install, sqlite db dir write check moved into db class 2014-08-21 17:17:36 +03:00
051f7fb28c Merge pull request #783 from wallabag/message-after-login
#763 fix to display the login successful message with the translation
2014-08-18 14:41:09 +02:00
79666a3046 Merge pull request #784 from wallabag/fix-successful-add-message
fix display of 'Done' message when we add a link from 'save a link' item
2014-08-18 14:40:54 +02:00
78abff6a52 Merge pull request #785 from wallabag/change-default-pagination
change default pagination, set it to 12, to have a nice baggy display
2014-08-18 14:40:17 +02:00
1daa8e4a0f merge fix 776 2014-08-16 00:54:46 +02:00
dc76489221 minimum of control on server side added 2014-08-15 19:22:55 +03:00
7c503c4438 Fix for #797 2014-08-05 22:19:46 +02:00
b83690ebd8 removing examples for mpdf 2014-08-04 21:34:44 +02:00
a34d920847 Improved instructions 2014-08-03 18:17:43 +02:00
358c689cec little fix in locale files 2014-08-03 18:06:37 +02:00
2e8625c25f little fix 2014-07-29 22:18:15 +02:00
ab86a5124a more translations 2014-07-26 13:04:12 +02:00
280972a66c changes in all themes 2014-07-26 12:44:55 +02:00
200c758ff4 Translations 2014-07-26 12:42:48 +02:00
8492f37323 translation stuff (en & fr done) 2014-07-26 12:22:33 +02:00
f8c3798522 little better 2014-07-26 11:52:43 +02:00
9f3477a279 precision 2014-07-25 08:42:30 +02:00
046b931624 added email field 2014-07-25 08:42:03 +02:00
70549136ba link to guidelines in contributing file 2014-07-25 07:52:00 +02:00
6c0c750000 thank you @mariroz & @tcitworld :) 2014-07-25 07:50:56 +02:00
2f3c05651e guidelines for wallabag 2014-07-25 07:50:15 +02:00
fa9a7bbb3c Merge branch 'fix/securityAllowedActions' into dev 2014-07-25 07:27:21 +02:00
830612f555 typo 2014-07-25 07:26:56 +02:00
d49446ff98 bug with extension in the filename 2014-07-25 01:38:28 +02:00
dc59f164a9 send2kindle 2014-07-25 01:33:31 +02:00
deab6280d3 mobi (not tested on actual device) and pdf working 2014-07-25 00:33:19 +02:00
d07abb5c42 updated mpdf to 5.7.2 2014-07-24 22:01:35 +02:00
fb9df0c269 use directly MOBIClass 2014-07-24 21:56:04 +02:00
af8292c1de Merge branch 'fix/securityMaster' 2014-07-24 21:41:16 +02:00
38cf3413df 1.7.2 2014-07-24 21:41:01 +02:00
800868e27e security fix 2014-07-24 17:47:23 +03:00
c70bfefc68 add mobi and pdf to routing 2014-07-24 15:59:08 +02:00
15317991f3 from epub to all kind of ebooks 2014-07-24 15:53:23 +02:00
4188f38ad5 add pdf and mobi libraries 2014-07-24 15:49:36 +02:00
7dd8b5026d security issue 2014-07-24 16:48:41 +03:00
6da20812ce Merge branch 'dev' of github.com:wallabag/wallabag into dev 2014-07-23 13:45:07 +02:00
887b015def Merge branch 'refactor' into dev 2014-07-23 13:44:48 +02:00
505a74ad1d Merge branch 'dev' into refactor
Conflicts:
	check_setup.php
	index.php
2014-07-23 13:42:30 +02:00
83cac9ac05 Merge pull request #789 from wallabag/feature/someMoreSitesConfig
config for habrahabr.ru to grab articles with comments
2014-07-23 13:38:21 +02:00
a818ff2000 removed permissions test on htmlpurifier 2014-07-23 13:35:19 +02:00
0ce85e0a7f config for habrahabr.ru to grep articles with comments 2014-07-23 14:27:57 +03:00
86edff4447 Add data for mysql installation, see #624 2014-07-22 21:48:21 +02:00
ebd6bf6007 Merge branch 'anno1337-dev' into dev 2014-07-22 21:45:21 +02:00
1f78bd8471 Merge branch 'dev' of github.com:anno1337/wallabag into anno1337-dev 2014-07-22 21:26:02 +02:00
f83ffc3ac3 Merge branch 'feature/programmingCodeSyntaxHighlighting' into dev 2014-07-22 19:33:34 +02:00
392f9a1b9c Merge branch 'dev' into feature/programmingCodeSyntaxHighlighting 2014-07-22 19:32:24 +02:00
9f8541ef2a highlight.js library added to highlight programming code examples in article view 2014-07-22 20:17:15 +03:00
cca9284b6a change default pagination, set it to 12, to have a nice baggy display 2014-07-22 18:14:41 +02:00
3e87066506 fix display of 'Done' message when we add a link from 'save a link' item 2014-07-22 18:12:03 +02:00
9cf6bac1a5 fix to display the login successful message with the translation 2014-07-22 18:01:27 +02:00
b738bea9ca Fix #776 2014-07-22 16:37:13 +02:00
9c67b1b829 Split up check_setup.php into two files. The new file check_essentials.php takes care of stuff like the PHP version and is executed before the config files are included which are needed by check_setup. This patch addresses issue #773 2014-07-22 11:52:18 +02:00
955fc67438 Merge pull request #775 from wallabag/feature/someMoreSitesConfig
issue #750 - config for dn.pt site added
2014-07-21 21:31:45 +02:00
91b6be3186 Merge branch 'skibbipl-dev' into dev 2014-07-21 21:22:34 +02:00
17065e613f Merge branch 'dev' of github.com:skibbipl/wallabag into skibbipl-dev
Conflicts:
	locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo
	locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po
2014-07-21 21:21:55 +02:00
cec19bd866 Updated polish translation 2014-07-21 20:58:58 +02:00
5594d7d054 issue #750 - config for dn.pt site added 2014-07-21 19:34:59 +03:00
2b58426b2d fixed bug for epub export #755 ; also better metadata title 2014-07-20 00:45:45 +02:00
6a4bbf0fe5 Merge branch 'refactor' of github.com:wallabag/wallabag into refactor 2014-07-18 11:29:05 +02:00
8e68391a57 remove .idea in gitignore 2014-07-18 11:28:49 +02:00
93edcab52e Merge pull request #764 from tcitworld/refactor
Refactor Flattr class.
2014-07-17 16:06:53 +02:00
ccd0b381b6 camelCase for FlattrItem class (following) 2014-07-17 15:42:59 +02:00
d259f73665 camelCase for FlattrItem class 2014-07-17 15:34:55 +02:00
0f6273cdb8 Merge pull request #761 from wallabag/dev
1.7.1
2014-07-15 11:49:24 +02:00
4e067ceabd updated specific configuration for parsing 2014-07-13 10:15:40 +02:00
58dbe10388 #584 check permissions for HTMLPurifier/DefinitionCache/Serializer folder 2014-07-12 22:08:48 +02:00
d423113b00 #683 Rename « home » into « unread » 2014-07-12 21:50:29 +02:00
26452f891f Merge pull request #752 from mariroz/dev
fix of issue #650, #619 and other similar, error in JSLikeHTMLElement: node no longer exists.
2014-07-12 19:28:16 +02:00
2f26729c84 Refactor 2014-07-12 19:01:11 +02:00
b6a3c8866a forgot run() call 2014-07-12 16:41:55 +02:00
d610968932 ignore my PHPStorm config 2014-07-12 16:40:00 +02:00
26b77483ee remove PicoFarad
I’ll implement it an other day.
2014-07-12 16:39:31 +02:00
d14e3f1e22 Merge pull request #754 from sinisterstuf/about.com
Add support for *.about.com
2014-07-12 15:10:05 +02:00
b3cda72e93 PicoFarad framework for routing 2014-07-11 17:06:51 +02:00
3602405ec0 WHAT. A. BIG. REFACTOR. + new license (we moved to MIT one) 2014-07-11 16:03:59 +02:00
d59536deea Add support for *.about.com
Includes next_page_link for multi-page articles and strips pesky in-line
'next' links from the article body. Also includes an Xpath for author
but I can't see where this is used in the wallabag UI.

The 'tidy' option is turned off because it messed up bulleted lists.

Tested with psychology.about.com and food.about.com.
2014-07-11 00:04:24 +02:00
6400371ff9 I removed my previous commit. We have to create a new branch for that. 2014-07-10 13:17:04 +02:00
c1aad6d574 fix of issue #619 and other similar, error in JSLikeHTMLElement: node no longer exists. 2014-07-09 16:56:52 +03:00
cc1ec61b85 fix of issue #619 and other similar, error in JSLikeHTMLElement: node no longer exists. 2014-07-09 16:50:52 +03:00
c710f977b2 new call for having domain name in entry view 2014-07-08 21:57:53 +02:00
5425b0dd82 new fields in database, reading time / date and domain name are stored 2014-07-08 21:46:32 +02:00
4247b37551 Merge pull request #751 from mariroz/dev
quick fix of issue #750: mulipage content for politico.com/magazine articles
2014-07-07 21:11:07 +02:00
82980a148b quick fix of issue #750: mulipage content for politico.com/magazine articles 2014-07-07 19:17:55 +03:00
c13aac1bc3 1.7.1 2014-07-05 15:49:40 +02:00
da87848cee new config file, fix for #740 2014-07-01 10:18:44 +02:00
25052a76ca fix for #738 2014-06-30 23:24:46 +02:00
a13ff95777 security check 2014-06-30 22:15:55 +02:00
cdda041a90 Merge pull request #737 from mariroz/dev
fix of issue #677: When downloading images, wallabag doesnt respect html "base" tag, tnx to @fivefilters
2014-06-25 19:33:28 +02:00
6924253423 fix of issue #677: When downloading images, wallabag doesnt respect html "base" tag, tnx to @fivefilters 2014-06-25 20:00:00 +03:00
69213014d1 Merge pull request #736 from mariroz/dev
fix of issue #718: Error parsing file imported from Pocket #718
2014-06-25 18:54:39 +02:00
aa126ba458 fix of issue #718: Error parsing file imported from Pocket #718 2014-06-25 19:34:14 +03:00
c9563378ea Merge pull request #728 from Draky50110/dev
typo FR après vérif.
2014-06-12 23:30:53 +02:00
ba22fb1cef typo mineure 2014-06-12 23:10:26 +02:00
29cd317aff fin de correction typo FR 2014-06-12 22:21:44 +02:00
0bf95d865a Revert "Typo FR (suite)"
This reverts commit 7f186e21e0.

Conflicts:
	locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
	locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
2014-06-12 22:16:04 +02:00
ae43ec99d9 typo FR 3 2014-06-12 20:32:02 +02:00
7f186e21e0 Typo FR (suite) 2014-06-12 18:55:38 +02:00
bca2853ade Merge pull request #724 from Draky50110/dev
typo FR
2014-06-12 09:34:05 +02:00
97d54f2ac8 typo FR 2014-06-12 01:00:49 +02:00
8142d4b1e6 Merge pull request #722 from tcitworld/dev
do not output debug while generating epub
2014-06-07 16:38:39 +02:00
35d4e27588 up to date 2014-06-07 16:36:57 +02:00
ec15d0a784 do not debug inside an epub 2014-06-07 15:53:39 +02:00
c93a5c137f Merge pull request #716 from mariroz/dev
error reporting level set in E_ALL & ~E_NOTICE by default, can be overriden in config
2014-06-05 16:59:39 +02:00
752cd4a8ef error reporting level set in E_ALL & ~E_NOTICE by default, can be overriden in config 2014-06-02 18:00:09 +03:00
5d198e2b98 Merge pull request #715 from mariroz/dev
fix of undefined ATOM constant warning in full-text-rss, will fix ios-app issue #14
2014-06-01 19:06:45 +02:00
1d14e65315 fix of undefined ATOM constant warning in full-text-rss, will fix ios-app issue #14 2014-06-01 19:49:22 +03:00
67a8848aed Merge pull request #713 from mariroz/dev
small xss vulnerability and translation ability fix
2014-05-30 16:51:13 +02:00
30bd273580 small xss vulnerability and translation ability fix 2014-05-30 17:17:34 +03:00
cbc75befb5 small xss vulnerability and translation ability fix 2014-05-30 17:14:53 +03:00
a9f5e572dd Merge pull request #712 from wallabag/dev
1.7, call me "Premium version"
2014-05-29 18:54:06 +02:00
8038b38802 1.7, premium version :) 2014-05-29 18:52:34 +02:00
79024eb004 fix #344 FQDN with non-standard ports broken 2014-05-29 18:32:55 +02:00
0c3db64585 Merge pull request #711 from mariroz/dev
fix of uninitialized object warning, issue #710
2014-05-29 16:04:26 +02:00
3dc8d84229 fix of uninitialized object warning, issue #710 2014-05-29 16:35:00 +03:00
87f01ea2e9 Merge pull request #707 from mariroz/dev
update to 3.2 version of full-text-rss, issue #694
2014-05-29 12:50:28 +02:00
0b9bb8cb78 add dailymotion videos, issue #708 2014-05-26 14:29:18 +03:00
009669360d fix of onmouseover displaying of wallbabag a link in wallabag form in default theme 2014-05-24 11:21:43 +03:00
a342945b61 fix of rearch form popup in default theme 2014-05-24 11:08:39 +03:00
1fce49fac7 full-text rss config file for ted.com, issue #676 2014-05-23 19:29:01 +03:00
a50583fb97 last 3 important changes to 3.2 version of full-text-rss, issue #694 2014-05-23 19:27:17 +03:00
d18ff7d956 two small unimportant forgotten changes to 3.2 version of full-text-rss, issue #694 2014-05-23 19:25:48 +03:00
3ec62cf95a update to 3.2 version of full-text-rss, issue #694 2014-05-22 17:16:38 +03:00
ab157bbb75 Merge pull request #706 from gboudreau/dev
Fixed Baggy theme CSS for Chrome Extension (and < 500px width layout)
2014-05-21 22:13:31 +02:00
f61ffec352 Fixed Baggy theme CSS for Chrome Extension (and < 500px width layout) 2014-05-21 15:54:54 -04:00
88f0e31622 Merge pull request #703 from tcitworld/images_security
Security fixes for downloaded images (thanks @leblanc-simon)
2014-05-20 11:55:20 +02:00
38eecef26b Added info for DOWNLOAD_PICTURES
We regenerate pictures, it might take some time
2014-05-20 11:46:05 +02:00
99408dfcf3 Merge pull request #1 from leblanc-simon/images_security
Optimisation et gestion des erreurs
2014-05-20 11:42:22 +02:00
0bf0dfe10d Optimisation et gestion des erreurs 2014-05-20 00:42:51 +02:00
e3b00bcaf5 Fixed bug for png images 2014-05-19 15:59:18 +02:00
6caba976ec Bug with bracket 2014-05-19 15:34:49 +02:00
1d6a9ac25a Option for setting quality 2014-05-19 15:24:11 +02:00
03e501dedd Merge branch 'dev' into images_security 2014-05-19 15:04:09 +02:00
18209292a4 Fix bad character encoding when downloading images 2014-05-19 15:01:36 +02:00
007f26e582 Security fix for Download Images 2014-05-18 22:11:56 +02:00
04b43dc097 Merge pull request #697 from tcitworld/dev
Up-to-date with me
2014-05-18 19:00:51 +02:00
becc5bfbf2 Fix for #678 2014-05-18 18:56:20 +02:00
230fa05eb7 Better Grammar 2014-05-17 20:32:38 +02:00
96834a47b0 Added PHPePub 2014-05-16 17:38:19 +02:00
e212e6b12a Cleaned epub fonction 2014-05-16 16:49:09 +02:00
404adf970d Merge branch 'epub' into dev
Conflicts:
	themes/baggy/home.twig
2014-05-16 16:31:18 +02:00
7d5d9ea449 Merge pull request #693 from tcitworld/dev
better wallabag in wallabag button (see #685)
2014-05-16 15:54:54 +02:00
74e09e562b better wallabag in wallabag button (see #685) 2014-05-16 15:34:13 +02:00
60c3a4d3e1 Merge pull request #689 from tcitworld/dev
Tag-related features
2014-05-16 13:31:53 +02:00
f3f0b11393 Better names for epub files and epub in all themes now 2014-05-15 15:42:36 +02:00
f2b6b4e230 Fix bugs and improved epub rendering 2014-05-14 22:03:16 +02:00
6a3c510157 Merge branch 'dev' of https://github.com/wallabag/wallabag into epub 2014-05-14 19:17:51 +02:00
4555c38d3b Changed theme for better translation method 2014-05-14 19:08:33 +02:00
24696800e5 Simplifed function which does tag cleanup 2014-05-14 18:51:02 +02:00
818b186f8a Merge pull request #680 from m-r-r/fr-1.6.1
French translation update
2014-05-13 16:44:16 +02:00
4910af33ff Removed unnecessary function for cleaning tags 2014-05-11 16:14:47 +02:00
0626e52f3c Merge branch 'dev' of https://github.com/wallabag/wallabag into dev 2014-05-11 15:44:43 +02:00
f034640ca3 Added advices to submit a bug
Discussion at #662.
2014-05-11 15:33:44 +02:00
1829b362fc Updated the french translation 2014-05-10 20:11:00 +02:00
34acb02cbb Added translation capabilities for epub system 2014-05-07 12:48:46 +02:00
4877836b12 Many improvements to epub produced : better cover, better tags 2014-05-07 12:40:09 +02:00
07ed2b0231 #568 missing rss.png files 2014-05-02 17:04:08 +02:00
9c743ab965 Clean old unused tags when deleting a tag 2014-04-30 12:14:20 +02:00
78bddb22be Remove unnecessary line 2014-04-30 11:31:21 +02:00
decc23aaf2 Added save search as tag functionality 2014-04-30 11:25:03 +02:00
2395a3802a Changed template organisation 2014-04-29 19:57:59 +02:00
7ec445b06e Big changes for epub export. Now possible to do it from a tag, a category and a search. Also, improved ebook rendering. 2014-04-25 16:20:25 +02:00
21f29fe492 Merge pull request #667 from mariroz/dev
fix of putenv warning under safe mode, issue #646
2014-04-25 13:03:09 +02:00
5b5e47c3ae fix of already defined constant notice, issue #653 2014-04-25 13:41:42 +03:00
b6413975c3 fix of putenv warning under safe mode, issue #646 2014-04-25 13:25:03 +03:00
d151b51c67 Merge pull request #665 from mariroz/dev
fix of rss headers problem
2014-04-24 18:05:16 +02:00
827f5b42a6 fix of rss headers problem 2014-04-24 11:48:00 +03:00
ef17914960 Fix for #664 - Missing source url attribute in RSS feeds 2014-04-24 09:39:50 +02:00
72a857158c Fixed a bug into PHPePub with special caracters 2014-04-24 03:08:31 +02:00
87090d8ae7 Added epub export function 2014-04-24 03:04:02 +02:00
8af31ae0f7 Added default statement for db system 2014-04-23 22:48:33 +02:00
feecea2806 Fix #657 and postgresql problems 2014-04-23 22:39:43 +02:00
07da861126 Added multi-user functionnality in all themes 2014-04-23 10:53:57 +02:00
c97d23c533 Merge branch 'dev' of https://github.com/wallabag/wallabag into dev 2014-04-23 10:34:22 +02:00
4d99bae893 Fixed Multi-user system 2014-04-23 10:29:53 +02:00
2a6440c134 Merge pull request #659 from mariroz/dev
last error: config.inc.default.php missed
2014-04-22 21:44:12 +02:00
4dbba60439 last error: config.inc.default.php missed 2014-04-22 22:38:10 +03:00
29cf52b677 Merge pull request #658 from mariroz/dev
inc/poche/config.inc.php.new removed
2014-04-22 20:48:42 +02:00
fd86559a5b inc/poche/config.inc.php.new removed 2014-04-22 21:39:03 +03:00
d70dd7ac69 Merge pull request #653 from mariroz/dev
print view fixed in baggy; print link added; read percent added in default theme; archive and favorite re-factored to be ajax action in article view
2014-04-22 20:18:46 +02:00
43c7b978c3 config.inc.php.new renamed in config.inc.default.php 2014-04-22 20:58:40 +03:00
dfff18f81b Merge pull request #655 from julien-m/patch-2
parse mobile.lemondeinformatique.fr
2014-04-22 18:24:17 +02:00
a4a870e1ec default config is included after user config to prevent undefined constant warning 2014-04-22 19:11:26 +03:00
03303cd71b parse mobile.lemondeinformatique.fr
site_config file created because the title isn't parsed by default for mobile version of lemondeinformatique.fr
2014-04-22 14:44:31 +02:00
c2cf7075c2 print view fixed in baggy; print link added; read percent added in default theme; archive and favorite re-factored to be ajax action in article view 2014-04-22 10:45:09 +03:00
bfe1ad6dbc Merge pull request #643 from wallabag/fix-636
[fix] rss feed content type set to text/xml #636
2014-04-15 21:49:37 +02:00
6212acfc81 [fix] rss feed content type set to text/xml #636 2014-04-15 21:49:00 +02:00
847f57686e Merge pull request #642 from jplock/patch-2
Added IF NOT EXISTS
2014-04-14 15:42:09 +02:00
44fd0faa23 Added IF NOT EXISTS 2014-04-14 09:40:35 -04:00
df6c8b3be9 Merge pull request #637 from Bubbendorf/dev
Improvements on french translation
2014-04-13 12:50:48 +02:00
a192c21c6a Improved french translation 2014-04-13 00:02:03 +02:00
f3312ce58d Merge pull request #635 from DmitrySandalov/dev
added missing image to dmagenta theme
2014-04-11 22:56:59 +02:00
603ecb0052 added missing image to dmagenta theme 2014-04-12 00:08:11 +04:00
4a74d9857c Merge pull request #634 from wallabag/dev
1.6.1
2014-04-11 17:22:04 +02:00
7256e9e139 1.6.1 version 2014-04-11 17:08:11 +02:00
f09d76b0ea Merge pull request #633 from mariroz/dev
error with empty content by import fixed. Also youtube and vimeo videos are allowd in content now.
2014-04-11 16:56:59 +02:00
0f859c6f32 error with empty content by import fixed. Also youtube and vimeo videos are allowd in content now. 2014-04-11 17:21:54 +03:00
389d751e92 Merge pull request #632 from mariroz/dev
logging by import added; error by creation table if exists in postgresql...
2014-04-11 14:00:04 +02:00
5ce3978472 logging by import added; error by creation table if exists in postgresql fixed. 2014-04-11 14:43:17 +03:00
d5f36a8d9e Merge pull request #623 from wallabag/fix-610
Fix display problem with smartphone and Baggy #610
2014-04-08 22:43:39 +02:00
08f539f738 responsive for search form #610 2014-04-08 22:42:34 +02:00
6e8030a0db [fix] display problem with smartphone and Baggy #610 2014-04-08 22:33:28 +02:00
b96b075b55 Merge pull request #622 from wallabag/fix-612
[fix] Escap key displays save a link form #612
2014-04-08 22:11:17 +02:00
f8e9d8bdbc [fix] Escap key displays save a link form #612 2014-04-08 22:10:40 +02:00
bf20b541ae Merge pull request #621 from wallabag/fix-613
can't close search popup with the cross picture #613
2014-04-08 21:59:40 +02:00
3945335f39 can't close search popup with the cross picture #613 2014-04-08 21:58:44 +02:00
2c534c184d Merge pull request #618 from mariroz/dev
remove duplicates by import; code formatting changes: tabs replaced with spaces
2014-04-08 10:54:17 +02:00
a8ef1f3f43 code formatting changes: tabs replaced with spaces, some other small formatting enhancements 2014-04-08 11:49:41 +03:00
86da39886d remove duplicates by import, code changes: tabs replaced with spaces 2014-04-08 11:41:06 +03:00
a7f39918bf Merge pull request #614 from wallabag/fix-host-getpocheurl
[fix] with some config, http host is different
2014-04-07 15:45:26 +02:00
69c57493e7 [fix] with some config, http host is different 2014-04-07 15:44:05 +02:00
5fe1948097 Merge pull request #611 from wallabag/fix-french-locale
update french locale, thx to @goofy-bz and @Draky50110 #596
2014-04-07 15:15:42 +02:00
d9b51a21fa update french locale, thx to @goofy-bz and @Draky50110 #596 2014-04-07 15:14:50 +02:00
9cb9ab552b Merge pull request #609 from wallabag/fix-desciption-typo
remove unnecessary variable declaration
2014-04-06 20:54:20 +02:00
7a873ef1d7 remove unnecessary variable declaration 2014-04-06 20:53:31 +02:00
292cd0dbd5 Merge pull request #606 from wallabag/fix-556
in RSS feed, add link to wallabag URL #556
2014-04-06 16:40:17 +02:00
f86784c22d in RSS feed, add link to wallabag URL #556 2014-04-06 16:39:11 +02:00
2dd5c1e4a3 Merge pull request #605 from wallabag/fix-604
[fix] Use of undefined constant ATOM #604
2014-04-06 16:22:57 +02:00
29d9c0ffe1 [fix] Use of undefined constant ATOM #604 2014-04-06 16:21:48 +02:00
d7ee9f986b Merge pull request #603 from mariroz/dev
postgres sequence error fix, issue #602
2014-04-05 12:36:20 +02:00
1bcbe8bebf postgres sequence error fix, issue #602 2014-04-05 11:22:33 +03:00
db117db3c5 Fix to #600 2014-04-04 22:36:33 +02:00
4a16f33dcc Changed copyright to 2014
Happy new year !
2014-04-04 22:13:06 +02:00
0d67b00d5d Merge pull request #595 from wallabag/dev
wallabag 1.6.0
2014-04-03 14:42:03 +02:00
7d2f1aa279 [add] link on config page to fetch content 2014-04-03 14:39:13 +02:00
bfa32856bc yeah, 1.6, one year after the 1st commit 2014-04-03 13:54:06 +02:00
06e1a9a98a import w/o cron: fix of "click to finish import" in baggy theme 2014-04-03 14:35:50 +03:00
d9bb0cdeb8 import w/o cron: explanation added 2014-04-03 13:53:47 +03:00
4d2bd6e507 import w/o cron: error in url fix 2014-04-03 13:19:54 +03:00
a297fb1e38 import w/o cron 2014-04-03 12:18:49 +03:00
a4585f7eaa import without cron 2014-04-02 22:33:06 +03:00
182faf2696 import without cron 2014-04-02 20:55:19 +03:00
d967a1fa14 Important fixes for search engine (thx @mariroz)
So sorry for the mess... :(
* search only in users' own articles
* sanitized what is searched
* display what is searched
* pagination, sorting available when searching
* use existing function to query db
* bad encoding caracters fixed
* link to JQuery into default theme, no longer in each theme
* some spaces instead of tabs
2014-04-02 17:44:47 +02:00
22db488d21 Merge branch 'dev' of https://github.com/wallabag/wallabag into dev 2014-03-30 21:17:28 +02:00
1be13ba1fc oops, restore @tcitworld commit. I'm so tired 2014-03-30 21:16:45 +02:00
d6d8a045e6 Merge pull request #588 from mariroz/dev
fix of bug with default theme constant
2014-03-30 20:04:55 +02:00
1d0995bb8e [fix] undefined vars in install script 2014-03-30 19:57:39 +02:00
3345c9dc39 fix of bug with default theme constant 2014-03-28 21:19:08 +02:00
fecb62a396 Improvements to install script
* automatically remove install/ folder
* go easier though the compatibility test <-> install script pages
* Small fixes which raised php warnings
2014-03-28 20:00:02 +01:00
ad697686c0 Final Fix of #570
Adds a date information to the exported data file.
2014-03-28 16:53:06 +01:00
cdada41505 Merge pull request #587 from mariroz/dev
problem with resources and localhost url fix
2014-03-28 10:30:51 +01:00
08718c01e4 problem with resources and localhost url fix 2014-03-28 11:26:48 +02:00
b152f2b6ba Fix to bug #570
Forces the download of the data exported file as a poche-export file.
2014-03-28 00:57:07 +01:00
04fbe8f5ef Merge pull request #586 from mariroz/wb-link-in-wb
wallabag a link in wallabag now in default theme, issue #505
2014-03-27 19:44:28 +01:00
e68348f627 wallabag a link in wallabag now in default theme, issue #505 2014-03-27 18:21:30 +02:00
9591ee2603 Merge pull request #585 from kevmeyer/dev
updated german localisation
2014-03-27 13:56:40 +01:00
5814ef0d25 updated german localisation 2014-03-27 13:44:19 +01:00
d607330557 Improvements for compatibility_test file
- gettext detection (not default on WAMP) ; part fix of #579
- added colors to make viewing what's wrong better and quicker
(green/orange/red)
- added a link to index.php if it's good
2014-03-26 18:46:46 +01:00
ad03eb6286 Fix of #580 : Add some random for Windows hosts 2014-03-26 17:19:57 +01:00
cc60cbbbab Finished search engine function
Now searches also in title and in original url
2014-03-26 16:36:42 +01:00
d619120fc4 Merge pull request #582 from mariroz/fix-session-livetime
fix of localhost cookie related to nginx binding to 0.0.0.0
2014-03-24 11:12:56 +01:00
2c4e7a1cea Fixes to search engine
Changed the search parameter from POST to GET.
Also, adapted the Baggy theme.
2014-03-23 23:52:05 +01:00
a33a3d2afb Implemented rudimental search engine 2014-03-22 11:09:18 +01:00
03832b45e1 fix of localhost cookie related to nginx binding to 0.0.0.0 2014-03-21 21:56:40 +02:00
028e34b6c4 Merge pull request #581 from mariroz/fix-session-livetime
fix of issue under nginx and php-fpm
2014-03-21 14:05:51 +01:00
ad53faf25c fix of issue under nginx and php-fpm 2014-03-21 14:59:30 +02:00
0c51bfea6f Merge pull request #576 from mariroz/fix-session-livetime
fix of  _SESSION - indefined variable
2014-03-19 19:26:05 +01:00
6fa3f70bc2 fix of _SESSION - indefined variable 2014-03-19 19:22:04 +02:00
db41c907aa Merge pull request #572 from mariroz/fix-session-livetime
fix of #115, server relater config value added
2014-03-18 21:29:58 +01:00
2a97194253 fix of #115, server relater config value added 2014-03-18 17:39:19 +02:00
a7048bc45d Merge pull request #567 from mariroz/fix-session-livetime
fix of #115 - stay connected and session livetime
2014-03-17 21:49:42 +01:00
eb5b677250 fix of #115 - stay connected and session livetime 2014-03-17 22:22:05 +02:00
897b2b5302 Merge pull request #566 from camporez/dev
Update brazilian traslation title to "Português (Brasil)"
2014-03-17 08:09:18 +01:00
5805ac4574 Update brazilian traslation title to "Português (Brasil)" 2014-03-16 16:43:46 -03:00
07e028fe5c Merge pull request #563 from camporez/dev
Update brazilian translation
2014-03-16 18:55:59 +01:00
08dde123b1 Correct README.md 2014-03-16 11:58:16 -03:00
82cff5af70 Update brazilian translation 2014-03-15 17:23:34 -03:00
8754bd88a5 Merge remote-tracking branches 'upstream/dev' and 'origin/master' into dev 2014-03-15 15:03:26 -03:00
6a915551ab acc 2014-03-14 14:15:26 -03:00
ed02e38e1d [fix] in RSS, link to original article 2014-03-14 09:35:48 +01:00
8d7cd2ccd5 [add] remove import file in CACHE when import is over 2014-03-14 08:54:44 +01:00
c0586a906c [fix] new import section in old themes #559 2014-03-14 08:37:40 +01:00
181d16fe22 Merge pull request #557 from mariroz/feature-add-link-inside-article-issue-505
saving link form now sends ajax request, article view is now justified (issue #554)
2014-03-13 20:57:22 +01:00
3ee27ee6ba saving link form now sends ajax request, article view is now justified 2014-03-13 18:37:08 +02:00
6775da70a8 feature #505 - it is now possible to add link from bagged article (TODO: redev it to ajax action). Some enhancements to "save a link" popup div 2014-03-12 17:36:04 +02:00
f7382cd8c3 Merge pull request #549 from mariroz/fix-tagform-and-shortcat-toggle-savelinkform-conflict
fix of conflict of s shortcat and entering s in input fields
2014-03-12 12:55:48 +01:00
7339b0b08d fix of conflict of s shortcat and entering s in input fields 2014-03-12 13:00:37 +02:00
1acd18510a Merge pull request #544 from mariroz/feature-tags-autocomplete
a lot of enhancements related to tags: tags list is now sorted, shows number of articles, autocomplete added according to #477, #542
2014-03-10 18:14:43 +01:00
fb26cc9375 a lot of enhancements related to tags: tags list is now sorted, shows number of articles, autocomplete added according to #477, #542 2014-03-10 16:28:47 +02:00
d47a05a9a5 Merge pull request #535 from bobmaerten/clarify-import-process
Changed config section to clarify import process.
2014-03-10 13:14:26 +01:00
17b2afefad [fix] test if user_id doesn't exist in feeds generation 2014-03-10 08:10:03 +01:00
4744cb0e1d bagit link + overlay save link + listmode 2014-03-08 13:47:15 +01:00
7c6aa8d826 Changed text to clarify import process. 2014-03-07 16:46:46 +01:00
b3f7b7d200 Merge branch 'dev' of https://github.com/wallabag/wallabag into dev 2014-03-07 14:49:46 +01:00
1ab567f6e3 [add] clean content articles in cron 2014-03-07 14:49:36 +01:00
f0d584503f Merge pull request #533 from mariroz/dev
fix of #530 - import fail from Poche
2014-03-07 13:59:38 +01:00
042486c511 fix of #530 - import fail from Poche 2014-03-07 14:52:52 +02:00
ded2c63312 Merge pull request #532 from wallabag/upload-file
New import system
2014-03-07 13:26:56 +01:00
bf79463070 Merge pull request #531 from mariroz/upload-file
getPageContent moved to Tools, fix of #426
2014-03-07 11:57:11 +01:00
f98373cc34 getPageContent moved to Tools, fix of #426 2014-03-07 12:54:08 +02:00
25114854b3 [fix] remember scroll position for baggy theme #519 2014-03-06 18:57:04 +01:00
4ca17924a1 [fix] links for firefox / android / ios apps 2014-03-06 18:45:15 +01:00
9a010227d7 Merge pull request #524 from kevmeyer/dev
updated german localization
2014-03-04 12:40:43 +01:00
e1a625ad35 added missing german localization strings 2014-03-04 11:53:40 +01:00
eace9f914d updated german localization 2014-03-04 11:32:45 +01:00
d3b52886f5 [change] ignore tmp files in HTML purifier 2014-03-02 08:52:03 +01:00
71b0d53c5e [fix] #115 cookie lifetime was empty 2014-03-02 08:38:26 +01:00
11c680f97a [add] display last check of wallabag release 2014-03-01 19:10:17 +01:00
223268c2fa [fix] RSS Feeds don't validate / W3C #384 2014-03-01 13:09:37 +01:00
53e3158dfe [add] cron to fetch content on imported entries 2014-02-28 21:49:38 +01:00
31a10069a5 [add] upload form for import 2014-02-28 20:36:32 +01:00
4c14936353 road to 1.5.3 2014-02-28 14:57:04 +01:00
2bb207d005 [fix] #483 pdo_sqlite not required if we want mysql / pgsql 2014-02-28 14:54:50 +01:00
d429305836 [fix] #490 flattr icon in baggy theme 2014-02-28 14:27:10 +01:00
49c803425c Merge branch 'dev' of https://github.com/wallabag/wallabag into dev 2014-02-28 14:06:59 +01:00
cf75bb31e9 Merge pull request #517 from mariroz/dev
effect of block rebuilding on next page removed, issue #479
2014-02-28 12:17:18 +01:00
fc52df0677 effect of block rebuilding on next page removed, issue #479 2014-02-28 13:13:30 +02:00
6065553c13 effect of block rebuilding on next page removed, issue #479 2014-02-28 13:08:11 +02:00
346380e131 [add] label for brazilian language on config screen 2014-02-27 21:37:25 +01:00
affbd83b48 Merge pull request #515 from mariroz/dev
fix of #509, related to php 5.3
2014-02-27 21:23:10 +01:00
381d182726 Syntax fix.
I think this will be the smallest commit I'll ever make.
2014-02-27 21:16:16 +01:00
2048661b0c Merge pull request #513 from camporez/dev
Brazilian portuguese translation
2014-02-27 20:59:59 +01:00
6a0329f756 Add brazilian portuguese (pt-BR) translation
modified:   locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo
	renamed:    locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo -> locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.po
2014-02-27 16:36:32 -03:00
35c7e0a69c Create pt_BR.utf8.mo 2014-02-27 16:18:53 -03:00
decb9a5814 fix of #509, related to php 5.3 2014-02-27 18:12:43 +02:00
61e79d9344 Merge pull request #510 from mariroz/dev
some baggy theme fixes and enhancement: issue #479
2014-02-27 15:20:01 +01:00
36a733af8d some baggy theme fixes and enhancement: issue #479 2014-02-27 16:11:37 +02:00
a8464c9719 [fix] hover problem with logout link #489 2014-02-27 13:36:06 +01:00
e145f767f3 [add] empty cache after changing language #492 2014-02-27 13:26:07 +01:00
56532c4e72 [add] Empty cache after changing theme #503 2014-02-27 13:24:29 +01:00
fa37042b32 [fix] Baggy theme navigation bug #485 2014-02-27 13:21:54 +01:00
0e7f04b04e Merge pull request #504 from mariroz/dev
translation related: how-to md file added, script to generate php from all twig templates, polish mo file compiled
2014-02-26 14:56:15 +01:00
cbcae4037c translation related: how-to md file added, script to generate php from all twig templates, polish mo file compiled 2014-02-26 15:43:49 +02:00
72f7ff0589 Merge pull request #502 from skibbipl/patch-1
Update pl_PL.utf8.po
2014-02-26 09:23:26 +01:00
2c83741171 Update pl_PL.utf8.po
First cleanup, more to come.
2014-02-25 18:20:13 +01:00
78dd437928 Merge pull request #501 from mariroz/dev
fix of #498, #493, #494 - because disappeared in last commit
2014-02-25 18:10:32 +01:00
f5b5622a89 fix of #498, #493, #494 - because disappeared in last commit 2014-02-25 19:08:18 +02:00
bb75d2b01a Merge pull request #499 from mariroz/dev
French translation added by @Draky50110, issue #488
2014-02-25 17:57:38 +01:00
2cf87a4da1 French translation added by @Draky50110, issue #488 2014-02-25 18:40:25 +02:00
9fad46bd0e Merge pull request #495 from mariroz/dev
fix of global $http visibility, issues #493, #494
2014-02-25 17:27:51 +01:00
dcc73856a9 "poche" word removed completely, all locales .po files updated, en, pl, ru and uk .mo files recompiled. 2014-02-25 15:45:39 +02:00
4b842b20ce fix of #486 - import issue 2014-02-24 19:13:54 +02:00
49b56f19d8 Polish, Russian and Ukrainian locales updated, Franch locale po file uopdated. issue #488 2014-02-24 15:38:49 +02:00
25e1213d1b fix of global $http visibility, issues #493, #494 2014-02-24 12:19:46 +02:00
92fc97eeb3 [fix] redirect on config page after token generation #491 2014-02-23 09:56:21 +01:00
48e063904d [change] remove old logo #484 2014-02-23 09:50:11 +01:00
99679d0688 Merge pull request #481 from wallabag/dev
1.5.2
2014-02-21 15:57:10 +01:00
d3b47e9470 [release] 1.5.2 2014-02-21 15:44:57 +01:00
1570a65381 [fix] content is now cleaned by HTML purifier from prevent XSS attack 2014-02-21 15:44:13 +01:00
d4949327ef [add] HTML Purifier added to clean code 2014-02-21 15:43:14 +01:00
c9bd17a100 [add] languages well displayed on config page #480 2014-02-21 15:24:33 +01:00
0a022f9a39 [add] slovene language 2014-02-21 15:11:45 +01:00
565bb72d99 [fix] link in footer was unclickable #453 2014-02-21 15:00:21 +01:00
e5382002b4 [change] login button into sign in 2014-02-21 14:58:07 +01:00
3628b24d12 [change] remove some poche terms in old default theme #471 2014-02-21 14:53:43 +01:00
cd425599ce typo in fonts call and in label on config screen 2014-02-21 14:08:20 +01:00
e7345a2c4f Merge branch 'dev' of git://github.com/mariroz/wallabag into dev 2014-02-21 13:44:30 +01:00
032e0ca13a a lot of refactoring: tag action is now handled by home view and uses sorting and pagination. Some small view enhacenments. Fix of #476, #461 for baggy and other themes 2014-02-20 19:28:39 +02:00
3ade95a3d7 [fix] themes sorted A->Z #470 2014-02-20 13:29:53 +01:00
fddf4fbacc Merge branch 'dev' of git://github.com/arnaudmm/wallabag into arnaudmm-dev 2014-02-20 13:15:27 +01:00
926acd7bba Feature #457 : import from pocket now import tags too 2014-02-20 13:09:27 +01:00
8975653d4c Merge branch 'mariroz-dev' into dev 2014-02-20 13:03:59 +01:00
689de3dbcc rename font folder into fonts in baggy theme 2014-02-20 13:02:13 +01:00
ab5bb94b12 Merge branch 'dev' of git://github.com/mariroz/wallabag into mariroz-dev 2014-02-20 12:49:49 +01:00
6203ef8e51 Merge remote-tracking branch 'upstream/dev' into dev 2014-02-20 11:42:18 +02:00
e83cf5a787 multiple tag entry displayed fix, issue #474 2014-02-20 10:41:16 +02:00
d09a5674e9 [add] message in install screen to prevent user when wallabag is already installed 2014-02-20 08:58:59 +01:00
d0a599bbae Merge pull request #473 from nsteinmetz/dev
Baggy Theme - PtSans font is now local
2014-02-20 08:27:54 +01:00
30c12d3927 add font file 2014-02-19 23:30:55 +01:00
860473f33c Update font.css
Add reference for ptsans font in local instead of google fonts
2014-02-19 23:09:12 +01:00
e1cfef7bf1 Update _head.twig
Remove googlefonts now called in font.css - need still to put the woff file in font directory
2014-02-19 23:08:01 +01:00
b4fd2154fe Full-Text RSS included as a script instead of file_get_contents call. Tnx to @Faless. Fix issues #366 and #463 2014-02-19 19:08:19 +02:00
f37891fdb6 [fix] css display with baggy theme 2014-02-19 15:20:13 +01:00
aad8fbab09 Merge branch 'dev' of https://github.com/wallabag/wallabag into dev 2014-02-19 15:19:02 +01:00
7785f0c75f Merge pull request #467 from mariroz/dev
"save a link" added to top menu (default theme) to toggle "save link" form,  issue #461
2014-02-19 15:17:13 +01:00
a71dc5d7d0 Merge branch 'dev' of git://github.com/mariroz/wallabag into dev 2014-02-19 15:12:49 +01:00
655214ab30 Merge pull request #469 from wallabag/dev
version number 1.5.1
2014-02-19 13:56:06 +01:00
fb5a9666ed version number 1.5.1 2014-02-19 13:55:40 +01:00
60ca369cd3 Merge pull request #468 from wallabag/dev
1.5.1
2014-02-19 13:47:11 +01:00
b89d5a2bf4 [fix] security problems with tags 2014-02-19 13:25:28 +01:00
53ae58e1a1 Merge branch 'dev' of https://github.com/wallabag/wallabag into dev 2014-02-18 21:22:41 +01:00
792097fb6a [add] script to make the install more user friendly #466 2014-02-18 21:22:34 +01:00
970cfb1166 Merge pull request #460 from mariroz/dev
duplicate check added. fix of issue #400
2014-02-18 15:29:40 +01:00
01cd443441 "save a link" added to top menu (default theme) to toggle "save link" form message, issue #461. "Mark all the entries as read" link added in default theme. 2014-02-16 21:00:30 +02:00
488fc63b67 duplicate check added. fix of issue #400 2014-02-14 17:27:22 +02:00
6285e57c49 [add] link to empty cache in config screen, #454 2014-02-14 15:11:57 +01:00
243e13ab59 [fix] #452 remove crappy code 2014-02-13 23:00:26 +01:00
5e98c2183a Merge pull request #450 from wallabag/dev
1.5.0
2014-02-13 19:49:25 +01:00
9f3148fec7 [change] change default content #445 2014-02-13 19:31:46 +01:00
c9357429fd [fix] remove htacces in inc/, bug to fetch content 2014-02-13 19:22:54 +01:00
41265e07d4 add help about vendor.zip 2014-02-13 18:57:57 +01:00
2e4440c3f8 [change] wallabag in feeds title 2014-02-13 08:57:44 +01:00
3141347214 new default theme, baggy \o/ 2014-02-12 21:59:02 +01:00
943ac3c77e new theme, baggy one cf #448 2014-02-12 21:58:40 +01:00
83b47311ba go go go, 1.5 powa 2014-02-12 21:58:14 +01:00
16fd1cce61 [change] time for session 2014-02-12 21:52:51 +01:00
f14807de06 [add] mark all as read #385 2014-02-12 21:52:01 +01:00
ed2853564e [fix] somes fixes on old default theme 2014-02-12 21:51:11 +01:00
26170f4613 change static files 2014-02-12 21:46:49 +01:00
68268c0199 Merge branch 'dev' of https://github.com/wallabag/wallabag into dev 2014-02-12 20:05:51 +01:00
5966d2c2d3 change README 2014-02-12 20:05:47 +01:00
26929c08d3 bug fix #430 - welcome to your wallabag 2014-02-12 20:04:47 +01:00
044bf638a8 bug fix #364 - RSS Feed URL problem with + sign 2014-02-12 19:58:49 +01:00
58f6269f36 Merge pull request #439 from flolauck/master
Adding .htaccess files to prohibit access to critical directories, e.g., db/
2014-02-10 12:10:08 +01:00
3a68883ae9 Adding .htaccess files to prohibit access to critical directories, e.g., db/ 2014-02-10 08:58:21 +01:00
211ed48361 Merge pull request #435 from mariroz/dev
Polish and Ukrainian translations added. Russian - updated. Plust 2 smal...
2014-02-07 18:41:30 +01:00
c515ffec9c Polish and Ukrainian translations added. Russian - updated. Plust 2 small translation related fixes in code. 2014-02-07 17:49:27 +02:00
4e09039d2c Merge pull request #434 from thomaslebeau/theme-courgette
Theme courgette
2014-02-07 09:41:42 +01:00
1e1e4e4eca [remove] fontello theme courgette 2014-02-07 00:08:58 +01:00
c8265d95b0 [add] maj theme courgette : ajout tag 2014-02-07 00:07:54 +01:00
2e384abab6 Merge pull request #428 from mariroz/dev
all locale files re-compiled: fix of #416 Some language problems in the ...
2014-02-04 02:13:32 -08:00
736a4fb77e all locale files re-compiled: fix of #416 Some language problems in the french Config Page 2014-02-04 11:52:03 +02:00
38dafee05d Merge pull request #427 from wallabag/dev
changelog 1.4
2014-02-03 10:03:41 -08:00
fa0bfb775a [fix] #389 Empty article title (blank title tag) 2014-02-03 17:11:14 +01:00
445a1a1c8d [fix] Add support for X-Forwarded-Proto header field #413 2014-02-03 12:46:09 +01:00
1e1fd6f24d [add] link to test file when we install wallabag #392 2014-02-03 12:43:34 +01:00
a678f9df38 [fix] #421 Tables content in solarized themes unreadable 2014-02-03 12:34:28 +01:00
f85bfdf186 Merge branch 'dev' of git://github.com/mariroz/wallabag into mariroz-dev 2014-02-03 11:56:01 +01:00
cae70cdbdb [fix] courgette theme: Old constant call, replaced by the new one. 2014-02-02 19:13:05 +01:00
ebae8c8315 [del] courgette theme: Useless templates because they are identical to those of default theme and so inherited from it. 2014-02-02 19:10:35 +01:00
6af66b1106 fix of bug #368 Endless redirects or user doesn't exist with basic authentication 2014-01-30 16:35:31 +02:00
f355d2c87f poche -> wallabag 2014-01-28 13:47:15 +01:00
f4fbfaa7cb some fix to courgette theme 2014-01-28 11:19:06 +01:00
21f50d5a08 changed some poche with wallabag 2014-01-28 11:08:21 +01:00
1b539ba1ec Merge branch 'extraction-with-basic-auth' of git://github.com/aaa2000/poche into aaa2000-extraction-with-basic-auth 2014-01-28 10:56:57 +01:00
3e0e7e1208 [fix] inthepoche.com => wallabag.org 2014-01-28 10:49:57 +01:00
b8fdd2d85f [fix] change twitter account for sharing entry 2014-01-28 10:37:37 +01:00
c95b78a8ce poche is dead, welcome wallabag 2014-01-28 10:36:04 +01:00
3ae345b3d7 Merge pull request #410 from Lonnytunes/dev
Fix: stops multiplication, in database, of a same user config item
2014-01-21 04:46:14 -08:00
d1d3498b62 [fix] Stops multiplication, in database, of a same user config item (error of variable name). 2014-01-20 00:44:51 +01:00
f878daeb8b add basic auth in file_get_contents for content extraction when user use basic auth 2014-01-12 17:08:52 +01:00
9ba98a0abe [add] display token and user id 2014-01-12 17:06:52 +01:00
1cecaa7926 [add] display token and user id 2014-01-10 16:33:10 +01:00
2744d07d71 Merge branch 'dev' of https://github.com/inthepoche/poche into dev 2014-01-08 11:28:53 +01:00
5ed8050791 [add] courgette theme 2014-01-08 11:28:46 +01:00
c3b261e321 Merge pull request #391 from Newinx/master
Correction de bugs dans le schema mysql
2014-01-07 23:22:32 -08:00
9ffce01e0c Correction de bugs dans le schema mysql
- users/name type de int a varchar
	- valeurs par defaut ajoutees pour entries/is_read et is_fav
2014-01-07 22:55:48 +01:00
8905191413 [add] import from poche, thank you @tsadiq #388 2014-01-07 20:21:43 +01:00
b4b22940df Merge pull request #387 from inthepoche/dev
poche 1.3.1
2014-01-07 04:20:23 -08:00
e1cf0fda27 [add] user_agent in file_get_contents 2014-01-07 13:15:43 +01:00
f41d00ed8a Merge branch 'dev' of https://github.com/inthepoche/poche into dev 2014-01-07 13:13:30 +01:00
d866e8be91 [change] poche logo is now at SVG format, see #373 2014-01-07 13:13:24 +01:00
be4c8197eb Merge pull request #381 from tcitworld/dev
Flattr Class : Bug 359
2014-01-06 10:07:29 -08:00
fcb5fd27e2 [change] update poche version in compatibility test file 2014-01-06 08:32:28 +01:00
9c9b226589 Merge pull request #382 from aaa2000/table_tags_entries_already_exists
Create sqlite table tags_entries only if not already exists
2014-01-05 10:39:44 -08:00
a562e3905a Create sqlite table tags_entries only if not already exists 2014-01-05 15:03:05 +01:00
607e12b4f2 Fixes bug 359 2014-01-04 21:50:08 +01:00
7f66783976 Merge pull request #1 from inthepoche/dev
Dev
2014-01-04 12:30:31 -08:00
2abcccb371 Merge branch 'dev' of https://github.com/inthepoche/poche into dev 2014-01-03 15:18:32 +01:00
9bc32632af [fix] #375 Readability.com changed its export format 2014-01-03 15:18:13 +01:00
52e3f58c72 Merge pull request #380 from F1reF0x/dev
Change Permissions in pochePictures.php
2014-01-03 02:20:40 -08:00
b5c1ed1227 Change Permissions in pochePictures.php
Stored Pictures are not accessible (on my server), when permission is set to 0705, but instead, when using 0755 (or for example to 0715) all is working as expected. So maybe it would be good, considering in changing the permission of created directories in the assets directory
2014-01-03 11:17:15 +01:00
4d058d4824 [fix] code display when printing a page was buggy 2014-01-03 10:33:01 +01:00
cb4fba5a33 [del] remove inthepoche.com config file, website has changed 2014-01-03 10:22:12 +01:00
4a84d94e91 [add] config file for interviewmagazine.com 2014-01-03 10:21:18 +01:00
0b57c6825a [fix] bugs #374 and #376 - encoding in rss 2014-01-03 10:15:05 +01:00
529db4861d Merge branch 'dev' of https://github.com/inthepoche/poche into dev 2014-01-03 10:06:33 +01:00
9de34d4e84 [fix] error in query to get entries and tags 2014-01-03 10:06:26 +01:00
d7ad5d6560 Merge pull request #379 from williamtheaker/dev
Minor changes to tag edit and config pages
2014-01-02 21:54:50 -08:00
aeea7c6af0 Updated config page 2014-01-02 21:15:41 -05:00
b1bfd4cb0c Updated tag edit page 2014-01-02 21:04:56 -05:00
2eb111a300 Merge pull request #370 from DmitrySandalov/dev
docs link, typos
2013-12-28 05:04:45 -08:00
76e487cd7e docs link, typos 2013-12-28 11:47:10 +04:00
60fc4f4b1a Merge pull request #363 from inthepoche/dev
poche 1.3.0
2013-12-23 02:28:56 -08:00
da5fc42f61 [fix] bug with queries when postgresql is used 2013-12-23 11:23:12 +01:00
1151e9cc8f [add] availability to regenerate feed token 2013-12-23 11:01:41 +01:00
dfde415198 [change] install doc 2013-12-23 10:45:16 +01:00
e2b83a8298 [change] 1.3, let's rock baby 2013-12-23 10:44:22 +01:00
5cfafc6110 [add] check tags tables 2013-12-23 10:35:09 +01:00
1810c13b55 PHP_AUTH_USER isn't available when using php as cgi 2013-12-23 09:09:10 +01:00
a0aa150418 fix for long lasting session 2013-12-21 23:39:45 +04:00
5c8d438c08 Merge pull request #360 from DmitrySandalov/dev
tags: mysql create tables if not exists
2013-12-19 05:28:22 -08:00
17bd2cc94c tags: mysql create tables if not exists 2013-12-19 16:24:49 +03:00
cbfd5a1019 Update INSTALL.md 2013-12-19 09:56:29 +01:00
04fcbad8c5 Merge pull request #358 from williamtheaker/dev
Edited English text
2013-12-16 00:24:27 -08:00
5df72bb4a4 Typo fixed 2013-12-15 00:44:13 -05:00
41acd466ce typo 2013-12-15 00:41:49 -05:00
43c1115eeb Edited text 2013-12-15 00:18:26 -05:00
db75a4425c Edited text 2013-12-15 00:17:30 -05:00
0f9d3ef173 [fix] typo in config screen 2013-12-12 11:11:53 +01:00
05d6dd487c Merge pull request #356 from inthepoche/tags
Tags feature
2013-12-12 01:48:24 -08:00
d460914f65 [add] download database if sqlite is on 2013-12-12 09:42:19 +01:00
6bf4702608 [add] tags and tags_entries for mysql & postgresql 2013-12-06 15:16:02 +01:00
f014856424 [add] tags and tags_entries tables in poche.sqlite 2013-12-06 15:11:08 +01:00
c432fa1674 [add] assign and remove a tag to an entry 2013-12-06 15:07:51 +01:00
f778e47283 [add] rss for tag 2013-12-06 14:37:42 +01:00
4886ed6d36 [add] page which lists entries for a tag 2013-12-06 14:22:29 +01:00
74ec445a66 [change] simplify Tools::getTplFile 2013-12-06 14:07:00 +01:00
6cab59c340 [add] edit tags page 2013-12-06 14:03:14 +01:00
2e2ebe5ec7 [add] create tags page 2013-12-06 13:15:06 +01:00
68e2061666 [add] tags displaying 2013-12-06 13:02:58 +01:00
7b171c7340 [add] send tags to article view 2013-12-06 13:02:38 +01:00
5bea1a4d31 [add] function to get tags by entry 2013-12-06 13:02:15 +01:00
9e7c840b18 [fix] RSS feeds were buggy when I update full-text RSS 2013-12-06 10:14:59 +01:00
ac4d114214 [add] new specific configuration files 2013-12-06 10:13:03 +01:00
d5501950e2 Merge pull request #353 from inthepoche/ftr
[change] we now use Full-Text RSS 3.1, thank you so much @fivefilters
2013-12-06 00:49:43 -08:00
42c80841c8 [change] we now use Full-Text RSS 3.1, thank you so much @fivefilters 2013-12-06 09:45:27 +01:00
0b5c6ff319 Merge pull request #352 from versvs/dev
updating the "es_ES" locale
2013-12-05 10:56:23 -08:00
05b6401817 updating the "es_ES" locale
Fixed some strings to fit the common use that people understand and find and other es_ES web apps. Completed some non-translated strings.

Also, opted for an editorial line in which "Poche" is treated as a noun (therefore, I capitalized the first letter).
2013-12-05 19:36:20 +01:00
59cc585271 [add] add RSS feed for archive 2013-12-05 15:13:32 +01:00
f0133fe5f4 [fix] undefined notice for feed 2013-12-03 12:07:02 +01:00
b8bb2b4ab6 Merge pull request #350 from inthepoche/rss
add atom feeds for unread / favs
2013-12-03 01:42:21 -08:00
72c20a5297 [add] atom feeds for unread / fav items 2013-12-03 10:40:27 +01:00
5846b0f1b3 [change] getConfigUser is now a public function 2013-12-03 10:39:45 +01:00
39cc09dfc3 [change] update FeedWriter class 2013-12-03 10:39:00 +01:00
678f2cb6ee Merge pull request #347 from evgeni/fix-links
Fix links of third applications
2013-12-02 23:15:39 -08:00
13991e5288 Merge pull request #349 from JasonGhent/master
Stackoverflow parsing and subdomain failover fix.
2013-12-02 23:14:49 -08:00
5c0ad7376a do not link to the french mozilla site, let the server decide the language 2013-12-02 19:52:56 +01:00
af1daea191 proper spacing around 'or' 2013-12-02 19:52:50 +01:00
9772578ee2 fix link to Google Play 2013-12-02 19:52:45 +01:00
16ac4e3dbe Subdomain to domain failover left incorrect leading '.'. This has been remedied. 2013-11-30 13:02:18 -05:00
2ab37d6205 Addition of stackexchange parser. 2013-11-30 13:00:24 -05:00
e070b9b511 Added stackoverflow parsing. 2013-11-30 12:08:17 -05:00
e232d5532a add compiled file for persian language 2013-11-25 15:53:40 +01:00
74dc587452 Merge pull request #329 from mabkenar/dev
Create fa_IR.utf8.po
2013-11-25 06:52:36 -08:00
87a44f4704 Create fa_IR.utf8.po
A Persian (fa_IR) translation.
2013-11-25 15:46:36 +01:00
c2b7a11c77 Merge pull request #326 from inthepoche/dev
1.2.0
2013-11-25 02:00:07 -08:00
7a4482b8a4 1.2.0: here we go 2013-11-25 09:57:10 +01:00
defa7754a4 Merge branch 'dev' of https://github.com/inthepoche/poche into dev 2013-11-25 09:49:08 +01:00
1bf152a551 add italian language 2013-11-25 09:48:51 +01:00
99c8761b75 fix russian directory 2013-11-25 09:43:45 +01:00
0c2f453750 Fix Undefined offset Notice (thx @vjousse) 2013-11-20 10:22:21 +01:00
d7aec74403 [change] reuse existing class for article_toolbar 2013-11-14 11:14:15 +01:00
760d44d194 Merge branch 'DmitrySandalov-master' into dev 2013-11-13 15:23:52 +01:00
f2d3ee98a6 [fix] bug fix #287: test if open_basedir & safe_mode are active to use CURLOPT_FOLLOWLOCATION 2013-11-13 15:17:34 +01:00
705f04937f Merge branch 'master' of git://github.com/DmitrySandalov/poche into DmitrySandalov-master 2013-11-13 14:52:28 +01:00
5862c872c6 Merge branch 'dev' of https://github.com/inthepoche/poche into dev 2013-11-13 14:51:14 +01:00
b7066c0333 [fix] bug fix #311: remove toolbar when printing article 2013-11-13 14:50:56 +01:00
e4178da65c Merge pull request #310 from jn0/dev
dark theme images replaced to visible set, no executable bits for pictures
2013-11-12 08:38:24 -08:00
jno
c7abf20bbe dark theme images replaced to visible set, no executable bits for pictures 2013-11-12 20:34:55 +04:00
b3a2586ecf [add] russian language 2013-11-12 13:05:27 +01:00
45e9e0f565 fix #270 access from remote machine
Replacing SERVER_NAME with HTTP_HOST allows me to use Poche on remote machines
2013-11-05 12:13:55 +03:00
352523640d compatibility with 5.3.3 2013-11-04 08:44:56 +01:00
05824223a9 Merge pull request #291 from banux/dev
Autoclose
2013-10-28 00:38:05 -07:00
f616ab60ef use 2 seprate variable for autoclosing windows to avoid to quick closing when sharing, the popup can be close before the link is save 2013-10-27 07:47:14 +01:00
363bc4eb86 Add a autoclose parameters. When we use sharing method in plugins like the tiny tiny rss one or the firefox plugins we can passe the autoclose=true parameters that close the popup. 2013-10-27 07:37:05 +01:00
2b191d8c37 fix download links 2013-10-26 13:23:31 +02:00
7d7ed6a0ee change link to themes 2013-10-26 12:59:55 +02:00
83020b993c parse dilbert.com 2013-10-25 15:50:16 +02:00
985ce3ec53 bug fix #259: Deleting article doesn't redirect 2013-10-25 14:25:37 +02:00
33fe6a46a4 bug fix #278: mysql collation not UTF8 2013-10-25 14:20:18 +02:00
cd8a344156 Merge pull request #289 from inthepoche/dev
1.1.0
2013-10-24 23:51:59 -07:00
6ae804853f on the road to 1.1.0 2013-10-25 08:45:28 +02:00
b6d859fa92 Merge branch 'dev' of https://github.com/inthepoche/poche into dev 2013-10-22 08:51:30 +02:00
1a0d776394 fix #286: german translation updated 2013-10-22 08:51:22 +02:00
1ba1628ed6 Merge pull request #285 from dsacchet/dev
Adding support for http_auth
2013-10-21 08:31:24 -07:00
027b4e1568 Adding support for http_auth 2013-10-20 23:28:45 +02:00
df6afaf090 Added support for http_auth 2013-10-20 16:53:54 +02:00
c1e24b0461 Merge branch 'dev' of https://github.com/inthepoche/poche into dev 2013-10-17 17:04:12 +02:00
36b9219842 bug fix #251: login failure 2013-10-17 17:03:55 +02:00
8e76eaad19 Update CONTRIBUTING.md 2013-10-17 11:39:19 +02:00
fad925644f Merge pull request #278 from tcitworld/dev
Updated Screenshots URLs
2013-10-13 23:13:31 -07:00
a84f77d6ba Updated Screenshots URLs
From the poche-themes repository to the poche repository, folder themes.
2013-10-13 20:39:12 +02:00
0c994bd934 Merge branch 'dev' of https://github.com/inthepoche/poche into dev 2013-10-10 14:07:13 +02:00
18889e230a remove empty file 2013-10-10 14:06:53 +02:00
e557b7bb44 Merge pull request #274 from NumEricR/select-theme
Update select theme filter and sort names (dev branch PR)
2013-10-08 23:33:48 -07:00
3ae9190e78 Merge branch 'dev' of https://github.com/inthepoche/poche into dev 2013-10-08 13:38:03 +02:00
e231f3f023 add czech locale, thanks to @dstancl 2013-10-08 13:37:46 +02:00
2502e1359c Merge pull request #273 from jcsaaddupuy/emded-dependencies
Emdeded Roboto webfont
2013-10-08 04:10:37 -07:00
20f00edd15 Merge branch 'dev' into emded-dependencies 2013-10-08 13:04:05 +02:00
2f3425dff6 Added font-face linked to local font 2013-10-08 13:00:43 +02:00
272600ff80 Removed google font link 2013-10-08 12:57:33 +02:00
1745ebc832 Added Roboto font from https://themes.googleusercontent.com/static/fonts/roboto/v9/2UX7WLTfW3W8TclTUvlFyQ.woff 2013-10-08 12:57:02 +02:00
5188585864 Merge pull request #272 from jcsaaddupuy/custom_ssl_port
Custom ssl port
2013-10-08 03:48:49 -07:00
1e98ee1de0 bug fix: changing password was buggy 2013-10-07 14:56:21 +02:00
5011388f39 bug fix #215: change language from config screen 2013-10-07 14:26:25 +02:00
5e07dc8b51 Merge remote branch 'upstream/dev' into dev
Conflicts:
	themes/default/_head.twig
2013-10-07 14:25:24 +02:00
894c36ea32 what this f* F? 2013-10-07 14:00:45 +02:00
031df528b6 bug fix #268: move POCHE_VERSION in index.php and change the name to avoid conflicts when updating 2013-10-07 13:19:34 +02:00
9d3b88b379 bug fix #266: make installation steps easier 2013-10-07 13:12:28 +02:00
5eebe4e50d delete href 2013-10-07 13:06:10 +02:00
2916d24b20 Added support for custom SSL port 2013-10-07 12:47:13 +02:00
3352332f3f Merge branch 'dev' into custom_port 2013-10-07 12:39:29 +02:00
2621569200 missing } 2013-10-07 12:39:11 +02:00
93eed12505 Fixed typo 2013-10-07 12:31:46 +02:00
125f9ee838 Added support for custom ssl port 2013-10-07 12:30:40 +02:00
8df8eb6c95 Merge pull request #264 from jcsaaddupuy/dev
Embeding jquery
2013-10-07 00:31:42 -07:00
bf7516112f Embeded jquery 2.0.3 dependancie 2013-10-06 20:31:11 +02:00
5a26af476e Merge pull request #261 from NumEricR/toolbar-height
Fix #255 : increase article toolbar height if necessary
2013-10-06 11:07:24 -07:00
2287bf06f5 Sort themes alphabetically in config list 2013-10-05 11:08:38 +02:00
89812ec81c Remove useless filter on .git folder 2013-10-05 10:52:08 +02:00
06fef43180 Fix #255 : increase article toolbar height if necessary 2013-10-05 10:51:25 +02:00
01e671f4d1 Merge pull request #256 from inthepoche/dev
merge 1.0.0
2013-10-03 10:14:54 -07:00
79026b73a8 Merge pull request #226 from inthepoche/dev
beta5
2013-09-20 04:36:35 -07:00
c51be6b697 Merge pull request #181 from inthepoche/dev
beta4
2013-08-25 12:12:53 -07:00
863 changed files with 68839 additions and 29329 deletions

5
.babelrc Normal file
View File

@ -0,0 +1,5 @@
{
"presets": [
["env", {"modules": false}]
]
}

7
.composer-auth.json Normal file
View File

@ -0,0 +1,7 @@
{
"github-oauth": {
"github.com": "PLEASE DO NOT USE THIS TOKEN IN YOUR OWN PROJECTS/FORKS",
"github.com": "This token is reserved for testing the wallabag/wallabag repository",
"github.com": "73d9411c719a0a56259dbfa16673793b39973091"
}
}

17
.editorconfig Normal file
View File

@ -0,0 +1,17 @@
; top-most EditorConfig file
root = true
; Unix-style newlines
[*]
end_of_line = LF
indent_style = space
indent_size = 4
trim_trailing_whitespace = true
insert_final_newline = true
[*.{js,css}]
indent_style = space
indent_size = 2
[Makefile]
indent_style = tab

14
.eslintrc.json Normal file
View File

@ -0,0 +1,14 @@
{
"extends": "airbnb-base",
"parser": "babel-eslint",
"env": {
"browser": true,
"es6": true
},
"globals": {
"Routing": true
},
"rules": {
"import/no-extraneous-dependencies": ["error", {"devDependencies": true, "optionalDependencies": true, "peerDependencies": true}]
}
}

13
.github/CONTRIBUTING.md vendored Normal file
View File

@ -0,0 +1,13 @@
# How to contribute
## You found a bug
Please [open a new issue](https://github.com/wallabag/wallabag/issues/new).
To fix the bug quickly, we need some infos: please answer to the questions in the issue form.
If you have the skills, look for errors into php, server and application (see `var/logs`) logs.
Note : If you have large portions of text, use [Github's Gist service](https://gist.github.com/) or other pastebin-like.
## You want to fix a bug or to add a feature
Please fork wallabag and work with **the master branch**.

21
.github/ISSUE_TEMPLATE.md vendored Normal file
View File

@ -0,0 +1,21 @@
:warning: If your issue is about an error during fetching a link, please read: http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that
### Issue details
Please provide issue details here.
Remember, this is _not_ a place to ask questions. For that, go to https://community.wallabag.org/ (forum) or http://gitter.im/wallabag/wallabag (chat).
### Environment
* wallabag version (or git revision) that exhibits the issue:
* How did you install wallabag? Via `git clone` or by downloading the package?
* Last wallabag version that did not exhibit the issue (if applicable):
* php version:
* OS:
* type of hosting (shared or dedicated):
* which storage system you choose at install (SQLite, MySQL/MariaDB or PostgreSQL):
### Steps to reproduce/test case
Please provide necessary steps for reproduction of this issue, or better the
reduced test case (without any external dependencies, if possible).

23
.github/PULL_REQUEST_TEMPLATE.md vendored Normal file
View File

@ -0,0 +1,23 @@
| Q | A
| ------------- | ---
| Bug fix? | yes/no
| New feature? | yes/no
| BC breaks? | yes/no
| Deprecations? | yes/no
| Tests pass? | yes/no
| Documentation | yes/no
| Translation | yes/no
| CHANGELOG.md | yes/no
| License | MIT
<!--
Please list the issues your PR fixes using special keywords, see
https://help.github.com/articles/closing-issues-using-keywords/
Fixes #…
-->
<!--
- Please fill in this template according to the PR you're about to submit.
- Replace this comment by a description of what your PR is solving.
-->

65
.gitignore vendored
View File

@ -1,6 +1,59 @@
assets/*
cache/*
vendor
composer.phar
db/poche.sqlite
inc/poche/config.inc.php
# Cache, logs & sessions
/var/*
!/var/cache
/var/cache/*
!var/cache/.gitkeep
!/var/logs
/var/logs/*
!var/logs/.gitkeep
!/var/sessions
/var/sessions/*
!var/sessions/.gitkeep
!var/SymfonyRequirements.php
/bin/*
!/bin/console
!/bin/symfony_requirements
.php_cs.cache
# Parameters
/app/config/parameters.yml
# Managed by Composer
/vendor/
# Assets and user uploads
web/uploads/
/web/bundles/*
!/web/bundles/.gitkeep
/web/assets/images/*
!web/assets/images/.gitkeep
/web/wallassets/*.dev.js
# Build
/app/build
/build
# Composer PHAR
/composer.phar
# Data for wallabag
data/db/wallabag*.sqlite
# Docker container logs and data
docker/logs/
docker/data/
# To avoid crazy stuff on some PR, we must manually FORCE ADD IT on each new release
composer.lock
# assets stuff
node_modules/
bin
app/Resources/build/
!/src/Wallabag/CoreBundle/Resources/public
/src/Wallabag/CoreBundle/Resources/public/*
# Test-generated files
admin-export.json
specialexport.json
/data/site-credentials-secret-key.txt

47
.php_cs Normal file
View File

@ -0,0 +1,47 @@
<?php
return PhpCsFixer\Config::create()
->setRiskyAllowed(true)
->setRules([
'@Symfony' => true,
'@Symfony:risky' => true,
'array_syntax' => [
'syntax' => 'short'
],
'combine_consecutive_unsets' => true,
'heredoc_to_nowdoc' => true,
'no_extra_consecutive_blank_lines' => [
'break',
'continue',
'extra',
'return',
'throw',
'use',
'parenthesis_brace_block',
'square_brace_block',
'curly_brace_block'
],
'no_unreachable_default_argument_value' => true,
'no_useless_else' => true,
'no_useless_return' => true,
'ordered_class_elements' => true,
'ordered_imports' => true,
'php_unit_strict' => true,
'phpdoc_order' => true,
// 'psr4' => true,
'strict_comparison' => true,
'strict_param' => true,
'concat_space' => [
'spacing' => 'one'
],
])
->setFinder(
PhpCsFixer\Finder::create()
->exclude([
'vendor',
'var',
'web'
])
->in(__DIR__)
)
;

43
.scrutinizer.yml Normal file
View File

@ -0,0 +1,43 @@
filter:
paths:
- src/*
excluded_paths:
- 'vendor/*'
- 'app/*'
- 'var/*'
- 'web/*'
- 'src/Wallabag/*Bundle/Tests/*'
- '*Test.php'
tools:
php_cs_fixer: true
php_analyzer: true
php_mess_detector: true
php_changetracking: true
php_code_sniffer: true
php_pdepend: true
sensiolabs_security_checker: true
#external_code_coverage:
# timeout: 3600
php_code_coverage: true
php_sim: false
php_cpd: false
checks:
php:
code_rating: true
# use the new PHP analysis engine
# https://scrutinizer-ci.com/docs/tools/php/php-analyzer/guides/migrate_to_new_php_analysis
build:
nodes:
analysis:
tests:
override:
- php-scrutinizer-run
dependencies:
override:
- npm install -g 'yarn'
- yarn install --force
- COMPOSER_MEMORY_LIMIT=-1 composer install -o --no-interaction --no-progress --prefer-dist

3
.stylelintrc Normal file
View File

@ -0,0 +1,3 @@
{
"extends": "stylelint-config-standard"
}

90
.travis.yml Normal file
View File

@ -0,0 +1,90 @@
language: php
services:
- rabbitmq
- redis
# used for HHVM
addons:
apt:
packages:
- tidy
# cache vendor dirs
cache:
apt: true
directories:
- vendor
- $HOME/.composer/cache
- node_modules
- $HOME/.npm
- $HOME/.yarn-cache
php:
- 5.6
- 7.0
- 7.1
- 7.2
- nightly
node_js:
- "5"
env:
- DB=mysql
- DB=pgsql
- DB=sqlite
matrix:
fast_finish: true
include:
- php: 7.0
env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite
allow_failures:
- php: nightly
# exclude v1 branches
branches:
except:
- legacy
before_install:
- if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
install:
- if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.10; fi;
- if [[ $ASSETS = build ]]; then npm install -g yarn@latest; fi;
- if [[ $ASSETS = build ]]; then yarn install; fi;
before_script:
- PHP=$TRAVIS_PHP_VERSION
- if [[ ! $PHP = hhvm* ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
# xdebug isn't enable for PHP 7.1
- if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi
- composer self-update --no-progress
- if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi;
# increase swap to avoid "proc_open(): fork failed - Cannot allocate memory"
# this should be removed when no more PHP 5 build will be defined
- sudo swapon -s
- sudo fallocate -l 4G /swapfile
- sudo chmod 600 /swapfile
- sudo mkswap /swapfile
- sudo swapon /swapfile
- sudo swapon -s
script:
- travis_wait bash composer update -o --no-interaction --no-progress --prefer-dist
- echo "travis_fold:start:prepare"
- make prepare DB=$DB
- echo "travis_fold:end:prepare"
- echo "travis_fold:start:fixtures"
- php bin/console doctrine:fixtures:load --no-interaction --env=test
- echo "travis_fold:end:fixtures"
- if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then ./bin/simple-phpunit -v ; fi;
- if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix --verbose --dry-run ; fi;
- if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;
- if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml app/Resources/CraueConfigBundle/translations -v ; fi;
- if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/UserBundle/Resources/translations -v ; fi;
- if [[ $ASSETS = build ]]; then yarn run build:prod; fi;

26
.zappr.yaml Normal file
View File

@ -0,0 +1,26 @@
# see https://zappr.opensource.zalan.do/
autobranch: false
commit: false
approvals:
minimum: 1
ignore: pr_opener
pattern: "^(:\\+1:|👍)$"
veto:
pattern: "^(:\\-1:|👎)$"
from:
orgs:
- wallabag
collaborators: true
specification:
title:
minimum-length:
enabled: true
length: 8
body:
minimum-length:
enabled: true
length: 8
contains-url: false
contains-issue-number: false
template:
differs-from-body: true

649
CHANGELOG.md Normal file
View File

@ -0,0 +1,649 @@
# Changelog
## [2.3.4](https://github.com/wallabag/wallabag/tree/2.3.4)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.3...2.3.4)
### Fixes
- Fix image downloading on null image path [#3684](https://github.com/wallabag/wallabag/pull/3684)
- Remove remaining deprecation notices [#3686](https://github.com/wallabag/wallabag/pull/3686)
- Fix mobile viewport on big iframe and video elements [#3683](https://github.com/wallabag/wallabag/pull/3683)
- Autofocus the username field on the login page [#3691](https://github.com/wallabag/wallabag/pull/3691)
- Feature/svg logo [#3692](https://github.com/wallabag/wallabag/pull/3692)
- Fixes a typo [#3702](https://github.com/wallabag/wallabag/pull/3702)
- Update release script [#3705](https://github.com/wallabag/wallabag/pull/3705)
- Removing failing test from Travis [#3707](https://github.com/wallabag/wallabag/pull/3707)
- Replace SO url by lemonde.fr to avoid random failing test [#3685](https://github.com/wallabag/wallabag/pull/3685)
- php-cs-fixer: native_function_invocation [#3716](https://github.com/wallabag/wallabag/pull/3716)
- PHP 7.2 shouldn't fail [#3717](https://github.com/wallabag/wallabag/pull/3717)
- Liberation goes https [#3726](https://github.com/wallabag/wallabag/pull/3726)
- Bugfix: Sanitize the title of a saved webpage from invalid UTF-8 characters. [#3725](https://github.com/wallabag/wallabag/pull/3725)
- Fix dockerfile php72 [#3734](https://github.com/wallabag/wallabag/pull/3734)
- Fix sort parameters [#3719](https://github.com/wallabag/wallabag/pull/3719)
- Add note on GitHub PR template to auto-close issues [#3763](https://github.com/wallabag/wallabag/pull/3763)
- Fix link to wallabag requirements in documentation [#3766](https://github.com/wallabag/wallabag/pull/3766)
- Update translation when marking as read [#3772](https://github.com/wallabag/wallabag/pull/3772)
- Makefile fixes for non GNU systems [#3706](https://github.com/wallabag/wallabag/pull/3706)
- Card no preview replaced by wallabag logo [#3774](https://github.com/wallabag/wallabag/pull/3774)
### Changes
- Propose YunoHost badge for installing [#3678](https://github.com/wallabag/wallabag/pull/3678)
- More robust srcset image attribute handling [#3690](https://github.com/wallabag/wallabag/pull/3690)
- Rename getBuilderByUser and refactor query for untagged entries [#3712](https://github.com/wallabag/wallabag/pull/3712)
- Show tags on non-image gallery preview card [#3743](https://github.com/wallabag/wallabag/pull/3743)
- add manifest.json for android pwa [#3606](https://github.com/wallabag/wallabag/pull/3606)
- Add placeholder image to card-based gallery entries page [#3745](https://github.com/wallabag/wallabag/pull/3745)
- Abort running install and update script if root [#3733](https://github.com/wallabag/wallabag/pull/3733)
- Swap entry url with origin url if graby provides an updated one [#3553](https://github.com/wallabag/wallabag/pull/3553)
## [2.3.3](https://github.com/wallabag/wallabag/tree/2.3.3)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.2...2.3.3)
### Fixes
- Fix error when withRemove variable is not defined. [#3573](https://github.com/wallabag/wallabag/pull/3573)
- Fix title card HTML parsing [#3592](https://github.com/wallabag/wallabag/pull/3592)
- Fix tests [#3597](https://github.com/wallabag/wallabag/pull/3597)
- Fix tests [#3619](https://github.com/wallabag/wallabag/pull/3619)
- Better encoding of the URI for the bookmarklet [#3616](https://github.com/wallabag/wallabag/pull/3616)
- Fix overflow wrap issue [#3652](https://github.com/wallabag/wallabag/pull/3652)
- Fix/firefox mobile unneeded resize [#3653](https://github.com/wallabag/wallabag/pull/3653)
- Fix srcset attribute on images downloaded [#3661](https://github.com/wallabag/wallabag/pull/3661)
- Fix authors and preview alt encoding display [#3664](https://github.com/wallabag/wallabag/pull/3664)
- Spelling: GitHub, Log out, of the dev [#3614](https://github.com/wallabag/wallabag/pull/3614)
- Fix tests [#3668](https://github.com/wallabag/wallabag/pull/3668)
- Fixed migrations with dash into db names [#3538](https://github.com/wallabag/wallabag/pull/3538)
### Changes
- Allow login by email [#3615](https://github.com/wallabag/wallabag/pull/3615)
- Occitan update [#3646](https://github.com/wallabag/wallabag/pull/3646)
- Highlight code in articles using highlight.js [#3636](https://github.com/wallabag/wallabag/pull/3636)
## [2.3.2](https://github.com/wallabag/wallabag/tree/2.3.2)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.1...2.3.2)
### Fixes
- Add `set -eu` to update.sh [#3546](https://github.com/wallabag/wallabag/pull/3546)
- Fix broken link to remove tags from entries [#3536](https://github.com/wallabag/wallabag/pull/3536)
### Changes
- Nav actions updated [#3541](https://github.com/wallabag/wallabag/pull/3541)
- Replaced Create new client link with a button [#3539](https://github.com/wallabag/wallabag/pull/3539)
## [2.3.1](https://github.com/wallabag/wallabag/tree/2.3.1)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.0...2.3.1)
### Fixes
- Changed the way to check for initial migration [#3487](https://github.com/wallabag/wallabag/pull/3487)
- Displayed the RSS icon on homepage route [#3490](https://github.com/wallabag/wallabag/pull/3490)
- Hided the share toggle button if no service is enabled [#3492](https://github.com/wallabag/wallabag/pull/3492)
- Updated robots.txt to prevent crawling [#3510](https://github.com/wallabag/wallabag/pull/3510)
- Fixed lower case tags migration [#3507](https://github.com/wallabag/wallabag/pull/3507)
- Fixed initial migration when using custom table prefix [#3504](https://github.com/wallabag/wallabag/pull/3504)
- Fixed assets for subfolder install [#3524](https://github.com/wallabag/wallabag/pull/3524)
- Fixed empty card title link [#3525](https://github.com/wallabag/wallabag/pull/3525)
- Fixed empty title and domain_name when exception is thrown during fetch [#3442](https://github.com/wallabag/wallabag/pull/3442)
- API: copied entry object before sending, to keep id [#3516](https://github.com/wallabag/wallabag/pull/3516)
### Changes
- Added custom driver & schema manager for PostgreSQL 10 [#3488](https://github.com/wallabag/wallabag/pull/3488)
- Replaced exit_to_app, redo and autorenew icons [#3513](https://github.com/wallabag/wallabag/pull/3513)
- Added PHP 7.2 compatibility [#3515](https://github.com/wallabag/wallabag/pull/3515)
## [2.3.0](https://github.com/wallabag/wallabag/tree/2.3.0) (2017-12-11)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.2.3...2.3.0)
### API
- API `exists` returns `id` if article exists [#2919](https://github.com/wallabag/wallabag/pull/2919)
- Added API endpoint to handle a list of URL and to add/delete tags [#3055](https://github.com/wallabag/wallabag/pull/3055)
- Added API endpoint to handle a list of URL [#3053](https://github.com/wallabag/wallabag/pull/3053)
- Retrieve tag / tags value from query or request [#3103](https://github.com/wallabag/wallabag/pull/3103)
- Register through API [#3065](https://github.com/wallabag/wallabag/pull/3065)
- API user creation behind a toggle [#3177](https://github.com/wallabag/wallabag/pull/3177)
- Allow other fields to be sent using API [#3106](https://github.com/wallabag/wallabag/pull/3106)
- Add ability to patch an entry with more fields [#3181](https://github.com/wallabag/wallabag/pull/3181)
- Create (and return) a client after creating a new user using the API [#3187](https://github.com/wallabag/wallabag/pull/3187)
- Fix PATCH method [#3256](https://github.com/wallabag/wallabag/pull/3256)
### Technical stuff
- Dropping PHP 5.5 [#2861](https://github.com/wallabag/wallabag/pull/2861), migrated to Symfony 3.3 [#3376](https://github.com/wallabag/wallabag/pull/3376), defined MySQL as the default rdbms for wallabag [#3171](https://github.com/wallabag/wallabag/pull/3171)
- Add Cloudron as installation method [#3000](https://github.com/wallabag/wallabag/pull/3000)
- Added migrations execution after fresh install [#3088](https://github.com/wallabag/wallabag/pull/3088)
- Upgraded CraueConfigBundle to 2.0 [#3113](https://github.com/wallabag/wallabag/pull/3113)
- Removed embedded documentation. [The repository is now here](https://github.com/wallabag/doc). [#3122](https://github.com/wallabag/wallabag/pull/3122)
- Fix some Scrutinizer issues [#3161](https://github.com/wallabag/wallabag/pull/3161) [#3172](https://github.com/wallabag/wallabag/pull/3172)
- Isolated tests [#3137](https://github.com/wallabag/wallabag/pull/3137)
- Log an error level message when user auth fail [#3195](https://github.com/wallabag/wallabag/pull/3195)
- Add a real configuration for CS-Fixer [#3258](https://github.com/wallabag/wallabag/pull/3258)
- Replace ant with Makefile [#3398](https://github.com/wallabag/wallabag/pull/3398)
### Features
- Share articles to Scuttle (https://github.com/scronide/scuttle) instance [#2999](https://github.com/wallabag/wallabag/pull/2999)
- Allow to remove all archived entries [#3020](https://github.com/wallabag/wallabag/pull/3020)
- Added publication date and author [#3024](https://github.com/wallabag/wallabag/pull/3024)
- Added `notmatches` operator for automatic tagging rule [#3047](https://github.com/wallabag/wallabag/pull/3047)
- Search & paginate users [#3060](https://github.com/wallabag/wallabag/pull/3060)
- **Clean duplicates entries** command [#2920](https://github.com/wallabag/wallabag/pull/2920)
- Added headers field in Entry [#3108](https://github.com/wallabag/wallabag/pull/3108)
- Add some deletion confirmation to avoid mistake [#3147](https://github.com/wallabag/wallabag/pull/3147)
- Add support for tag in Instapaper import [#3168](https://github.com/wallabag/wallabag/pull/3168)
- Added tags on list view [#3077](https://github.com/wallabag/wallabag/pull/3077)
- **Show user** command [#3179](https://github.com/wallabag/wallabag/pull/3179)
- Add ability to filter public entries & use it in the API [#3208](https://github.com/wallabag/wallabag/pull/3208)
- Store credentials for restricted site in database [#2683](https://github.com/wallabag/wallabag/pull/2683)
- Add RSS for tags & All entries [#3207](https://github.com/wallabag/wallabag/pull/3207)
- Add **list users** command [#3301](https://github.com/wallabag/wallabag/pull/3301)
- Add **reload entry** command [#3326](https://github.com/wallabag/wallabag/pull/3326)
- Add starred_at field which is set when an entry is starred [#3330](https://github.com/wallabag/wallabag/pull/3330)
- Add originUrl property to Entry [#3346](https://github.com/wallabag/wallabag/pull/3346)
### Changes
- Changed default value for list mode (grid instead of list) [#3014](https://github.com/wallabag/wallabag/pull/3014)
- Remove `isPublic` from Entry entity [#3030](https://github.com/wallabag/wallabag/pull/3030)
- Use username to import [#3080](https://github.com/wallabag/wallabag/pull/3080)
- Adds Webpack support and remove Grunt [#3022](https://github.com/wallabag/wallabag/pull/3022)
- Improved Guzzle subscribers extensibility [#2751](https://github.com/wallabag/wallabag/pull/2751)
- Added logger when we match Tagging rules [#3110](https://github.com/wallabag/wallabag/pull/3110)
- unify Download/Export wording. [#3130](https://github.com/wallabag/wallabag/pull/3130)
- Staying on an article view after removing a tag [#3138](https://github.com/wallabag/wallabag/pull/3138)
- Use an alternative way to detect images [#3184](https://github.com/wallabag/wallabag/pull/3184)
- Displays an error with an annotation with a too long quote [#3093](https://github.com/wallabag/wallabag/pull/3093)
- Validate language & preview picture fields [#3192](https://github.com/wallabag/wallabag/pull/3192)
- remove craueconfig domain name setting and add a proper one in parameters [#3173](https://github.com/wallabag/wallabag/pull/3173)
- Better public sharing page [#3204](https://github.com/wallabag/wallabag/pull/3204), [#3449](https://github.com/wallabag/wallabag/pull/3449)
- Improved pagination, navigation, tag's list and footer UI [#3459](https://github.com/wallabag/wallabag/pull/3459), [#3467](https://github.com/wallabag/wallabag/pull/3467), [#3461](https://github.com/wallabag/wallabag/pull/3461), [#3463](https://github.com/wallabag/wallabag/pull/3463)
### Fixes
- Use up-to-date Firefox extension and add F-Droid link for Android app [#3057](https://github.com/wallabag/wallabag/pull/3057)
- Fixed sandwich menu position in entry view (material theme) [#3073](https://github.com/wallabag/wallabag/pull/3073)
- Disabled shortcuts on login/register page [#3075](https://github.com/wallabag/wallabag/pull/3075)
- "+" in url not parsed correctly (when we click on original URL) [#3002](https://github.com/wallabag/wallabag/pull/3002)
- Skip auth when no credentials are found [#3101](https://github.com/wallabag/wallabag/pull/3101)
- Added migration to change length for user fields [#3104](https://github.com/wallabag/wallabag/pull/3104)
- Fix delete annotation when username is defined [#3120](https://github.com/wallabag/wallabag/pull/3120)
- Fixed is_starred for wallabag v2 import [#3143](https://github.com/wallabag/wallabag/pull/3143)
- Replace images with & in url [#3176](https://github.com/wallabag/wallabag/pull/3176)
- Ignore tag's case [#3139](https://github.com/wallabag/wallabag/pull/3139)
- Multiple tag search, which was broken from API [#3309](https://github.com/wallabag/wallabag/pull/3309)
- In RSS feeds, pubDate now conformant to DateTime RFC822 specifications [#3471](https://github.com/wallabag/wallabag/pull/3471)
### Translations
- Add Russian language [#3378](https://github.com/wallabag/wallabag/pull/3378)
## [2.2.3](https://github.com/wallabag/wallabag/tree/2.2.3) (2017-05-17)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.2.2...2.2.3)
- Lock guzzle-site-authenticator to avoid errors [\#3124](https://github.com/wallabag/wallabag/pull/3124) ([j0k3r](https://github.com/j0k3r))
- reorder contrib strings in about page [\#3123](https://github.com/wallabag/wallabag/pull/3123) ([X-dark](https://github.com/X-dark))
- Fixed documentation URL [\#3117](https://github.com/wallabag/wallabag/pull/3117) ([nicosomb](https://github.com/nicosomb))
- Update graby\* licenses [\#3097](https://github.com/wallabag/wallabag/pull/3097) ([j0k3r](https://github.com/j0k3r))
- Fix API pagination is broken if perPage is custom value [\#3096](https://github.com/wallabag/wallabag/pull/3096) ([aaa2000](https://github.com/aaa2000))
- Create a new entry via API even when its content can't be retrieved [\#3095](https://github.com/wallabag/wallabag/pull/3095) ([aaa2000](https://github.com/aaa2000))
- Translate error message in login page [\#3090](https://github.com/wallabag/wallabag/pull/3090) ([aaa2000](https://github.com/aaa2000))
- Fix display the form errors correctly [\#3082](https://github.com/wallabag/wallabag/pull/3082) ([aaa2000](https://github.com/aaa2000))
- Disable negative numbers in filters [\#3076](https://github.com/wallabag/wallabag/pull/3076) ([bourvill](https://github.com/bourvill))
- Small typo in documentation fix \#3061 [\#3072](https://github.com/wallabag/wallabag/pull/3072) ([bourvill](https://github.com/bourvill))
- Ignore tests exported files [\#3066](https://github.com/wallabag/wallabag/pull/3066) ([tcitworld](https://github.com/tcitworld))
- Correct create\_application en string [\#3064](https://github.com/wallabag/wallabag/pull/3064) ([gileri](https://github.com/gileri))
- Make symfony-assets-install use `relative` symlinks [\#3052](https://github.com/wallabag/wallabag/pull/3052) ([shtrom](https://github.com/shtrom))
- Add export notice at the end of the epub [\#3023](https://github.com/wallabag/wallabag/pull/3023) ([mart-e](https://github.com/mart-e))
- Save alpha channel when downloading PNG images [\#3017](https://github.com/wallabag/wallabag/pull/3017) ([Kdecherf](https://github.com/Kdecherf))
- Update paywall.rst \(more details and clear cache\) [\#2985](https://github.com/wallabag/wallabag/pull/2985) ([etiess](https://github.com/etiess))
- Update paywall.rst \(EN\) with details + clear cache [\#2971](https://github.com/wallabag/wallabag/pull/2971) ([j0k3r](https://github.com/j0k3r))
- remove language on html tag [\#2968](https://github.com/wallabag/wallabag/pull/2968) ([chrido](https://github.com/chrido))
## [2.2.2](https://github.com/wallabag/wallabag/tree/2.2.2) (2017-03-02)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.2.1...2.2.2)
- Update Polish translation [\#2932](https://github.com/wallabag/wallabag/pull/2932) ([mruminski](https://github.com/mruminski))
- Update Spanish translation [\#2917](https://github.com/wallabag/wallabag/pull/2917) ([ngosang](https://github.com/ngosang))
- Remove word repetition from german translation [\#2911](https://github.com/wallabag/wallabag/pull/2911) ([jlnostr](https://github.com/jlnostr))
- Italian documentation added [\#2878](https://github.com/wallabag/wallabag/pull/2878) ([matteocoder](https://github.com/matteocoder))
- Add informations about Apache 2.4 [\#2874](https://github.com/wallabag/wallabag/pull/2874) ([kgaut](https://github.com/kgaut))
- Fixed symlinks issue during release creation [\#2950](https://github.com/wallabag/wallabag/pull/2950) ([nicosomb](https://github.com/nicosomb))
- Use wallabag/tcpdf [\#2931](https://github.com/wallabag/wallabag/pull/2931) ([j0k3r](https://github.com/j0k3r))
- Add activation of 'rewrite' mod of Apache [\#2926](https://github.com/wallabag/wallabag/pull/2926) ([qtheuret](https://github.com/qtheuret))
- Updated CHANGELOG with latest changes [\#2916](https://github.com/wallabag/wallabag/pull/2916) ([nicosomb](https://github.com/nicosomb))
- Import: we now skip messages when user is null [\#2915](https://github.com/wallabag/wallabag/pull/2915) ([nicosomb](https://github.com/nicosomb))
- Added wallabag.it link in README [\#2913](https://github.com/wallabag/wallabag/pull/2913) ([nicosomb](https://github.com/nicosomb))
- Moved :it: documentation into it folder [\#2908](https://github.com/wallabag/wallabag/pull/2908) ([nicosomb](https://github.com/nicosomb))
- Alert that 2FA must be authorized in app/config/parameters.yml [\#2905](https://github.com/wallabag/wallabag/pull/2905) ([nicofrand](https://github.com/nicofrand))
- Update Spanish translation [\#2892](https://github.com/wallabag/wallabag/pull/2892) ([ngosang](https://github.com/ngosang))
- Doc: translated mobile apps configuration in french [\#2882](https://github.com/wallabag/wallabag/pull/2882) ([nicosomb](https://github.com/nicosomb))
- Fixed typo in "first\_steps" [\#2879](https://github.com/wallabag/wallabag/pull/2879) ([matteocoder](https://github.com/matteocoder))
- Doc - information about Apache 2.4 [\#2875](https://github.com/wallabag/wallabag/pull/2875) ([kgaut](https://github.com/kgaut))
- Log restricted access value [\#2869](https://github.com/wallabag/wallabag/pull/2869) ([j0k3r](https://github.com/j0k3r))
- docs 3rd party tools: update java wrapper, add cmd tool to add article [\#2860](https://github.com/wallabag/wallabag/pull/2860) ([Strubbl](https://github.com/Strubbl))
- fix misspells in polish translation [\#2846](https://github.com/wallabag/wallabag/pull/2846) ([mruminski](https://github.com/mruminski))
- Update RulerZ [\#2842](https://github.com/wallabag/wallabag/pull/2842) ([K-Phoen](https://github.com/K-Phoen))
- Show active list in the left menu during search [\#2841](https://github.com/wallabag/wallabag/pull/2841) ([Kdecherf](https://github.com/Kdecherf))
- Restored correct version for framework-extra-bundle [\#2840](https://github.com/wallabag/wallabag/pull/2840) ([nicosomb](https://github.com/nicosomb))
- scripts/update.sh: 18: scripts/update.sh: composer.phar: not found [\#2839](https://github.com/wallabag/wallabag/pull/2839) ([foxmask](https://github.com/foxmask))
- Update Oc version [\#2838](https://github.com/wallabag/wallabag/pull/2838) ([Quent-in](https://github.com/Quent-in))
- Search by term: extend to entries url [\#2832](https://github.com/wallabag/wallabag/pull/2832) ([Kdecherf](https://github.com/Kdecherf))
- Update of CraueConfigBundle in Occitan [\#2831](https://github.com/wallabag/wallabag/pull/2831) ([Quent-in](https://github.com/Quent-in))
- Fix rendering of entry title in Twig views [\#2830](https://github.com/wallabag/wallabag/pull/2830) ([Kdecherf](https://github.com/Kdecherf))
- Translate missing strings for de-DE. [\#2826](https://github.com/wallabag/wallabag/pull/2826) ([jlnostr](https://github.com/jlnostr))
- Renamed Developer section to API client management [\#2824](https://github.com/wallabag/wallabag/pull/2824) ([nicosomb](https://github.com/nicosomb))
- Fix nav-panel-search height [\#2818](https://github.com/wallabag/wallabag/pull/2818) ([Kdecherf](https://github.com/Kdecherf))
- Added details about upgrade from 2.1.x or 2.2.0 [\#2816](https://github.com/wallabag/wallabag/pull/2816) ([nicosomb](https://github.com/nicosomb))
- Documentation on how to configure mobile apps to work with wallabag.it [\#2788](https://github.com/wallabag/wallabag/pull/2788) ([Zettt](https://github.com/Zettt))
- first\_article.rst already inside articles.rst [\#2785](https://github.com/wallabag/wallabag/pull/2785) ([matteocoder](https://github.com/matteocoder))
- share.rst already integrated inside articles.rst [\#2784](https://github.com/wallabag/wallabag/pull/2784) ([matteocoder](https://github.com/matteocoder))
## [2.2.1](https://github.com/wallabag/wallabag/tree/2.2.1) (2017-01-31)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.2.0...2.2.1)
- Fixed duplicate entry for share\_public in craue\_setting\_table [\#2809](https://github.com/wallabag/wallabag/pull/2809) ([nicosomb](https://github.com/nicosomb))
## [2.2.0](https://github.com/wallabag/wallabag/tree/2.2.0) (2017-01-28)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.1.6.1...2.2.0)
- Added indexes on is\_archived and is\_starred [\#2789](https://github.com/wallabag/wallabag/pull/2789) ([nicosomb](https://github.com/nicosomb))
- Fix \#2056 update config.yml [\#2624](https://github.com/wallabag/wallabag/pull/2624) ([Rurik19](https://github.com/Rurik19))
## [2.1.6.1](https://github.com/wallabag/wallabag/tree/2.1.6.1) (2017-01-23)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.1.6...2.1.6.1)
## [2.1.6](https://github.com/wallabag/wallabag/tree/2.1.6) (2017-01-18)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.1.5...2.1.6)
- Update copyright year [\#2736](https://github.com/wallabag/wallabag/pull/2736) ([lex111](https://github.com/lex111))
- Fixed possible JS injection via the title edition [\#2758](https://github.com/wallabag/wallabag/pull/2758) ([nicosomb](https://github.com/nicosomb))
## [2.1.5](https://github.com/wallabag/wallabag/tree/2.1.5) (2016-11-21)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.1.4...2.1.5)
- Force composer to run as PHP 5.5.9 [\#2623](https://github.com/wallabag/wallabag/pull/2623) ([j0k3r](https://github.com/j0k3r))
## [2.1.4](https://github.com/wallabag/wallabag/tree/2.1.4) (2016-11-19)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.1.3...2.1.4)
- Add .travis.yml change to RELEASE\_PROCESS [\#2605](https://github.com/wallabag/wallabag/pull/2605) ([j0k3r](https://github.com/j0k3r))
- wallabag cant work on PostgreSQL \<= 9.1 [\#2604](https://github.com/wallabag/wallabag/pull/2604) ([j0k3r](https://github.com/j0k3r))
- Fix clear-cache problem using —no-dev [\#2603](https://github.com/wallabag/wallabag/pull/2603) ([j0k3r](https://github.com/j0k3r))
- User-agents have moved to site-config [\#2587](https://github.com/wallabag/wallabag/pull/2587) ([j0k3r](https://github.com/j0k3r))
- fix \#2582 - Documentation, Nginx config: disable all other PHP file from symphony [\#2584](https://github.com/wallabag/wallabag/pull/2584) ([blankoworld](https://github.com/blankoworld))
- Added help on config screen [\#2578](https://github.com/wallabag/wallabag/pull/2578) ([nicosomb](https://github.com/nicosomb))
- Added tooltips in header bar [\#2577](https://github.com/wallabag/wallabag/pull/2577) ([nicosomb](https://github.com/nicosomb))
- Changed behavior when we change language [\#2571](https://github.com/wallabag/wallabag/pull/2571) ([nicosomb](https://github.com/nicosomb))
- Added creation date on entries view [\#2570](https://github.com/wallabag/wallabag/pull/2570) ([nicosomb](https://github.com/nicosomb))
- Removed support website on about page [\#2565](https://github.com/wallabag/wallabag/pull/2565) ([nicosomb](https://github.com/nicosomb))
- Improve PR template [\#2563](https://github.com/wallabag/wallabag/pull/2563) ([j0k3r](https://github.com/j0k3r))
- Bigger image preview in case of only image content [\#2562](https://github.com/wallabag/wallabag/pull/2562) ([j0k3r](https://github.com/j0k3r))
- Improve tags list on small screen [\#2561](https://github.com/wallabag/wallabag/pull/2561) ([Rurik19](https://github.com/Rurik19))
- Replaced TokenStorage with TokenStorageInterface [\#2556](https://github.com/wallabag/wallabag/pull/2556) ([nicosomb](https://github.com/nicosomb))
- Reorder variable assignation in update.sh script, fix \#2554 [\#2555](https://github.com/wallabag/wallabag/pull/2555) ([dkrmr](https://github.com/dkrmr))
- Round readingtime to avoid crazy number [\#2552](https://github.com/wallabag/wallabag/pull/2552) ([j0k3r](https://github.com/j0k3r))
- Reordered documentation [\#2550](https://github.com/wallabag/wallabag/pull/2550) ([nicosomb](https://github.com/nicosomb))
- Updated default parameters.yml file in documentation [\#2546](https://github.com/wallabag/wallabag/pull/2546) ([nicosomb](https://github.com/nicosomb))
- Update the upgrade documentation [\#2545](https://github.com/wallabag/wallabag/pull/2545) ([nicosomb](https://github.com/nicosomb))
## [2.1.3](https://github.com/wallabag/wallabag/tree/2.1.3) (2016-11-04)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.1.2...2.1.3)
- Force user-agent for .slashdot.org [\#2528](https://github.com/wallabag/wallabag/pull/2528) ([Kdecherf](https://github.com/Kdecherf))
- Translation update - French [\#2519](https://github.com/wallabag/wallabag/pull/2519) ([Jibec](https://github.com/Jibec))
- docs: fix link to wallabag-stats project [\#2518](https://github.com/wallabag/wallabag/pull/2518) ([Strubbl](https://github.com/Strubbl))
- docs: update 3rd party projects by Strubbl [\#2514](https://github.com/wallabag/wallabag/pull/2514) ([Strubbl](https://github.com/Strubbl))
- Fix missing words in Android application documentation [\#2485](https://github.com/wallabag/wallabag/pull/2485) ([bmillemathias](https://github.com/bmillemathias))
- Removed MD5 hash in documentation [\#2466](https://github.com/wallabag/wallabag/pull/2466) ([nicosomb](https://github.com/nicosomb))
- Use created\_at as default sort [\#2534](https://github.com/wallabag/wallabag/pull/2534) ([j0k3r](https://github.com/j0k3r))
- Added documentation about failed to load external entity error [\#2530](https://github.com/wallabag/wallabag/pull/2530) ([nicosomb](https://github.com/nicosomb))
- Add Instapaper to CLI import [\#2524](https://github.com/wallabag/wallabag/pull/2524) ([lologhi](https://github.com/lologhi))
- fix path for the install scripts [\#2521](https://github.com/wallabag/wallabag/pull/2521) ([foxmask](https://github.com/foxmask))
- Inject parameter instead of service [\#2520](https://github.com/wallabag/wallabag/pull/2520) ([j0k3r](https://github.com/j0k3r))
- Updated Capistrano configuration [\#2513](https://github.com/wallabag/wallabag/pull/2513) ([nicosomb](https://github.com/nicosomb))
- Exploded WallabagRestController into many controllers [\#2509](https://github.com/wallabag/wallabag/pull/2509) ([nicosomb](https://github.com/nicosomb))
- Added the whole path to parameters.yml file [\#2508](https://github.com/wallabag/wallabag/pull/2508) ([nicosomb](https://github.com/nicosomb))
- Added require.sh to check if composer is installed [\#2507](https://github.com/wallabag/wallabag/pull/2507) ([nicosomb](https://github.com/nicosomb))
- Fixed entries export filtered with a tag [\#2506](https://github.com/wallabag/wallabag/pull/2506) ([nicosomb](https://github.com/nicosomb))
- Added tag label in the page title [\#2504](https://github.com/wallabag/wallabag/pull/2504) ([nicosomb](https://github.com/nicosomb))
- Added a check in Makefile to see if composer is installed [\#2500](https://github.com/wallabag/wallabag/pull/2500) ([nicosomb](https://github.com/nicosomb))
- Add relevant links to fetch content error page [\#2493](https://github.com/wallabag/wallabag/pull/2493) ([bmillemathias](https://github.com/bmillemathias))
- Added :fr: documentation for wallabag backup [\#2486](https://github.com/wallabag/wallabag/pull/2486) ([nicosomb](https://github.com/nicosomb))
- Document what to backup in Wallabag [\#2484](https://github.com/wallabag/wallabag/pull/2484) ([bmillemathias](https://github.com/bmillemathias))
- If reload content failed, dont update it [\#2482](https://github.com/wallabag/wallabag/pull/2482) ([j0k3r](https://github.com/j0k3r))
- Some fixes [\#2481](https://github.com/wallabag/wallabag/pull/2481) ([j0k3r](https://github.com/j0k3r))
- Portuguese \(Brazilian\) translation [\#2473](https://github.com/wallabag/wallabag/pull/2473) ([pmichelazzo](https://github.com/pmichelazzo))
- Update wallabag version for master branch [\#2467](https://github.com/wallabag/wallabag/pull/2467) ([nicosomb](https://github.com/nicosomb))
- UI Changes [\#2460](https://github.com/wallabag/wallabag/pull/2460) ([tcitworld](https://github.com/tcitworld))
## [2.1.2](https://github.com/wallabag/wallabag/tree/2.1.2) (2016-10-17)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.1.1...2.1.2)
- German: improve existing and add missing translation [\#2459](https://github.com/wallabag/wallabag/pull/2459) ([Strubbl](https://github.com/Strubbl))
- add link to German documentation in about page [\#2457](https://github.com/wallabag/wallabag/pull/2457) ([Strubbl](https://github.com/Strubbl))
- Bring make dev [\#2451](https://github.com/wallabag/wallabag/pull/2451) ([tcitworld](https://github.com/tcitworld))
- Update ISSUE\_TEMPLATE.md [\#2432](https://github.com/wallabag/wallabag/pull/2432) ([j0k3r](https://github.com/j0k3r))
- Define a dev version for the master [\#2417](https://github.com/wallabag/wallabag/pull/2417) ([j0k3r](https://github.com/j0k3r))
- try to reduce assets build npm connection failing by updating nodejs [\#2375](https://github.com/wallabag/wallabag/pull/2375) ([tcitworld](https://github.com/tcitworld))
- Fixed hardcoded title for internal settings [\#2464](https://github.com/wallabag/wallabag/pull/2464) ([nicosomb](https://github.com/nicosomb))
- Fix tabs on material [\#2455](https://github.com/wallabag/wallabag/pull/2455) ([tcitworld](https://github.com/tcitworld))
- Fix baggy display on small screens [\#2454](https://github.com/wallabag/wallabag/pull/2454) ([tcitworld](https://github.com/tcitworld))
- View improvements [\#2450](https://github.com/wallabag/wallabag/pull/2450) ([nicosomb](https://github.com/nicosomb))
- Fixed french and german doc homepages [\#2447](https://github.com/wallabag/wallabag/pull/2447) ([nicosomb](https://github.com/nicosomb))
- Added information about tagging rules in documentation [\#2446](https://github.com/wallabag/wallabag/pull/2446) ([nicosomb](https://github.com/nicosomb))
- Mention example instance in docs [\#2444](https://github.com/wallabag/wallabag/pull/2444) ([Kaligule](https://github.com/Kaligule))
- Minor fixes in the english documentation [\#2439](https://github.com/wallabag/wallabag/pull/2439) ([zertrin](https://github.com/zertrin))
- Added french documentation for upgrade [\#2435](https://github.com/wallabag/wallabag/pull/2435) ([nicosomb](https://github.com/nicosomb))
- Added french documentation for parameters.yml [\#2434](https://github.com/wallabag/wallabag/pull/2434) ([nicosomb](https://github.com/nicosomb))
- Lock deps for FOSUser [\#2429](https://github.com/wallabag/wallabag/pull/2429) ([j0k3r](https://github.com/j0k3r))
- Fix links on english documentation homepage [\#2426](https://github.com/wallabag/wallabag/pull/2426) ([nicosomb](https://github.com/nicosomb))
- Fixed display for note in installation page [\#2422](https://github.com/wallabag/wallabag/pull/2422) ([nicosomb](https://github.com/nicosomb))
- Avoid error when Redis isn't here in tests [\#2420](https://github.com/wallabag/wallabag/pull/2420) ([j0k3r](https://github.com/j0k3r))
- Fixed Twitter Cards by adding a description tag [\#2419](https://github.com/wallabag/wallabag/pull/2419) ([nicosomb](https://github.com/nicosomb))
- Added support of Twitter Cards for public articles [\#2418](https://github.com/wallabag/wallabag/pull/2418) ([nicosomb](https://github.com/nicosomb))
- Remove automatic closing of the window from bookmarklet [\#2414](https://github.com/wallabag/wallabag/pull/2414) ([szafranek](https://github.com/szafranek))
- When a sub command fail, display error message [\#2413](https://github.com/wallabag/wallabag/pull/2413) ([j0k3r](https://github.com/j0k3r))
- Fix PostgreSQL migrations [\#2412](https://github.com/wallabag/wallabag/pull/2412) ([j0k3r](https://github.com/j0k3r))
- Fix entities definition [\#2411](https://github.com/wallabag/wallabag/pull/2411) ([j0k3r](https://github.com/j0k3r))
- Optimize tag list display [\#2410](https://github.com/wallabag/wallabag/pull/2410) ([j0k3r](https://github.com/j0k3r))
- Show number of annotations instead of nbAnnotations placeholder [\#2406](https://github.com/wallabag/wallabag/pull/2406) ([szafranek](https://github.com/szafranek))
- Fix few invalid HTML tags [\#2405](https://github.com/wallabag/wallabag/pull/2405) ([szafranek](https://github.com/szafranek))
- Cleaned up documentation for installation process [\#2403](https://github.com/wallabag/wallabag/pull/2403) ([nicosomb](https://github.com/nicosomb))
- Removed 1.x stuff in CHANGELOG [\#2402](https://github.com/wallabag/wallabag/pull/2402) ([nicosomb](https://github.com/nicosomb))
- Set env to prod in documentation [\#2400](https://github.com/wallabag/wallabag/pull/2400) ([j0k3r](https://github.com/j0k3r))
- Use default locale for user config [\#2399](https://github.com/wallabag/wallabag/pull/2399) ([j0k3r](https://github.com/j0k3r))
- Ensure orphan tag are remove in API [\#2397](https://github.com/wallabag/wallabag/pull/2397) ([j0k3r](https://github.com/j0k3r))
- Update messages.pl.yml [\#2396](https://github.com/wallabag/wallabag/pull/2396) ([mruminski](https://github.com/mruminski))
- Add ability to use socket [\#2395](https://github.com/wallabag/wallabag/pull/2395) ([j0k3r](https://github.com/j0k3r))
- Ability to check multiple urls in API [\#2393](https://github.com/wallabag/wallabag/pull/2393) ([j0k3r](https://github.com/j0k3r))
- Added default picture if preview picture is null [\#2389](https://github.com/wallabag/wallabag/pull/2389) ([nicosomb](https://github.com/nicosomb))
- Fixed two-factor checkbox display in user admin panel [\#2388](https://github.com/wallabag/wallabag/pull/2388) ([nicosomb](https://github.com/nicosomb))
- Changed Changelog by using github-changelog-generator from @skywinder [\#2386](https://github.com/wallabag/wallabag/pull/2386) ([nicosomb](https://github.com/nicosomb))
- Added documentation about siteconfig fix [\#2385](https://github.com/wallabag/wallabag/pull/2385) ([nicosomb](https://github.com/nicosomb))
- Added OpenGraph support for public articles [\#2383](https://github.com/wallabag/wallabag/pull/2383) ([nicosomb](https://github.com/nicosomb))
- Fix exists API call [\#2377](https://github.com/wallabag/wallabag/pull/2377) ([tcitworld](https://github.com/tcitworld))
- Clickable tags [\#2374](https://github.com/wallabag/wallabag/pull/2374) ([tcitworld](https://github.com/tcitworld))
- Remove mouf/nodejs-installer from composer [\#2363](https://github.com/wallabag/wallabag/pull/2363) ([j0k3r](https://github.com/j0k3r))
- Changed relation between API client and refresh token [\#2351](https://github.com/wallabag/wallabag/pull/2351) ([nicosomb](https://github.com/nicosomb))
- Fix relations export for Entry [\#2332](https://github.com/wallabag/wallabag/pull/2332) ([j0k3r](https://github.com/j0k3r))
## [2.1.1](https://github.com/wallabag/wallabag/tree/2.1.1) (2016-10-04)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.1.0...2.1.1)
- Create config even if user is disabled [\#2359](https://github.com/wallabag/wallabag/pull/2359) ([j0k3r](https://github.com/j0k3r))
- Add php-bcmath extension to requirements [\#2354](https://github.com/wallabag/wallabag/pull/2354) ([Zayon](https://github.com/Zayon))
- Basically, fix everything [\#2353](https://github.com/wallabag/wallabag/pull/2353) ([tcitworld](https://github.com/tcitworld))
- Update messages.pl.yml [\#2341](https://github.com/wallabag/wallabag/pull/2341) ([mruminski](https://github.com/mruminski))
- small improvement for german translation [\#2340](https://github.com/wallabag/wallabag/pull/2340) ([Strubbl](https://github.com/Strubbl))
- Fix for 2.1 installation [\#2338](https://github.com/wallabag/wallabag/pull/2338) ([j0k3r](https://github.com/j0k3r))
## [2.1.0](https://github.com/wallabag/wallabag/tree/2.1.0) (2016-10-03)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.0.8...2.1.0)
- Docker : install PHP 'gd' extension [\#2319](https://github.com/wallabag/wallabag/pull/2319) ([pmartin](https://github.com/pmartin))
- Fix issue \#2296: epub export with special chars in the title. [\#2297](https://github.com/wallabag/wallabag/pull/2297) ([egilli](https://github.com/egilli))
- Remove error message when creating ePub versions [\#2330](https://github.com/wallabag/wallabag/pull/2330) ([pmichelazzo](https://github.com/pmichelazzo))
## [2.0.8](https://github.com/wallabag/wallabag/tree/2.0.8) (2016-09-07)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.0.7...2.0.8)
- Allow failure for PHP 7.1 [\#2236](https://github.com/wallabag/wallabag/pull/2236) ([j0k3r](https://github.com/j0k3r))
- Add a check for the database connection [\#2262](https://github.com/wallabag/wallabag/pull/2262) ([j0k3r](https://github.com/j0k3r))
- Fix issue \#1991: correction of the height field to add articles [\#2241](https://github.com/wallabag/wallabag/pull/2241) ([modos189](https://github.com/modos189))
- V2 improve view [\#2238](https://github.com/wallabag/wallabag/pull/2238) ([modos189](https://github.com/modos189))
- Add configuration for german documentation [\#2235](https://github.com/wallabag/wallabag/pull/2235) ([nicosomb](https://github.com/nicosomb))
- Fixes mailto link in documentation [\#2234](https://github.com/wallabag/wallabag/pull/2234) ([cstuder](https://github.com/cstuder))
- Cut entries title in card view: continued [\#2230](https://github.com/wallabag/wallabag/pull/2230) ([modos189](https://github.com/modos189))
## [2.0.7](https://github.com/wallabag/wallabag/tree/2.0.7) (2016-08-22)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.0.6...2.0.7)
- Avoid breaking import when fetching fail [\#2224](https://github.com/wallabag/wallabag/pull/2224) ([j0k3r](https://github.com/j0k3r))
- Added creation date and reading time on article view [\#2222](https://github.com/wallabag/wallabag/pull/2222) ([nicosomb](https://github.com/nicosomb))
- Replaced favorite word/icon with star one [\#2221](https://github.com/wallabag/wallabag/pull/2221) ([nicosomb](https://github.com/nicosomb))
- Enable PATCH method for CORS in API part [\#2220](https://github.com/wallabag/wallabag/pull/2220) ([Rurik19](https://github.com/Rurik19))
- Enable CORS headers for OAUTH part [\#2216](https://github.com/wallabag/wallabag/pull/2216) ([Rurik19](https://github.com/Rurik19))
- Run tests on an uptodate HHVM [\#2134](https://github.com/wallabag/wallabag/pull/2134) ([j0k3r](https://github.com/j0k3r))
- Fix form user display when 2FA is disabled [\#2095](https://github.com/wallabag/wallabag/pull/2095) ([nicosomb](https://github.com/nicosomb))
## [2.0.6](https://github.com/wallabag/wallabag/tree/2.0.6) (2016-08-10)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.0.5...2.0.6)
- Run PHP 7.1 on Travis [\#2048](https://github.com/wallabag/wallabag/pull/2048) ([j0k3r](https://github.com/j0k3r))
- Fixed typo in entry:notice:entry\_saved [\#2200](https://github.com/wallabag/wallabag/pull/2200) ([charno6](https://github.com/charno6))
- Handling socials links into a config file [\#2199](https://github.com/wallabag/wallabag/pull/2199) ([Simounet](https://github.com/Simounet))
- FIX image inside a figure element max-width [\#2198](https://github.com/wallabag/wallabag/pull/2198) ([Simounet](https://github.com/Simounet))
- Remove binary from repo [\#2195](https://github.com/wallabag/wallabag/pull/2195) ([j0k3r](https://github.com/j0k3r))
- Fixed spelling Artúclos --\> Artículos [\#2194](https://github.com/wallabag/wallabag/pull/2194) ([benages](https://github.com/benages))
- Fix 3rd-Party Apps links \(Chrome & Firefox\) [\#2185](https://github.com/wallabag/wallabag/pull/2185) ([tcitworld](https://github.com/tcitworld))
- Change the way to login user in tests [\#2172](https://github.com/wallabag/wallabag/pull/2172) ([j0k3r](https://github.com/j0k3r))
- Fix a few french translations typos [\#2165](https://github.com/wallabag/wallabag/pull/2165) ([tcitworld](https://github.com/tcitworld))
- Update symlink to php-cs-fixer [\#2160](https://github.com/wallabag/wallabag/pull/2160) ([j0k3r](https://github.com/j0k3r))
- Handle only upper or only lower reading filter [\#2157](https://github.com/wallabag/wallabag/pull/2157) ([j0k3r](https://github.com/j0k3r))
- Try to find bad redirection after delete [\#2156](https://github.com/wallabag/wallabag/pull/2156) ([j0k3r](https://github.com/j0k3r))
- Use friendsofphp instead of fabpot [\#2155](https://github.com/wallabag/wallabag/pull/2155) ([j0k3r](https://github.com/j0k3r))
- translate documentation to German [\#2148](https://github.com/wallabag/wallabag/pull/2148) ([Strubbl](https://github.com/Strubbl))
- Corrected Regex for lighttpd rewrite [\#2145](https://github.com/wallabag/wallabag/pull/2145) ([even-allmighty](https://github.com/even-allmighty))
- Jump to Symfony 3.1 [\#2132](https://github.com/wallabag/wallabag/pull/2132) ([j0k3r](https://github.com/j0k3r))
## [2.0.5](https://github.com/wallabag/wallabag/tree/2.0.5) (2016-05-31)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.0.4...2.0.5)
- Improve English translation [\#2109](https://github.com/wallabag/wallabag/pull/2109) ([Poorchop](https://github.com/Poorchop))
- Update api.rst [\#2044](https://github.com/wallabag/wallabag/pull/2044) ([joshp23](https://github.com/joshp23))
- new details in the doc about the rights access again;\) [\#2038](https://github.com/wallabag/wallabag/pull/2038) ([foxmask](https://github.com/foxmask))
- Fix the deletion of Tags/Entries relation when delete an entry [\#2122](https://github.com/wallabag/wallabag/pull/2122) ([nicosomb](https://github.com/nicosomb))
- Docs proposal [\#2112](https://github.com/wallabag/wallabag/pull/2112) ([Poorchop](https://github.com/Poorchop))
- add screenshots of android docu in English [\#2111](https://github.com/wallabag/wallabag/pull/2111) ([Strubbl](https://github.com/Strubbl))
- CS [\#2098](https://github.com/wallabag/wallabag/pull/2098) ([j0k3r](https://github.com/j0k3r))
- Fix image path in 2-factor authentification email [\#2097](https://github.com/wallabag/wallabag/pull/2097) ([bmillemathias](https://github.com/bmillemathias))
- Update CONTRIBUTING file [\#2094](https://github.com/wallabag/wallabag/pull/2094) ([nicosomb](https://github.com/nicosomb))
- Replace vertical dots in material theme with horizontal dots [\#2093](https://github.com/wallabag/wallabag/pull/2093) ([nicosomb](https://github.com/nicosomb))
- Starred and Archived clears if article is already exists [\#2092](https://github.com/wallabag/wallabag/pull/2092) ([Rurik19](https://github.com/Rurik19))
- Do not specify language in Firefox addon link [\#2069](https://github.com/wallabag/wallabag/pull/2069) ([merwan](https://github.com/merwan))
- Added information about permissions on data/ [\#2068](https://github.com/wallabag/wallabag/pull/2068) ([mariovor](https://github.com/mariovor))
- Update CraueConfigBundle.it.yml [\#2054](https://github.com/wallabag/wallabag/pull/2054) ([jamiroconca](https://github.com/jamiroconca))
- Add unread filter to entries pages [\#2052](https://github.com/wallabag/wallabag/pull/2052) ([danbartram](https://github.com/danbartram))
- Update api.rst [\#2049](https://github.com/wallabag/wallabag/pull/2049) ([joshp23](https://github.com/joshp23))
## [2.0.4](https://github.com/wallabag/wallabag/tree/2.0.4) (2016-05-07)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.0.3...2.0.4)
- Change Travis/Scrutinizer pictures in README [\#2029](https://github.com/wallabag/wallabag/pull/2029) ([nicosomb](https://github.com/nicosomb))
- Docu for android app [\#2028](https://github.com/wallabag/wallabag/pull/2028) ([Strubbl](https://github.com/Strubbl))
- Update messages.it.yml [\#2024](https://github.com/wallabag/wallabag/pull/2024) ([jamiroconca](https://github.com/jamiroconca))
- Fix translation for validators [\#2023](https://github.com/wallabag/wallabag/pull/2023) ([nicosomb](https://github.com/nicosomb))
- Fix pagination bar on small devices [\#2022](https://github.com/wallabag/wallabag/pull/2022) ([nicosomb](https://github.com/nicosomb))
- Fix number of entries in tag/list [\#2020](https://github.com/wallabag/wallabag/pull/2020) ([nicosomb](https://github.com/nicosomb))
- Create CraueConfigBundle.it.yml [\#2019](https://github.com/wallabag/wallabag/pull/2019) ([jamiroconca](https://github.com/jamiroconca))
- Update config.yml, add italian as available language [\#2018](https://github.com/wallabag/wallabag/pull/2018) ([jamiroconca](https://github.com/jamiroconca))
- Create messages.it.yml [\#2017](https://github.com/wallabag/wallabag/pull/2017) ([jamiroconca](https://github.com/jamiroconca))
- Update documentation [\#2016](https://github.com/wallabag/wallabag/pull/2016) ([nicosomb](https://github.com/nicosomb))
- Fix tags listing [\#2013](https://github.com/wallabag/wallabag/pull/2013) ([nicosomb](https://github.com/nicosomb))
- integrate upgrade.rst [\#2012](https://github.com/wallabag/wallabag/pull/2012) ([biva](https://github.com/biva))
- upgrade.rst \(Creation of an upgrade page in the documentation\) [\#2011](https://github.com/wallabag/wallabag/pull/2011) ([biva](https://github.com/biva))
- Set the title via POST /api/entries [\#2010](https://github.com/wallabag/wallabag/pull/2010) ([nicosomb](https://github.com/nicosomb))
- Fix reading speed not defined when user was created via config page [\#2005](https://github.com/wallabag/wallabag/pull/2005) ([nicosomb](https://github.com/nicosomb))
- Fix old branch name urls [\#2001](https://github.com/wallabag/wallabag/pull/2001) ([tcitworld](https://github.com/tcitworld))
- Update CraueConfigBundle.es.yml [\#1992](https://github.com/wallabag/wallabag/pull/1992) ([jami7](https://github.com/jami7))
- Rights access to the folders of the project [\#1985](https://github.com/wallabag/wallabag/pull/1985) ([foxmask](https://github.com/foxmask))
- Es translation [\#1977](https://github.com/wallabag/wallabag/pull/1977) ([j0k3r](https://github.com/j0k3r))
- Fix filter reading time [\#1976](https://github.com/wallabag/wallabag/pull/1976) ([nicosomb](https://github.com/nicosomb))
- Fix typos in API documentation [\#1970](https://github.com/wallabag/wallabag/pull/1970) ([nicosomb](https://github.com/nicosomb))
- Create 3rd Resources chapter in API documentation [\#1969](https://github.com/wallabag/wallabag/pull/1969) ([nicosomb](https://github.com/nicosomb))
- Add FAQ page in documentation [\#1967](https://github.com/wallabag/wallabag/pull/1967) ([nicosomb](https://github.com/nicosomb))
## [2.0.3](https://github.com/wallabag/wallabag/tree/2.0.3) (2016-04-22)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.0.2...2.0.3)
- Update API documentation with cURL examples [\#1962](https://github.com/wallabag/wallabag/pull/1962) ([nicosomb](https://github.com/nicosomb))
## [2.0.2](https://github.com/wallabag/wallabag/tree/2.0.2) (2016-04-21)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.9.2...2.0.2)
- Fix translation for Go to your account button after subscription [\#1957](https://github.com/wallabag/wallabag/pull/1957) ([nicosomb](https://github.com/nicosomb))
- Update links in documentation [\#1954](https://github.com/wallabag/wallabag/pull/1954) ([nicosomb](https://github.com/nicosomb))
- Actualisation des liens morts \(Documentation de traduction\) [\#1953](https://github.com/wallabag/wallabag/pull/1953) ([maxi62330](https://github.com/maxi62330))
- Added some curl examples [\#1945](https://github.com/wallabag/wallabag/pull/1945) ([ddeimeke](https://github.com/ddeimeke))
- Update Travis configuration with branches renaming [\#1944](https://github.com/wallabag/wallabag/pull/1944) ([nicosomb](https://github.com/nicosomb))
- Optimize import [\#1942](https://github.com/wallabag/wallabag/pull/1942) ([nicosomb](https://github.com/nicosomb))
## [1.9.2](https://github.com/wallabag/wallabag/tree/1.9.2) (2016-04-18)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.0.1...1.9.2)
## [2.0.1](https://github.com/wallabag/wallabag/tree/2.0.1) (2016-04-11)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.0.0...2.0.1)
## [2.0.0](https://github.com/wallabag/wallabag/tree/2.0.0) (2016-04-03)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.0.0-beta.2...2.0.0)
## [2.0.0-beta.2](https://github.com/wallabag/wallabag/tree/2.0.0-beta.2) (2016-03-12)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.0.0-beta.1...2.0.0-beta.2)
## [2.0.0-beta.1](https://github.com/wallabag/wallabag/tree/2.0.0-beta.1) (2016-03-01)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.0.0-alpha.2...2.0.0-beta.1)
## [2.0.0-alpha.2](https://github.com/wallabag/wallabag/tree/2.0.0-alpha.2) (2016-01-22)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.0.0-alpha.1...2.0.0-alpha.2)
## [2.0.0-alpha.1](https://github.com/wallabag/wallabag/tree/2.0.0-alpha.1) (2016-01-07)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.0.0-alpha.0...2.0.0-alpha.1)
## [2.0.0-alpha.0](https://github.com/wallabag/wallabag/tree/2.0.0-alpha.0) (2015-09-14)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.9.1-b...2.0.0-alpha.0)
## [1.9.1-b](https://github.com/wallabag/wallabag/tree/1.9.1-b) (2015-08-04)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.9.1...1.9.1-b)
## [1.9.1](https://github.com/wallabag/wallabag/tree/1.9.1) (2015-08-03)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.9.1beta3...1.9.1)
## [1.9.1beta3](https://github.com/wallabag/wallabag/tree/1.9.1beta3) (2015-06-06)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.9.1beta2...1.9.1beta3)
## [1.9.1beta2](https://github.com/wallabag/wallabag/tree/1.9.1beta2) (2015-05-09)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.9.1beta1...1.9.1beta2)
## [1.9.1beta1](https://github.com/wallabag/wallabag/tree/1.9.1beta1) (2015-04-08)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.9.1alpha2...1.9.1beta1)
## [1.9.1alpha2](https://github.com/wallabag/wallabag/tree/1.9.1alpha2) (2015-04-07)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.9.1alpha1...1.9.1alpha2)
## [1.9.1alpha1](https://github.com/wallabag/wallabag/tree/1.9.1alpha1) (2015-03-08)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.9...1.9.1alpha1)
## [1.9](https://github.com/wallabag/wallabag/tree/1.9) (2015-02-18)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.9RC1...1.9)
## [1.9RC1](https://github.com/wallabag/wallabag/tree/1.9RC1) (2015-02-16)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.9beta2...1.9RC1)
## [1.9beta2](https://github.com/wallabag/wallabag/tree/1.9beta2) (2015-02-15)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.9beta...1.9beta2)
## [1.9beta](https://github.com/wallabag/wallabag/tree/1.9beta) (2015-02-14)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.8.1old...1.9beta)
## [1.8.1old](https://github.com/wallabag/wallabag/tree/1.8.1old) (2014-11-16)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.8.1bis...1.8.1old)
## [1.8.1bis](https://github.com/wallabag/wallabag/tree/1.8.1bis) (2014-11-16)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.8.1b...1.8.1bis)
## [1.8.1b](https://github.com/wallabag/wallabag/tree/1.8.1b) (2014-11-16)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.8.1...1.8.1b)
## [1.8.1](https://github.com/wallabag/wallabag/tree/1.8.1) (2014-11-15)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.8.0...1.8.1)
## [1.8.0](https://github.com/wallabag/wallabag/tree/1.8.0) (2014-10-10)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.7.2...1.8.0)
## [1.7.2](https://github.com/wallabag/wallabag/tree/1.7.2) (2014-07-24)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.7.1...1.7.2)
## [1.7.1](https://github.com/wallabag/wallabag/tree/1.7.1) (2014-07-15)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.7.0...1.7.1)
## [1.7.0](https://github.com/wallabag/wallabag/tree/1.7.0) (2014-05-29)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.6.1b...1.7.0)
## [1.6.1b](https://github.com/wallabag/wallabag/tree/1.6.1b) (2014-04-11)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.6.1...1.6.1b)
## [1.6.1](https://github.com/wallabag/wallabag/tree/1.6.1) (2014-04-03)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.6.0...1.6.1)
## [1.6.0](https://github.com/wallabag/wallabag/tree/1.6.0) (2014-04-03)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.5.2...1.6.0)
## [1.5.2](https://github.com/wallabag/wallabag/tree/1.5.2) (2014-02-21)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.5.1.1...1.5.2)
## [1.5.1.1](https://github.com/wallabag/wallabag/tree/1.5.1.1) (2014-02-19)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.5.1...1.5.1.1)
## [1.5.1](https://github.com/wallabag/wallabag/tree/1.5.1) (2014-02-19)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.5.0...1.5.1)
## [1.5.0](https://github.com/wallabag/wallabag/tree/1.5.0) (2014-02-13)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.4.0...1.5.0)
## [1.4.0](https://github.com/wallabag/wallabag/tree/1.4.0) (2014-02-03)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.3.1...1.4.0)
## [1.3.1](https://github.com/wallabag/wallabag/tree/1.3.1) (2014-01-07)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.3.0...1.3.1)
## [1.3.0](https://github.com/wallabag/wallabag/tree/1.3.0) (2013-12-23)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.2.0...1.3.0)
## [1.2.0](https://github.com/wallabag/wallabag/tree/1.2.0) (2013-11-25)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.1.0...1.2.0)
## [1.1.0](https://github.com/wallabag/wallabag/tree/1.1.0) (2013-10-25)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.0.0...1.1.0)
## [1.0.0](https://github.com/wallabag/wallabag/tree/1.0.0) (2013-10-03)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.0-beta5.2...1.0.0)
## [1.0-beta5.2](https://github.com/wallabag/wallabag/tree/1.0-beta5.2) (2013-09-20)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.0-beta5.1...1.0-beta5.2)
## [1.0-beta5.1](https://github.com/wallabag/wallabag/tree/1.0-beta5.1) (2013-09-20)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.0-beta5...1.0-beta5.1)
## [1.0-beta5](https://github.com/wallabag/wallabag/tree/1.0-beta5) (2013-09-20)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.0-beta4...1.0-beta5)
## [1.0-beta4](https://github.com/wallabag/wallabag/tree/1.0-beta4) (2013-08-25)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.0-beta3...1.0-beta4)
## [1.0-beta3](https://github.com/wallabag/wallabag/tree/1.0-beta3) (2013-08-17)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.0-beta2...1.0-beta3)
## [1.0-beta2](https://github.com/wallabag/wallabag/tree/1.0-beta2) (2013-08-11)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.0-beta1...1.0-beta2)
## [1.0-beta1](https://github.com/wallabag/wallabag/tree/1.0-beta1) (2013-08-07)
[Full Changelog](https://github.com/wallabag/wallabag/compare/0.3...1.0-beta1)
## [0.3](https://github.com/wallabag/wallabag/tree/0.3) (2013-07-31)
[Full Changelog](https://github.com/wallabag/wallabag/compare/0.2.1...0.3)
## [0.2.1](https://github.com/wallabag/wallabag/tree/0.2.1) (2013-04-23)
[Full Changelog](https://github.com/wallabag/wallabag/compare/0.2...0.2.1)
## [0.2](https://github.com/wallabag/wallabag/tree/0.2) (2013-04-21)
[Full Changelog](https://github.com/wallabag/wallabag/compare/0.11...0.2)
## [0.11](https://github.com/wallabag/wallabag/tree/0.11) (2013-04-19)
[Full Changelog](https://github.com/wallabag/wallabag/compare/0.1...0.11)
## [0.1](https://github.com/wallabag/wallabag/tree/0.1) (2013-04-19)

View File

@ -1,11 +0,0 @@
# How contributing
## You found a bug
Please [open a new issue](https://github.com/inthepoche/poche/issues/new).
To fix the bug quickly, we need some infos:
* your poche version (in ./inc/poche/myconfig.inc.php)
* the link you want to poche and which causes problem
## You want to fix a bug or to add a feature
Please fork poche and work with the dev branch. Do not work on master branch.

View File

@ -1,14 +1,19 @@
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
Version 2, December 2004
Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
Everyone is permitted to copy and distribute verbatim or modified
copies of this license document, and changing it is allowed as long
as the name is changed.
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. You just DO WHAT THE FUCK YOU WANT TO.
Copyright (c) 2013-2017 Nicolas Lœuillet
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is furnished
to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

View File

@ -1,15 +1,3 @@
poche is based on :
* PHP Readability https://bitbucket.org/fivefilters/php-readability
* Full Text RSS http://code.fivefilters.org/full-text-rss/src
* Encoding https://github.com/neitanod/forceutf8
* logo by Brightmix http://www.iconfinder.com/icondetails/43256/128/jeans_monotone_pocket_icon
* icons http://icomoon.io
* PHP Simple HTML DOM Parser (for Pocket import) http://simplehtmldom.sourceforge.net/
* Session https://github.com/tontof/kriss_feed/blob/master/src/class/Session.php
* Twig http://twig.sensiolabs.org
* Flash messages https://github.com/plasticbrain/PHP-Flash-Messages
* Pagination https://github.com/daveismyname/pagination
wallabag is mainly developed by [Nicolas Lœuillet](https://github.com/nicosomb), [@j0k3r](https://github.com/j0k3r) and [@tcitworld](https://github.com/tcitworld) under the MIT License.
poche is developed by Nicolas Lœuillet under the Do What the Fuck You Want to Public License
Contributors : https://github.com/inthepoche/poche/graphs/contributors
Thank you [to others contributors](https://github.com/wallabag/wallabag/graphs/contributors).

15
Capfile Normal file
View File

@ -0,0 +1,15 @@
set :deploy_config_path, 'app/config/capistrano/deploy.rb'
set :stage_config_path, 'app/config/capistrano/deploy'
# Load DSL and set up stages
require 'capistrano/setup'
# Include default deployment tasks
require 'capistrano/deploy'
require 'capistrano/composer'
require 'capistrano/file-permissions'
require 'capistrano/symfony'
# Load custom tasks from `lib/capistrano/tasks` if you have any defined
Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }

53
GNUmakefile Executable file
View File

@ -0,0 +1,53 @@
SHELL=bash
TMP_FOLDER=/tmp
RELEASE_FOLDER=wllbg-release
ENV ?= prod
help: ## Display this help menu
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
clean: ## Clear the application cache
rm -rf var/cache/*
install: ## Install wallabag with the latest version
@./scripts/install.sh $(ENV)
update: ## Update the wallabag installation to the latest version
@./scripts/update.sh $(ENV)
dev: ## Install the latest dev version
@./scripts/dev.sh
run: ## Run the wallabag built-in server
@php bin/console server:run --env=dev
build: ## Run webpack
@npm run build:$(ENV)
prepare: clean ## Prepare database for testsuite
ifdef DB
cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml
endif
-php bin/console doctrine:database:drop --force --env=test
php bin/console doctrine:database:create --env=test
php bin/console doctrine:migrations:migrate --no-interaction --env=test
fixtures: ## Load fixtures into database
php bin/console doctrine:fixtures:load --no-interaction --env=test
test: prepare fixtures ## Launch wallabag testsuite
bin/simple-phpunit -v
release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`).
ifndef VERSION
$(error VERSION is not set)
endif
@./scripts/release.sh $(VERSION) $(TMP_FOLDER) $(RELEASE_FOLDER) $(ENV)
deploy: ## Deploy wallabag
@bundle exec cap staging deploy
.PHONY: help clean prepare install fixtures update build test release deploy run dev
.DEFAULT_GOAL := install

6
Gemfile Normal file
View File

@ -0,0 +1,6 @@
source "https://rubygems.org"
gem 'capistrano', '~> 3.4'
gem 'capistrano-composer'
gem 'capistrano-symfony', '~> 1.0.0.rc1'
gem 'capistrano-file-permissions'

37
Gemfile.lock Normal file
View File

@ -0,0 +1,37 @@
GEM
remote: https://rubygems.org/
specs:
capistrano (3.4.0)
i18n
rake (>= 10.0.0)
sshkit (~> 1.3)
capistrano-composer (0.0.6)
capistrano (>= 3.0.0.pre)
capistrano-file-permissions (1.0.0)
capistrano (~> 3.0)
capistrano-symfony (1.0.0.rc1)
capistrano (~> 3.1)
capistrano-composer (~> 0.0.3)
capistrano-file-permissions (~> 1.0)
colorize (0.7.7)
i18n (0.7.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (2.9.2)
rake (10.4.2)
sshkit (1.7.1)
colorize (>= 0.7.0)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
PLATFORMS
ruby
DEPENDENCIES
capistrano (~> 3.4)
capistrano-composer
capistrano-file-permissions
capistrano-symfony (~> 1.0.0.rc1)
BUNDLED WITH
1.13.5

View File

@ -1,72 +0,0 @@
# Installing poche
## requirements
* PHP 5.2.0 or higher
* XML ([?](http://php.net/xml))
* PCRE ([?](http://php.net/pcre))
* Data filtering ([?](http://uk.php.net/manual/en/book.filter.php))
* Tidy ([?](http://php.net/tidy))
* cURL ([?](http://php.net/curl))
* Parallel URL fetching
* allow_url_fopen ([?](http://www.php.net/manual/en/filesystem.configuration.php#ini.allow-url-fopen))
To see if your server is ok to run poche, execute http://yourpoche/poche_compatibility_test.php.
## you don't want to install twig (the template engine) by yourself
Download this file http://static.inthepoche.com/files/poche-1.0-latest-with-twig.zip
Extract this file on your server.
## you want to install twig by yourself
Download the latest version here : http://www.inthepoche.com/?pages/T%C3%A9l%C3%A9charger-poche
Extract this file on your server.
```php
curl -s http://getcomposer.org/installer | php
php composer.phar install
```
### using sqlite
Copy / paste install/poche.sqlite in db folder.
### using mysql or postgresql
Execute the sql file in /install (mysql.sql or postgres.sql)
Then, go to step 3.
# Upgrading poche
Replace all the files except **db/poche.sqlite**. Also remember to edit the file /inc/poche/config.inc.php.
## Upgrading from poche <= 0.3
You have to execute http://yourpoche/install/update_sqlite_from_0_to_1.php
Then, go to step 3.
## Upgrading from poche >= 1.0 beta1
Nothing to do here.
Then, go to step 3.
# Here is the step 3
You must have write access on assets, cache and db directories. These directories may not exist, you'll have to create them.
You can use poche ! Enjoy.
# Some problems you may encounter
## Blank page
Be sure to have write access on assets, cache and db directories.
## PHP Fatal error: Call to a member function fetchAll() on a non-object in /var/www/poche/inc/poche/Database.class.php on line 42
If you want to install poche, delete the db/poche.sqlite file and copy / paste the install/poche.sqlite in /db. Be sure to have write access.

2
Makefile Normal file
View File

@ -0,0 +1,2 @@
.DEFAULT:
gmake $@

View File

@ -1,29 +1,35 @@
# what is poche ?
Abandon Pocket, Instapaper and other Readability service : adopt poche. It is the same, but it is free (like in freedom) and open source.
[![Build Status](https://api.travis-ci.org/wallabag/wallabag.svg?branch=master)](https://travis-ci.org/wallabag/wallabag)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wallabag/wallabag/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=master)
[![Gitter](https://badges.gitter.im/gitterHQ/gitter.svg)](https://gitter.im/wallabag/wallabag)
## Some features
* adding, deleting, archiving and setting as favorite a link
* import from pocket / readability / instapaper
* share links by email and on twitter
* a design adapted to tablets and smartphones
* extensions for Chrome and Firefox
* Android application
* multi languages: french, english, spanish, german.
* multi users (very soon!)
* update notification in configuration screen
* many storage modes (sqlite, mysql, postgresql)
* many templates: [have a look here](https://github.com/inthepoche/poche-themes).
* ...
# What is wallabag?
wallabag is a self-hostable PHP application allowing you to not miss any content anymore.
Click, save and read it when you can. It extracts content so that you can read it when you have time.
To test poche, a demo website is online : [demo.inthepoche.com](http://demo.inthepoche.com) (login poche, password poche).
More information on our website: [wallabag.org](https://wallabag.org).
To use poche hosting, [you can create an account here](http://app.inthepoche.com/).
If you do not have your own server, consider [the wallabag.it hosting solution](https://wallabag.it).
## Installation
Read the [INSTALL.md file](https://github.com/inthepoche/poche/blob/master/INSTALL.md).
![wallabag logo](https://raw.githubusercontent.com/wallabag/logo/master/_default/typo-horizontal/png/sm/logo-typo-horizontal-black-no-bg-no-border-sm.png)
## License
Copyright © 2010-2013 Nicolas Lœuillet <nicolas.loeuillet@gmail.com>
# Install wallabag
Please read [the documentation to see the wallabag requirements](https://doc.wallabag.org/en/admin/installation/requirements.html).
Then you can install wallabag by executing the following commands:
```
git clone https://github.com/wallabag/wallabag.git
cd wallabag && make install
```
Now, [configure a virtual host](https://doc.wallabag.org/en/admin/installation/virtualhosts.html) to use your wallabag.
# Run on YunoHost
[![Install Wallabag with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=wallabag2)
Wallabag app for [YunoHost](https://yunohost.org). See [here](https://github.com/YunoHost-Apps/wallabag2_ynh)
# License
Copyright © 2013-2018 Nicolas Lœuillet <nicolas@loeuillet.org>
This work is free. You can redistribute it and/or modify it under the
terms of the Do What The Fuck You Want To Public License, Version 2,
as published by Sam Hocevar. See the COPYING file for more details.
terms of the MIT License. See the COPYING file for more details.

78
RELEASE_PROCESS.md Normal file
View File

@ -0,0 +1,78 @@
## Definition
A release is mostly a git tag of http://github.com/wallabag/wallabag, following [semantic versioning](http://semver.org).
### Steps to release
During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE`.
#### Files to edit
- `app/config/wallabag.yml` (`wallabag_core.version`)
- `CHANGELOG.md`
#### Create release on GitHub
- Run these commands to create the tag:
```
git checkout master
git pull origin master
git checkout -b release-$LAST_WALLABAG_RELEASE
SYMFONY_ENV=prod composer up --no-dev
```
- Update `.travis.yml` file and replace the composer line with this one:
```diff
script:
- - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist
+ - travis_wait composer update --no-interaction --no-progress
```
- Then continue with these commands:
```
git add --force composer.lock .travis.yml
git commit -m "Release wallabag $LAST_WALLABAG_RELEASE"
git push origin release-$LAST_WALLABAG_RELEASE
```
- Create a new pull request with this title `DON'T MERGE Release wallabag $LAST_WALLABAG_RELEASE`. This pull request is used to launch builds on Travis-CI.
- Run these command to create the package:
```
make release master /tmp wllbg-release prod
```
- [Create the new release on GitHub](https://github.com/wallabag/wallabag/releases/new). You have to upload on this page the package.
- Delete the `release-$LAST_WALLABAG_RELEASE` branch and close the pull request (**DO NOT MERGE IT**).
- Update the URL shortener (used on `wllbg.org` to generate links like `https://wllbg.org/latest-v2-package` or `http://wllbg.org/latest-v2`)
- Update [the downloads page](https://github.com/wallabag/wallabag.org/blob/master/content/pages/download.md) on the website (MD5 sum, release date)
- Update Dockerfile https://github.com/wallabag/docker (and create a new tag)
- Update wallabag.org website (downloads, releases and new blog post)
- Put the next patch version suffixed with `-dev` in `app/config/config.yml` (`wallabag_core.version`)
- Drink a :beer:!
### `composer.lock`
A release tag must contain a `composer.lock` file. It sets which dependencies were available at the time a release was done,
making it easier to fix issues after the release. It also speeds up `composer install` on stable versions a LOT, by skipping the
dependencies resolution part.
Since `composer.lock` is ignored by default, either it must be removed from `.gitignore` _in the release branch_,
or it must be added using `git add --force composer.lock`.
### Target PHP version
`composer.lock` is _always_ built for a particular version, by default the one it is generated (with `composer update`).
If the PHP version used to generate the .lock isn't a widely available one (like PHP 7), a more common one should
be locally specified in `composer.lock`:
```json
"config": {
"platform": {
"php": "5.5.9",
"ext-something": "4.0"
}
}
```

View File

@ -1,9 +0,0 @@
# TODO
* pouvoir annuler la suppression
* conventions codage ? phing ? vérifier error_log qui trainent
* phpDocumentor
* minifier css
* barre fixe d'admin sur la page d'un billet ?
* revoir export (export vers pocket &cie ? )
* raccourcis clavier

7
app/.htaccess Normal file
View File

@ -0,0 +1,7 @@
<IfModule mod_authz_core.c>
Require all denied
</IfModule>
<IfModule !mod_authz_core.c>
Order deny,allow
Deny from all
</IfModule>

7
app/AppCache.php Normal file
View File

@ -0,0 +1,7 @@
<?php
use Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache;
class AppCache extends HttpCache
{
}

90
app/AppKernel.php Normal file
View File

@ -0,0 +1,90 @@
<?php
use Symfony\Component\Config\Loader\LoaderInterface;
use Symfony\Component\HttpKernel\Kernel;
class AppKernel extends Kernel
{
public function registerBundles()
{
$bundles = [
new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
new Symfony\Bundle\SecurityBundle\SecurityBundle(),
new Symfony\Bundle\TwigBundle\TwigBundle(),
new Symfony\Bundle\MonologBundle\MonologBundle(),
new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
new FOS\RestBundle\FOSRestBundle(),
new FOS\UserBundle\FOSUserBundle(),
new JMS\SerializerBundle\JMSSerializerBundle(),
new Nelmio\ApiDocBundle\NelmioApiDocBundle(),
new Nelmio\CorsBundle\NelmioCorsBundle(),
new Liip\ThemeBundle\LiipThemeBundle(),
new Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle(),
new Lexik\Bundle\FormFilterBundle\LexikFormFilterBundle(),
new FOS\OAuthServerBundle\FOSOAuthServerBundle(),
new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
new Scheb\TwoFactorBundle\SchebTwoFactorBundle(),
new KPhoen\RulerZBundle\KPhoenRulerZBundle(),
new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
new Craue\ConfigBundle\CraueConfigBundle(),
new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
new BD\GuzzleSiteAuthenticatorBundle\BDGuzzleSiteAuthenticatorBundle(),
// wallabag bundles
new Wallabag\CoreBundle\WallabagCoreBundle(),
new Wallabag\ApiBundle\WallabagApiBundle(),
new Wallabag\UserBundle\WallabagUserBundle(),
new Wallabag\ImportBundle\WallabagImportBundle(),
new Wallabag\AnnotationBundle\WallabagAnnotationBundle(),
new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(),
];
if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
$bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
$bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
$bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
$bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
$bundles[] = new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle();
$bundles[] = new Symfony\Bundle\WebServerBundle\WebServerBundle();
if ('test' === $this->getEnvironment()) {
$bundles[] = new DAMA\DoctrineTestBundle\DAMADoctrineTestBundle();
}
}
return $bundles;
}
public function getCacheDir()
{
return dirname(__DIR__) . '/var/cache/' . $this->getEnvironment();
}
public function getLogDir()
{
return dirname(__DIR__) . '/var/logs';
}
public function registerContainerConfiguration(LoaderInterface $loader)
{
$loader->load($this->getProjectDir() . '/app/config/config_' . $this->getEnvironment() . '.yml');
$loader->load(function ($container) {
if ($container->getParameter('use_webpack_dev_server')) {
$container->loadFromExtension('framework', [
'assets' => [
'base_url' => 'http://localhost:8080/',
],
]);
} else {
$container->loadFromExtension('framework', [
'assets' => [
'base_url' => $container->getParameter('domain_name'),
],
]);
}
});
}
}

0
assets/.gitignore → app/DoctrineMigrations/.gitkeep Executable file → Normal file
View File

View File

@ -0,0 +1,188 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Initial database structure.
*/
class Version20160401000000 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$this->skipIf($schema->hasTable($this->getTable('entry')), 'Database already initialized');
switch ($this->connection->getDatabasePlatform()->getName()) {
case 'sqlite':
$sql = <<<SQL
CREATE TABLE {$this->getTable('craue_config_setting')} (name VARCHAR(255) NOT NULL, value VARCHAR(255) DEFAULT NULL, section VARCHAR(255) DEFAULT NULL, PRIMARY KEY(name));
CREATE UNIQUE INDEX UNIQ_5D9649505E237E06 ON {$this->getTable('craue_config_setting')} (name);
CREATE TABLE {$this->getTable('tagging_rule')} (id INTEGER NOT NULL, config_id INTEGER DEFAULT NULL, rule VARCHAR(255) NOT NULL, tags CLOB NOT NULL, PRIMARY KEY(id), CONSTRAINT FK_2D9B3C5424DB0683 FOREIGN KEY (config_id) REFERENCES {$this->getTable('config')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE);
CREATE INDEX IDX_2D9B3C5424DB0683 ON {$this->getTable('tagging_rule')} (config_id);
CREATE TABLE {$this->getTable('tag')} (id INTEGER NOT NULL, label CLOB NOT NULL, slug VARCHAR(128) NOT NULL, PRIMARY KEY(id));
CREATE UNIQUE INDEX UNIQ_4CA58A8C989D9B62 ON {$this->getTable('tag')} (slug);
CREATE TABLE {$this->getTable('entry')} (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, title CLOB DEFAULT NULL, url CLOB DEFAULT NULL, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype CLOB DEFAULT NULL, language CLOB DEFAULT NULL, reading_time INTEGER DEFAULT NULL, domain_name CLOB DEFAULT NULL, preview_picture CLOB DEFAULT NULL, is_public BOOLEAN DEFAULT '0', PRIMARY KEY(id), CONSTRAINT FK_F4D18282A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE);
CREATE INDEX IDX_F4D18282A76ED395 ON {$this->getTable('entry')} (user_id);
CREATE TABLE {$this->getTable('entry_tag')} (entry_id INTEGER NOT NULL, tag_id INTEGER NOT NULL, PRIMARY KEY(entry_id, tag_id), CONSTRAINT FK_C9F0DD7CBA364942 FOREIGN KEY (entry_id) REFERENCES {$this->getTable('entry')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_C9F0DD7CBAD26311 FOREIGN KEY (tag_id) REFERENCES {$this->getTable('tag')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE);
CREATE INDEX IDX_C9F0DD7CBA364942 ON {$this->getTable('entry_tag')} (entry_id);
CREATE INDEX IDX_C9F0DD7CBAD26311 ON {$this->getTable('entry_tag')} (tag_id);
CREATE TABLE {$this->getTable('config')} (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, theme VARCHAR(255) NOT NULL, items_per_page INTEGER NOT NULL, language VARCHAR(255) NOT NULL, rss_token VARCHAR(255) DEFAULT NULL, rss_limit INTEGER DEFAULT NULL, reading_speed DOUBLE PRECISION DEFAULT NULL, PRIMARY KEY(id), CONSTRAINT FK_87E64C53A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE);
CREATE UNIQUE INDEX UNIQ_87E64C53A76ED395 ON {$this->getTable('config')} (user_id);
CREATE TABLE {$this->getTable('oauth2_refresh_tokens')} (id INTEGER NOT NULL, client_id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, token VARCHAR(255) NOT NULL, expires_at INTEGER DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id), CONSTRAINT FK_20C9FB2419EB6921 FOREIGN KEY (client_id) REFERENCES {$this->getTable('oauth2_clients')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_20C9FB24A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE);
CREATE UNIQUE INDEX UNIQ_20C9FB245F37A13B ON {$this->getTable('oauth2_refresh_tokens')} (token);
CREATE INDEX IDX_20C9FB2419EB6921 ON {$this->getTable('oauth2_refresh_tokens')} (client_id);
CREATE INDEX IDX_20C9FB24A76ED395 ON {$this->getTable('oauth2_refresh_tokens')} (user_id);
CREATE TABLE {$this->getTable('oauth2_access_tokens')} (id INTEGER NOT NULL, client_id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, token VARCHAR(255) NOT NULL, expires_at INTEGER DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id), CONSTRAINT FK_368A420919EB6921 FOREIGN KEY (client_id) REFERENCES {$this->getTable('oauth2_clients')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_368A4209A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE);
CREATE UNIQUE INDEX UNIQ_368A42095F37A13B ON {$this->getTable('oauth2_access_tokens')} (token);
CREATE INDEX IDX_368A420919EB6921 ON {$this->getTable('oauth2_access_tokens')} (client_id);
CREATE INDEX IDX_368A4209A76ED395 ON {$this->getTable('oauth2_access_tokens')} (user_id);
CREATE TABLE {$this->getTable('oauth2_auth_codes')} (id INTEGER NOT NULL, client_id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, token VARCHAR(255) NOT NULL, redirect_uri CLOB NOT NULL, expires_at INTEGER DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id), CONSTRAINT FK_EE52E3FA19EB6921 FOREIGN KEY (client_id) REFERENCES {$this->getTable('oauth2_clients')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_EE52E3FAA76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE);
CREATE UNIQUE INDEX UNIQ_EE52E3FA5F37A13B ON {$this->getTable('oauth2_auth_codes')} (token);
CREATE INDEX IDX_EE52E3FA19EB6921 ON {$this->getTable('oauth2_auth_codes')} (client_id);
CREATE INDEX IDX_EE52E3FAA76ED395 ON {$this->getTable('oauth2_auth_codes')} (user_id);
CREATE TABLE {$this->getTable('oauth2_clients')} (id INTEGER NOT NULL, random_id VARCHAR(255) NOT NULL, redirect_uris CLOB NOT NULL, secret VARCHAR(255) NOT NULL, allowed_grant_types CLOB NOT NULL, PRIMARY KEY(id));
CREATE TABLE {$this->getTable('user')} (id INTEGER NOT NULL, username VARCHAR(180) NOT NULL, username_canonical VARCHAR(180) NOT NULL, email VARCHAR(180) NOT NULL, email_canonical VARCHAR(180) NOT NULL, enabled BOOLEAN NOT NULL, salt VARCHAR(255) NOT NULL, password VARCHAR(255) NOT NULL, last_login DATETIME DEFAULT NULL, locked BOOLEAN NOT NULL, expired BOOLEAN NOT NULL, expires_at DATETIME DEFAULT NULL, confirmation_token VARCHAR(255) DEFAULT NULL, password_requested_at DATETIME DEFAULT NULL, roles CLOB NOT NULL, credentials_expired BOOLEAN NOT NULL, credentials_expire_at DATETIME DEFAULT NULL, name CLOB DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, authCode INTEGER DEFAULT NULL, twoFactorAuthentication BOOLEAN NOT NULL, trusted CLOB DEFAULT NULL, PRIMARY KEY(id));
CREATE UNIQUE INDEX UNIQ_1D63E7E592FC23A8 ON {$this->getTable('user')} (username_canonical);
CREATE UNIQUE INDEX UNIQ_1D63E7E5A0D96FBF ON {$this->getTable('user')} (email_canonical);
CREATE UNIQUE INDEX UNIQ_1D63E7E5C05FB297 ON {$this->getTable('user')} (confirmation_token);
CREATE TABLE {$this->getTable('annotation')} (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, entry_id INTEGER DEFAULT NULL, text CLOB NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, quote VARCHAR(255) NOT NULL, ranges CLOB NOT NULL, PRIMARY KEY(id), CONSTRAINT FK_A7AED006A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_A7AED006BA364942 FOREIGN KEY (entry_id) REFERENCES {$this->getTable('entry')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE);
CREATE INDEX IDX_A7AED006A76ED395 ON {$this->getTable('annotation')} (user_id);
CREATE INDEX IDX_A7AED006BA364942 ON {$this->getTable('annotation')} (entry_id);
SQL
;
foreach (explode("\n", $sql) as $query) {
$this->addSql($query);
}
break;
case 'mysql':
$sql = <<<SQL
CREATE TABLE {$this->getTable('craue_config_setting')} (name VARCHAR(255) NOT NULL, value VARCHAR(255) DEFAULT NULL, section VARCHAR(255) DEFAULT NULL, UNIQUE INDEX UNIQ_5D9649505E237E06 (name), PRIMARY KEY(name)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
CREATE TABLE {$this->getTable('entry')} (id INT AUTO_INCREMENT NOT NULL, user_id INT DEFAULT NULL, title LONGTEXT DEFAULT NULL, url LONGTEXT DEFAULT NULL, is_archived TINYINT(1) NOT NULL, is_starred TINYINT(1) NOT NULL, content LONGTEXT DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype LONGTEXT DEFAULT NULL, language LONGTEXT DEFAULT NULL, reading_time INT DEFAULT NULL, domain_name LONGTEXT DEFAULT NULL, preview_picture LONGTEXT DEFAULT NULL, is_public TINYINT(1) DEFAULT '0', INDEX IDX_F4D18282A76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
CREATE TABLE {$this->getTable('entry_tag')} (entry_id INT NOT NULL, tag_id INT NOT NULL, INDEX IDX_C9F0DD7CBA364942 (entry_id), INDEX IDX_C9F0DD7CBAD26311 (tag_id), PRIMARY KEY(entry_id, tag_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
CREATE TABLE {$this->getTable('config')} (id INT AUTO_INCREMENT NOT NULL, user_id INT DEFAULT NULL, theme VARCHAR(255) NOT NULL, items_per_page INT NOT NULL, language VARCHAR(255) NOT NULL, rss_token VARCHAR(255) DEFAULT NULL, rss_limit INT DEFAULT NULL, reading_speed DOUBLE PRECISION DEFAULT NULL, UNIQUE INDEX UNIQ_87E64C53A76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
CREATE TABLE {$this->getTable('tagging_rule')} (id INT AUTO_INCREMENT NOT NULL, config_id INT DEFAULT NULL, rule VARCHAR(255) NOT NULL, tags LONGTEXT NOT NULL COMMENT '(DC2Type:simple_array)', INDEX IDX_2D9B3C5424DB0683 (config_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
CREATE TABLE {$this->getTable('tag')} (id INT AUTO_INCREMENT NOT NULL, `label` LONGTEXT NOT NULL, slug VARCHAR(128) NOT NULL, UNIQUE INDEX UNIQ_4CA58A8C989D9B62 (slug), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
CREATE TABLE {$this->getTable('oauth2_clients')} (id INT AUTO_INCREMENT NOT NULL, random_id VARCHAR(255) NOT NULL, redirect_uris LONGTEXT NOT NULL COMMENT '(DC2Type:array)', secret VARCHAR(255) NOT NULL, allowed_grant_types LONGTEXT NOT NULL COMMENT '(DC2Type:array)', PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
CREATE TABLE {$this->getTable('oauth2_access_tokens')} (id INT AUTO_INCREMENT NOT NULL, client_id INT NOT NULL, user_id INT DEFAULT NULL, token VARCHAR(255) NOT NULL, expires_at INT DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, UNIQUE INDEX UNIQ_368A42095F37A13B (token), INDEX IDX_368A420919EB6921 (client_id), INDEX IDX_368A4209A76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
CREATE TABLE {$this->getTable('oauth2_refresh_tokens')} (id INT AUTO_INCREMENT NOT NULL, client_id INT NOT NULL, user_id INT DEFAULT NULL, token VARCHAR(255) NOT NULL, expires_at INT DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, UNIQUE INDEX UNIQ_20C9FB245F37A13B (token), INDEX IDX_20C9FB2419EB6921 (client_id), INDEX IDX_20C9FB24A76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
CREATE TABLE {$this->getTable('oauth2_auth_codes')} (id INT AUTO_INCREMENT NOT NULL, client_id INT NOT NULL, user_id INT DEFAULT NULL, token VARCHAR(255) NOT NULL, redirect_uri LONGTEXT NOT NULL, expires_at INT DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, UNIQUE INDEX UNIQ_EE52E3FA5F37A13B (token), INDEX IDX_EE52E3FA19EB6921 (client_id), INDEX IDX_EE52E3FAA76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
CREATE TABLE {$this->getTable('user')} (id INT AUTO_INCREMENT NOT NULL, username VARCHAR(180) NOT NULL, username_canonical VARCHAR(180) NOT NULL, email VARCHAR(180) NOT NULL, email_canonical VARCHAR(180) NOT NULL, enabled TINYINT(1) NOT NULL, salt VARCHAR(255) NOT NULL, password VARCHAR(255) NOT NULL, last_login DATETIME DEFAULT NULL, locked TINYINT(1) NOT NULL, expired TINYINT(1) NOT NULL, expires_at DATETIME DEFAULT NULL, confirmation_token VARCHAR(255) DEFAULT NULL, password_requested_at DATETIME DEFAULT NULL, roles LONGTEXT NOT NULL COMMENT '(DC2Type:array)', credentials_expired TINYINT(1) NOT NULL, credentials_expire_at DATETIME DEFAULT NULL, name LONGTEXT DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, authCode INT DEFAULT NULL, twoFactorAuthentication TINYINT(1) NOT NULL, trusted LONGTEXT DEFAULT NULL COMMENT '(DC2Type:json_array)', UNIQUE INDEX UNIQ_1D63E7E592FC23A8 (username_canonical), UNIQUE INDEX UNIQ_1D63E7E5A0D96FBF (email_canonical), UNIQUE INDEX UNIQ_1D63E7E5C05FB297 (confirmation_token), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
CREATE TABLE {$this->getTable('annotation')} (id INT AUTO_INCREMENT NOT NULL, user_id INT DEFAULT NULL, entry_id INT DEFAULT NULL, text LONGTEXT NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, quote VARCHAR(255) NOT NULL, ranges LONGTEXT NOT NULL COMMENT '(DC2Type:array)', INDEX IDX_A7AED006A76ED395 (user_id), INDEX IDX_A7AED006BA364942 (entry_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
ALTER TABLE {$this->getTable('entry')} ADD CONSTRAINT FK_F4D18282A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id);
ALTER TABLE {$this->getTable('entry_tag')} ADD CONSTRAINT FK_C9F0DD7CBA364942 FOREIGN KEY (entry_id) REFERENCES {$this->getTable('entry')} (id);
ALTER TABLE {$this->getTable('entry_tag')} ADD CONSTRAINT FK_C9F0DD7CBAD26311 FOREIGN KEY (tag_id) REFERENCES {$this->getTable('tag')} (id);
ALTER TABLE {$this->getTable('config')} ADD CONSTRAINT FK_87E64C53A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id);
ALTER TABLE {$this->getTable('tagging_rule')} ADD CONSTRAINT FK_2D9B3C5424DB0683 FOREIGN KEY (config_id) REFERENCES {$this->getTable('config')} (id);
ALTER TABLE {$this->getTable('oauth2_access_tokens')} ADD CONSTRAINT FK_368A420919EB6921 FOREIGN KEY (client_id) REFERENCES {$this->getTable('oauth2_clients')} (id);
ALTER TABLE {$this->getTable('oauth2_access_tokens')} ADD CONSTRAINT FK_368A4209A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id);
ALTER TABLE {$this->getTable('oauth2_refresh_tokens')} ADD CONSTRAINT FK_20C9FB2419EB6921 FOREIGN KEY (client_id) REFERENCES {$this->getTable('oauth2_clients')} (id);
ALTER TABLE {$this->getTable('oauth2_refresh_tokens')} ADD CONSTRAINT FK_20C9FB24A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id);
ALTER TABLE {$this->getTable('oauth2_auth_codes')} ADD CONSTRAINT FK_EE52E3FA19EB6921 FOREIGN KEY (client_id) REFERENCES {$this->getTable('oauth2_clients')} (id);
ALTER TABLE {$this->getTable('oauth2_auth_codes')} ADD CONSTRAINT FK_EE52E3FAA76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id);
ALTER TABLE {$this->getTable('annotation')} ADD CONSTRAINT FK_A7AED006A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id);
ALTER TABLE {$this->getTable('annotation')} ADD CONSTRAINT FK_A7AED006BA364942 FOREIGN KEY (entry_id) REFERENCES {$this->getTable('entry')} (id);
SQL
;
foreach (explode("\n", $sql) as $query) {
$this->addSql($query);
}
break;
case 'postgresql':
$sql = <<<SQL
CREATE TABLE {$this->getTable('craue_config_setting')} (name VARCHAR(255) NOT NULL, value VARCHAR(255) DEFAULT NULL, section VARCHAR(255) DEFAULT NULL, PRIMARY KEY(name));
CREATE UNIQUE INDEX UNIQ_5D9649505E237E06 ON {$this->getTable('craue_config_setting')} (name);
CREATE TABLE {$this->getTable('entry')} (id INT NOT NULL, user_id INT DEFAULT NULL, title TEXT DEFAULT NULL, url TEXT DEFAULT NULL, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content TEXT DEFAULT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updated_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, mimetype TEXT DEFAULT NULL, language TEXT DEFAULT NULL, reading_time INT DEFAULT NULL, domain_name TEXT DEFAULT NULL, preview_picture TEXT DEFAULT NULL, is_public BOOLEAN DEFAULT 'false', PRIMARY KEY(id));
CREATE INDEX IDX_F4D18282A76ED395 ON {$this->getTable('entry')} (user_id);
CREATE TABLE {$this->getTable('entry_tag')} (entry_id INT NOT NULL, tag_id INT NOT NULL, PRIMARY KEY(entry_id, tag_id));
CREATE INDEX IDX_C9F0DD7CBA364942 ON {$this->getTable('entry_tag')} (entry_id);
CREATE INDEX IDX_C9F0DD7CBAD26311 ON {$this->getTable('entry_tag')} (tag_id);
CREATE TABLE {$this->getTable('config')} (id INT NOT NULL, user_id INT DEFAULT NULL, theme VARCHAR(255) NOT NULL, items_per_page INT NOT NULL, language VARCHAR(255) NOT NULL, rss_token VARCHAR(255) DEFAULT NULL, rss_limit INT DEFAULT NULL, reading_speed DOUBLE PRECISION DEFAULT NULL, PRIMARY KEY(id));
CREATE UNIQUE INDEX UNIQ_87E64C53A76ED395 ON {$this->getTable('config')} (user_id);
CREATE TABLE {$this->getTable('tagging_rule')} (id INT NOT NULL, config_id INT DEFAULT NULL, rule VARCHAR(255) NOT NULL, tags TEXT NOT NULL, PRIMARY KEY(id));
CREATE INDEX IDX_2D9B3C5424DB0683 ON {$this->getTable('tagging_rule')} (config_id);
COMMENT ON COLUMN {$this->getTable('tagging_rule')}.tags IS '(DC2Type:simple_array)';
CREATE TABLE {$this->getTable('tag')} (id INT NOT NULL, label TEXT NOT NULL, slug VARCHAR(128) NOT NULL, PRIMARY KEY(id));
CREATE UNIQUE INDEX UNIQ_4CA58A8C989D9B62 ON {$this->getTable('tag')} (slug);
CREATE TABLE {$this->getTable('oauth2_clients')} (id INT NOT NULL, random_id VARCHAR(255) NOT NULL, redirect_uris TEXT NOT NULL, secret VARCHAR(255) NOT NULL, allowed_grant_types TEXT NOT NULL, PRIMARY KEY(id));
COMMENT ON COLUMN {$this->getTable('oauth2_clients')}.redirect_uris IS '(DC2Type:array)';
COMMENT ON COLUMN {$this->getTable('oauth2_clients')}.allowed_grant_types IS '(DC2Type:array)';
CREATE TABLE {$this->getTable('oauth2_access_tokens')} (id INT NOT NULL, client_id INT NOT NULL, user_id INT DEFAULT NULL, token VARCHAR(255) NOT NULL, expires_at INT DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id));
CREATE UNIQUE INDEX UNIQ_368A42095F37A13B ON {$this->getTable('oauth2_access_tokens')} (token);
CREATE INDEX IDX_368A420919EB6921 ON {$this->getTable('oauth2_access_tokens')} (client_id);
CREATE INDEX IDX_368A4209A76ED395 ON {$this->getTable('oauth2_access_tokens')} (user_id);
CREATE TABLE {$this->getTable('oauth2_refresh_tokens')} (id INT NOT NULL, client_id INT NOT NULL, user_id INT DEFAULT NULL, token VARCHAR(255) NOT NULL, expires_at INT DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id));
CREATE UNIQUE INDEX UNIQ_20C9FB245F37A13B ON {$this->getTable('oauth2_refresh_tokens')} (token);
CREATE INDEX IDX_20C9FB2419EB6921 ON {$this->getTable('oauth2_refresh_tokens')} (client_id);
CREATE INDEX IDX_20C9FB24A76ED395 ON {$this->getTable('oauth2_refresh_tokens')} (user_id);
CREATE TABLE {$this->getTable('oauth2_auth_codes')} (id INT NOT NULL, client_id INT NOT NULL, user_id INT DEFAULT NULL, token VARCHAR(255) NOT NULL, redirect_uri TEXT NOT NULL, expires_at INT DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id));
CREATE UNIQUE INDEX UNIQ_EE52E3FA5F37A13B ON {$this->getTable('oauth2_auth_codes')} (token);
CREATE INDEX IDX_EE52E3FA19EB6921 ON {$this->getTable('oauth2_auth_codes')} (client_id);
CREATE INDEX IDX_EE52E3FAA76ED395 ON {$this->getTable('oauth2_auth_codes')} (user_id);
CREATE TABLE {$this->getTable('user')} (id INT NOT NULL, username VARCHAR(180) NOT NULL, username_canonical VARCHAR(180) NOT NULL, email VARCHAR(180) NOT NULL, email_canonical VARCHAR(180) NOT NULL, enabled BOOLEAN NOT NULL, salt VARCHAR(255) NOT NULL, password VARCHAR(255) NOT NULL, last_login TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, locked BOOLEAN NOT NULL, expired BOOLEAN NOT NULL, expires_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, confirmation_token VARCHAR(255) DEFAULT NULL, password_requested_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, roles TEXT NOT NULL, credentials_expired BOOLEAN NOT NULL, credentials_expire_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, name TEXT DEFAULT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updated_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, authCode INT DEFAULT NULL, twoFactorAuthentication BOOLEAN NOT NULL, trusted TEXT DEFAULT NULL, PRIMARY KEY(id));
CREATE UNIQUE INDEX UNIQ_1D63E7E592FC23A8 ON {$this->getTable('user')} (username_canonical);
CREATE UNIQUE INDEX UNIQ_1D63E7E5A0D96FBF ON {$this->getTable('user')} (email_canonical);
CREATE UNIQUE INDEX UNIQ_1D63E7E5C05FB297 ON {$this->getTable('user')} (confirmation_token);
COMMENT ON COLUMN {$this->getTable('user')}.roles IS '(DC2Type:array)';
COMMENT ON COLUMN {$this->getTable('user')}.trusted IS '(DC2Type:json_array)';
CREATE TABLE {$this->getTable('annotation')} (id INT NOT NULL, user_id INT DEFAULT NULL, entry_id INT DEFAULT NULL, text TEXT NOT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updated_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, quote VARCHAR(255) NOT NULL, ranges TEXT NOT NULL, PRIMARY KEY(id));
CREATE INDEX IDX_A7AED006A76ED395 ON {$this->getTable('annotation')} (user_id);
CREATE INDEX IDX_A7AED006BA364942 ON {$this->getTable('annotation')} (entry_id);
COMMENT ON COLUMN {$this->getTable('annotation')}.ranges IS '(DC2Type:array)';
CREATE SEQUENCE "entry_id_seq" INCREMENT BY 1 MINVALUE 1 START 1;
CREATE SEQUENCE "config_id_seq" INCREMENT BY 1 MINVALUE 1 START 1;
CREATE SEQUENCE "tagging_rule_id_seq" INCREMENT BY 1 MINVALUE 1 START 1;
CREATE SEQUENCE "tag_id_seq" INCREMENT BY 1 MINVALUE 1 START 1;
CREATE SEQUENCE oauth2_clients_id_seq INCREMENT BY 1 MINVALUE 1 START 1;
CREATE SEQUENCE oauth2_access_tokens_id_seq INCREMENT BY 1 MINVALUE 1 START 1;
CREATE SEQUENCE oauth2_refresh_tokens_id_seq INCREMENT BY 1 MINVALUE 1 START 1;
CREATE SEQUENCE oauth2_auth_codes_id_seq INCREMENT BY 1 MINVALUE 1 START 1;
CREATE SEQUENCE "user_id_seq" INCREMENT BY 1 MINVALUE 1 START 1;
CREATE SEQUENCE annotation_id_seq INCREMENT BY 1 MINVALUE 1 START 1;
ALTER TABLE {$this->getTable('entry')} ADD CONSTRAINT FK_F4D18282A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
ALTER TABLE {$this->getTable('entry_tag')} ADD CONSTRAINT FK_C9F0DD7CBA364942 FOREIGN KEY (entry_id) REFERENCES {$this->getTable('entry')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
ALTER TABLE {$this->getTable('entry_tag')} ADD CONSTRAINT FK_C9F0DD7CBAD26311 FOREIGN KEY (tag_id) REFERENCES {$this->getTable('tag')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
ALTER TABLE {$this->getTable('config')} ADD CONSTRAINT FK_87E64C53A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
ALTER TABLE {$this->getTable('tagging_rule')} ADD CONSTRAINT FK_2D9B3C5424DB0683 FOREIGN KEY (config_id) REFERENCES {$this->getTable('config')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
ALTER TABLE {$this->getTable('oauth2_access_tokens')} ADD CONSTRAINT FK_368A420919EB6921 FOREIGN KEY (client_id) REFERENCES {$this->getTable('oauth2_clients')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
ALTER TABLE {$this->getTable('oauth2_access_tokens')} ADD CONSTRAINT FK_368A4209A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
ALTER TABLE {$this->getTable('oauth2_refresh_tokens')} ADD CONSTRAINT FK_20C9FB2419EB6921 FOREIGN KEY (client_id) REFERENCES {$this->getTable('oauth2_clients')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
ALTER TABLE {$this->getTable('oauth2_refresh_tokens')} ADD CONSTRAINT FK_20C9FB24A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
ALTER TABLE {$this->getTable('oauth2_auth_codes')} ADD CONSTRAINT FK_EE52E3FA19EB6921 FOREIGN KEY (client_id) REFERENCES {$this->getTable('oauth2_clients')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
ALTER TABLE {$this->getTable('oauth2_auth_codes')} ADD CONSTRAINT FK_EE52E3FAA76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
ALTER TABLE {$this->getTable('annotation')} ADD CONSTRAINT FK_A7AED006A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
ALTER TABLE {$this->getTable('annotation')} ADD CONSTRAINT FK_A7AED006BA364942 FOREIGN KEY (entry_id) REFERENCES {$this->getTable('entry')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
SQL
;
foreach (explode("\n", $sql) as $query) {
$this->addSql($query);
}
break;
}
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->addSql("DROP TABLE {$this->getTable('craue_config_setting')}");
$this->addSql("DROP TABLE {$this->getTable('tagging_rule')}");
$this->addSql("DROP TABLE {$this->getTable('config')}");
$this->addSql("DROP TABLE {$this->getTable('entry')}");
$this->addSql("DROP TABLE {$this->getTable('entry_tag')}");
$this->addSql("DROP TABLE {$this->getTable('tag')}");
$this->addSql("DROP TABLE {$this->getTable('oauth2_refresh_tokens')}");
$this->addSql("DROP TABLE {$this->getTable('oauth2_access_tokens')}");
$this->addSql("DROP TABLE {$this->getTable('oauth2_clients')}");
$this->addSql("DROP TABLE {$this->getTable('oauth2_auth_codes')}");
$this->addSql("DROP TABLE {$this->getTable('user')}");
$this->addSql("DROP TABLE {$this->getTable('annotation')}");
}
}

View File

@ -0,0 +1,47 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Added foreign keys for account resetting.
*/
class Version20160410190541 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf($entryTable->hasColumn('uid') || $entryTable->hasColumn('uuid'), 'It seems that you already played this migration.');
$entryTable->addColumn('uid', 'string', [
'notnull' => false,
'length' => 23,
]);
$sharePublic = $this->container
->get('doctrine.orm.default_entity_manager')
->getConnection()
->fetchArray('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'share_public'");
if (false === $sharePublic) {
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('share_public', '1', 'entry')");
}
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$entryTable->dropColumn('uid');
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'share_public'");
}
}

View File

@ -0,0 +1,56 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Added name field on wallabag_oauth2_clients.
*/
class Version20160812120952 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$clientsTable = $schema->getTable($this->getTable('oauth2_clients'));
$this->skipIf($clientsTable->hasColumn('name'), 'It seems that you already played this migration.');
if ('sqlite' === $this->connection->getDatabasePlatform()->getName()) {
// Can't use $clientsTable->addColumn('name', 'blob');
// because of the error:
// SQLSTATE[HY000]: General error: 1 Cannot add a NOT NULL column with default value NULL
$databaseTablePrefix = $this->container->getParameter('database_table_prefix');
$this->addSql('CREATE TEMPORARY TABLE __temp__' . $databaseTablePrefix . 'oauth2_clients AS SELECT id, random_id, redirect_uris, secret, allowed_grant_types FROM ' . $databaseTablePrefix . 'oauth2_clients');
$this->addSql('DROP TABLE ' . $databaseTablePrefix . 'oauth2_clients');
$this->addSql('CREATE TABLE ' . $databaseTablePrefix . 'oauth2_clients (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, random_id VARCHAR(255) NOT NULL COLLATE BINARY, secret VARCHAR(255) NOT NULL COLLATE BINARY, redirect_uris CLOB NOT NULL, allowed_grant_types CLOB NOT NULL, name CLOB NOT NULL, PRIMARY KEY(id), CONSTRAINT FK_635D765EA76ED395 FOREIGN KEY (user_id) REFERENCES "' . $databaseTablePrefix . 'user" (id) NOT DEFERRABLE INITIALLY IMMEDIATE)');
$this->addSql('INSERT INTO ' . $databaseTablePrefix . 'oauth2_clients (id, random_id, redirect_uris, secret, allowed_grant_types) SELECT id, random_id, redirect_uris, secret, allowed_grant_types FROM __temp__' . $databaseTablePrefix . 'oauth2_clients');
$this->addSql('DROP TABLE __temp__' . $databaseTablePrefix . 'oauth2_clients');
$this->addSql('CREATE INDEX IDX_635D765EA76ED395 ON ' . $databaseTablePrefix . 'oauth2_clients (user_id)');
} else {
$clientsTable->addColumn('name', 'blob');
}
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$clientsTable = $schema->getTable($this->getTable('oauth2_clients'));
if ('sqlite' === $this->connection->getDatabasePlatform()->getName()) {
$databaseTablePrefix = $this->container->getParameter('database_table_prefix');
$this->addSql('DROP INDEX IDX_635D765EA76ED395');
$this->addSql('CREATE TEMPORARY TABLE __temp__' . $databaseTablePrefix . 'oauth2_clients AS SELECT id, random_id, redirect_uris, secret, allowed_grant_types FROM ' . $databaseTablePrefix . 'oauth2_clients');
$this->addSql('DROP TABLE ' . $databaseTablePrefix . 'oauth2_clients');
$this->addSql('CREATE TABLE ' . $databaseTablePrefix . 'oauth2_clients (id INTEGER NOT NULL, random_id VARCHAR(255) NOT NULL, secret VARCHAR(255) NOT NULL, redirect_uris CLOB NOT NULL COLLATE BINARY, allowed_grant_types CLOB NOT NULL COLLATE BINARY, PRIMARY KEY(id))');
$this->addSql('INSERT INTO ' . $databaseTablePrefix . 'oauth2_clients (id, random_id, redirect_uris, secret, allowed_grant_types) SELECT id, random_id, redirect_uris, secret, allowed_grant_types FROM __temp__' . $databaseTablePrefix . 'oauth2_clients');
$this->addSql('DROP TABLE __temp__' . $databaseTablePrefix . 'oauth2_clients');
} else {
$clientsTable->dropColumn('name');
}
}
}

View File

@ -0,0 +1,47 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Added settings for RabbitMQ and Redis imports.
*/
class Version20160911214952 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$redis = $this->container
->get('doctrine.orm.default_entity_manager')
->getConnection()
->fetchArray('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'import_with_redis'");
if (false === $redis) {
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('import_with_redis', 0, 'import')");
}
$rabbitmq = $this->container
->get('doctrine.orm.default_entity_manager')
->getConnection()
->fetchArray('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'import_with_rabbitmq'");
if (false === $rabbitmq) {
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('import_with_rabbitmq', 0, 'import')");
}
$this->skipIf(false !== $rabbitmq && false !== $redis, 'It seems that you already played this migration.');
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'import_with_redis';");
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'import_with_rabbitmq';");
}
}

View File

@ -0,0 +1,35 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Added pocket_consumer_key field on wallabag_config.
*/
class Version20160916201049 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$configTable = $schema->getTable($this->getTable('config'));
$this->skipIf($configTable->hasColumn('pocket_consumer_key'), 'It seems that you already played this migration.');
$configTable->addColumn('pocket_consumer_key', 'string', ['notnull' => false]);
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'pocket_consumer_key';");
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$configTable = $schema->getTable($this->getTable('config'));
$configTable->dropColumn('pocket_consumer_key');
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('pocket_consumer_key', NULL, 'import')");
}
}

View File

@ -0,0 +1,108 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Migrations\SkipMigrationException;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Added pocket_consumer_key field on wallabag_config.
*/
class Version20161001072726 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$this->skipIf('sqlite' === $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
// remove all FK from entry_tag
switch ($this->connection->getDatabasePlatform()->getName()) {
case 'mysql':
$query = $this->connection->query("
SELECT CONSTRAINT_NAME
FROM information_schema.key_column_usage
WHERE TABLE_NAME = '" . $this->getTable('entry_tag', WallabagMigration::UN_ESCAPED_TABLE) . "' AND CONSTRAINT_NAME LIKE 'FK_%'
AND TABLE_SCHEMA = '" . $this->connection->getDatabase() . "'"
);
$query->execute();
foreach ($query->fetchAll() as $fk) {
$this->addSql('ALTER TABLE ' . $this->getTable('entry_tag') . ' DROP FOREIGN KEY ' . $fk['CONSTRAINT_NAME']);
}
break;
case 'postgresql':
// http://dba.stackexchange.com/questions/36979/retrieving-all-pk-and-fk
$query = $this->connection->query("
SELECT conrelid::regclass AS table_from
,conname
,pg_get_constraintdef(c.oid)
FROM pg_constraint c
JOIN pg_namespace n ON n.oid = c.connamespace
WHERE contype = 'f'
AND conrelid::regclass::text = '" . $this->getTable('entry_tag', WallabagMigration::UN_ESCAPED_TABLE) . "'
AND n.nspname = 'public';"
);
$query->execute();
foreach ($query->fetchAll() as $fk) {
$this->addSql('ALTER TABLE ' . $this->getTable('entry_tag') . ' DROP CONSTRAINT ' . $fk['conname']);
}
break;
}
$this->addSql('ALTER TABLE ' . $this->getTable('entry_tag') . ' ADD CONSTRAINT FK_entry_tag_entry FOREIGN KEY (entry_id) REFERENCES ' . $this->getTable('entry') . ' (id) ON DELETE CASCADE');
$this->addSql('ALTER TABLE ' . $this->getTable('entry_tag') . ' ADD CONSTRAINT FK_entry_tag_tag FOREIGN KEY (tag_id) REFERENCES ' . $this->getTable('tag') . ' (id) ON DELETE CASCADE');
// remove entry FK from annotation
switch ($this->connection->getDatabasePlatform()->getName()) {
case 'mysql':
$query = $this->connection->query("
SELECT CONSTRAINT_NAME
FROM information_schema.key_column_usage
WHERE TABLE_NAME = '" . $this->getTable('annotation', WallabagMigration::UN_ESCAPED_TABLE) . "'
AND CONSTRAINT_NAME LIKE 'FK_%'
AND COLUMN_NAME = 'entry_id'
AND TABLE_SCHEMA = '" . $this->connection->getDatabase() . "'"
);
$query->execute();
foreach ($query->fetchAll() as $fk) {
$this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' DROP FOREIGN KEY ' . $fk['CONSTRAINT_NAME']);
}
break;
case 'postgresql':
// http://dba.stackexchange.com/questions/36979/retrieving-all-pk-and-fk
$query = $this->connection->query("
SELECT conrelid::regclass AS table_from
,conname
,pg_get_constraintdef(c.oid)
FROM pg_constraint c
JOIN pg_namespace n ON n.oid = c.connamespace
WHERE contype = 'f'
AND conrelid::regclass::text = '" . $this->getTable('annotation', WallabagMigration::UN_ESCAPED_TABLE) . "'
AND n.nspname = 'public'
AND pg_get_constraintdef(c.oid) LIKE '%entry_id%';"
);
$query->execute();
foreach ($query->fetchAll() as $fk) {
$this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' DROP CONSTRAINT ' . $fk['conname']);
}
break;
}
$this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' ADD CONSTRAINT FK_annotation_entry FOREIGN KEY (entry_id) REFERENCES ' . $this->getTable('entry') . ' (id) ON DELETE CASCADE');
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
throw new SkipMigrationException('Too complex ...');
}
}

View File

@ -0,0 +1,68 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Converted database to utf8mb4 encoding (for MySQL only).
*/
class Version20161022134138 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration only apply to MySQL');
$this->addSql('ALTER DATABASE `' . $this->connection->getParams()['dbname'] . '` CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci;');
// convert field length for utf8mb4
// http://stackoverflow.com/a/31474509/569101
$this->addSql('ALTER TABLE ' . $this->getTable('user') . ' CHANGE confirmation_token confirmation_token VARCHAR(180) DEFAULT NULL;');
$this->addSql('ALTER TABLE ' . $this->getTable('user') . ' CHANGE salt salt VARCHAR(180) NOT NULL;');
$this->addSql('ALTER TABLE ' . $this->getTable('user') . ' CHANGE password password VARCHAR(180) NOT NULL;');
$this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('tag') . ' CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('user') . ' CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' CHANGE `text` `text` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' CHANGE `quote` `quote` VARCHAR(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CHANGE `title` `title` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CHANGE `content` `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('tag') . ' CHANGE `label` `label` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('user') . ' CHANGE `name` `name` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration only apply to MySQL');
$this->addSql('ALTER DATABASE `' . $this->connection->getParams()['dbname'] . '` CHARACTER SET = utf8 COLLATE = utf8_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('tag') . ' CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('user') . ' CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' CHANGE `text` `text` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' CHANGE `quote` `quote` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CHANGE `title` `title` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CHANGE `content` `content` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('tag') . ' CHANGE `label` `label` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('user') . ' CHANGE `name` `name` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
}
}

View File

@ -0,0 +1,50 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Added user_id column on oauth2_clients to prevent users to delete API clients from other users.
*/
class Version20161024212538 extends WallabagMigration
{
private $constraintName = 'IDX_user_oauth_client';
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$clientsTable = $schema->getTable($this->getTable('oauth2_clients'));
$this->skipIf($clientsTable->hasColumn('user_id'), 'It seems that you already played this migration.');
$clientsTable->addColumn('user_id', 'integer', ['notnull' => false]);
$clientsTable->addForeignKeyConstraint(
$this->getTable('user'),
['user_id'],
['id'],
['onDelete' => 'CASCADE'],
$this->constraintName
);
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$clientsTable = $schema->getTable($this->getTable('oauth2_clients'));
$this->skipIf(!$clientsTable->hasColumn('user_id'), 'It seems that you already played this migration.');
$clientsTable->dropColumn('user_id', 'integer');
if ('sqlite' !== $this->connection->getDatabasePlatform()->getName()) {
$clientsTable->removeForeignKey($this->constraintName);
}
}
}

View File

@ -0,0 +1,35 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Added the internal setting to enable/disable downloading pictures.
*/
class Version20161031132655 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$images = $this->container
->get('doctrine.orm.default_entity_manager')
->getConnection()
->fetchArray('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'download_images_enabled'");
$this->skipIf(false !== $images, 'It seems that you already played this migration.');
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('download_images_enabled', 0, 'misc')");
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'download_images_enabled';");
}
}

View File

@ -0,0 +1,36 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Added created_at index on entry table.
*/
class Version20161104073720 extends WallabagMigration
{
private $indexName = 'IDX_entry_created_at';
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf($entryTable->hasIndex($this->indexName), 'It seems that you already played this migration.');
$entryTable->addIndex(['created_at'], $this->indexName);
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf(false === $entryTable->hasIndex($this->indexName), 'It seems that you already played this migration.');
$entryTable->dropIndex($this->indexName);
}
}

View File

@ -0,0 +1,39 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Added action_mark_as_read field on config table.
*/
class Version20161106113822 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$configTable = $schema->getTable($this->getTable('config'));
$this->skipIf($configTable->hasColumn('action_mark_as_read'), 'It seems that you already played this migration.');
$configTable->addColumn('action_mark_as_read', 'integer', [
'default' => 0,
'notnull' => false,
]);
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$configTable = $schema->getTable($this->getTable('config'));
$this->skipIf(!$configTable->hasColumn('action_mark_as_read'), 'It seems that you already played this migration.');
$configTable->dropColumn('action_mark_as_read');
}
}

View File

@ -0,0 +1,47 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Added the internal setting to share articles to unmark.it.
*/
class Version20161117071626 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$share = $this->container
->get('doctrine.orm.default_entity_manager')
->getConnection()
->fetchArray('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'share_unmark'");
if (false === $share) {
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('share_unmark', 0, 'entry')");
}
$unmark = $this->container
->get('doctrine.orm.default_entity_manager')
->getConnection()
->fetchArray('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'unmark_url'");
if (false === $unmark) {
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('unmark_url', 'https://unmark.it', 'entry')");
}
$this->skipIf(false !== $share && false !== $unmark, 'It seems that you already played this migration.');
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'share_unmark';");
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'unmark_url';");
}
}

View File

@ -0,0 +1,39 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Add http_status in `entry_table`.
*/
class Version20161118134328 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf($entryTable->hasColumn('http_status'), 'It seems that you already played this migration.');
$entryTable->addColumn('http_status', 'string', [
'length' => 3,
'notnull' => false,
]);
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf(!$entryTable->hasColumn('http_status'), 'It seems that you already played this migration.');
$entryTable->dropColumn('http_status');
}
}

View File

@ -0,0 +1,35 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Add the restricted_access internal setting for articles with paywall.
*/
class Version20161122144743 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$access = $this->container
->get('doctrine.orm.default_entity_manager')
->getConnection()
->fetchArray('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'restricted_access'");
$this->skipIf(false !== $access, 'It seems that you already played this migration.');
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('restricted_access', 0, 'entry')");
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'restricted_access';");
}
}

View File

@ -0,0 +1,46 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Methods and properties removed from `FOS\UserBundle\Model\User`.
*
* - `$expired`
* - `$credentialsExpired`
* - `setExpired()` (use `setExpiresAt(\DateTime::now()` instead)
* - `setCredentialsExpired()` (use `setCredentialsExpireAt(\DateTime::now()` instead)
*
* You need to drop the fields `expired` and `credentials_expired` from your database
* schema, because they aren't mapped anymore.
*/
class Version20161122203647 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$userTable = $schema->getTable($this->getTable('user'));
$this->skipIf(false === $userTable->hasColumn('expired') || false === $userTable->hasColumn('credentials_expired'), 'It seems that you already played this migration.');
$userTable->dropColumn('expired');
$userTable->dropColumn('credentials_expired');
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$userTable = $schema->getTable($this->getTable('user'));
$this->skipIf(true === $userTable->hasColumn('expired') || true === $userTable->hasColumn('credentials_expired'), 'It seems that you already played this migration.');
$userTable->addColumn('expired', 'smallint', ['notnull' => false]);
$userTable->addColumn('credentials_expired', 'smallint', ['notnull' => false]);
}
}

View File

@ -0,0 +1,32 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Added list_mode in user config.
*/
class Version20161128084725 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$configTable = $schema->getTable($this->getTable('config'));
$this->skipIf($configTable->hasColumn('list_mode'), 'It seems that you already played this migration.');
$configTable->addColumn('list_mode', 'integer', ['notnull' => false]);
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$configTable = $schema->getTable($this->getTable('config'));
$configTable->dropColumn('list_mode');
}
}

View File

@ -0,0 +1,44 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Removed locked, credentials_expire_at and expires_at.
*/
class Version20161128131503 extends WallabagMigration
{
private $fields = [
'locked' => 'smallint',
'credentials_expire_at' => 'datetime',
'expires_at' => 'datetime',
];
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$userTable = $schema->getTable($this->getTable('user'));
foreach ($this->fields as $field => $type) {
$this->skipIf(!$userTable->hasColumn($field), 'It seems that you already played this migration.');
$userTable->dropColumn($field);
}
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$userTable = $schema->getTable($this->getTable('user'));
foreach ($this->fields as $field => $type) {
$this->skipIf($userTable->hasColumn($field), 'It seems that you already played this migration.');
$userTable->addColumn($field, $type, ['notnull' => false]);
}
}
}

View File

@ -0,0 +1,58 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Renamed uuid to uid in entry table.
*/
class Version20161214094402 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf($entryTable->hasColumn('uid'), 'It seems that you already played this migration.');
switch ($this->connection->getDatabasePlatform()->getName()) {
case 'sqlite':
$this->addSql('CREATE TEMPORARY TABLE __temp__wallabag_entry AS SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM ' . $this->getTable('entry'));
$this->addSql('DROP TABLE ' . $this->getTable('entry'));
$this->addSql('CREATE TABLE ' . $this->getTable('entry') . ' (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, uid CLOB DEFAULT NULL COLLATE BINARY, title CLOB DEFAULT NULL COLLATE BINARY, url CLOB DEFAULT NULL COLLATE BINARY, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype CLOB DEFAULT NULL COLLATE BINARY, language CLOB DEFAULT NULL COLLATE BINARY, reading_time INTEGER DEFAULT NULL, domain_name CLOB DEFAULT NULL COLLATE BINARY, preview_picture CLOB DEFAULT NULL COLLATE BINARY, is_public BOOLEAN DEFAULT "0", PRIMARY KEY(id));');
$this->addSql('INSERT INTO ' . $this->getTable('entry') . ' (id, user_id, uid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public) SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM __temp__wallabag_entry;');
$this->addSql('DROP TABLE __temp__wallabag_entry');
break;
case 'mysql':
$this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CHANGE uuid uid VARCHAR(23)');
break;
case 'postgresql':
$this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' RENAME uuid TO uid');
}
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf($entryTable->hasColumn('uuid'), 'It seems that you already played this migration.');
switch ($this->connection->getDatabasePlatform()->getName()) {
case 'sqlite':
throw new SkipMigrationException('Too complex ...');
break;
case 'mysql':
$this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CHANGE uid uuid VARCHAR(23)');
break;
case 'postgresql':
$this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' RENAME uid TO uuid');
}
}
}

View File

@ -0,0 +1,36 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Added index on wallabag_entry.uid.
*/
class Version20161214094403 extends WallabagMigration
{
private $indexName = 'IDX_entry_uid';
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf($entryTable->hasIndex($this->indexName), 'It seems that you already played this migration.');
$entryTable->addIndex(['uid'], $this->indexName);
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf(false === $entryTable->hasIndex($this->indexName), 'It seems that you already played this migration.');
$entryTable->dropIndex($this->indexName);
}
}

View File

@ -0,0 +1,39 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Added indexes on wallabag_entry.is_starred and wallabag_entry.is_archived.
*/
class Version20170127093841 extends WallabagMigration
{
private $indexStarredName = 'IDX_entry_starred';
private $indexArchivedName = 'IDX_entry_archived';
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf($entryTable->hasIndex($this->indexStarredName) && $entryTable->hasIndex($this->indexArchivedName), 'It seems that you already played this migration.');
$entryTable->addIndex(['is_starred'], $this->indexStarredName);
$entryTable->addIndex(['is_archived'], $this->indexArchivedName);
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf(false === $entryTable->hasIndex($this->indexStarredName) && false === $entryTable->hasIndex($this->indexArchivedName), 'It seems that you already played this migration.');
$entryTable->dropIndex($this->indexStarredName);
$entryTable->dropIndex($this->indexArchivedName);
}
}

View File

@ -0,0 +1,37 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Add the share_scuttle internal setting.
*/
class Version20170327194233 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$scuttle = $this->container
->get('doctrine.orm.default_entity_manager')
->getConnection()
->fetchArray('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'share_scuttle'");
$this->skipIf(false !== $scuttle, 'It seems that you already played this migration.');
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('share_scuttle', '1', 'entry')");
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('scuttle_url', 'http://scuttle.org', 'entry')");
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'share_scuttle';");
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'scuttle_url';");
}
}

View File

@ -0,0 +1,48 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Add published_at and published_by in `entry` table.
*/
class Version20170405182620 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf($entryTable->hasColumn('published_at'), 'It seems that you already played this migration.');
$entryTable->addColumn('published_at', 'datetime', [
'notnull' => false,
]);
$this->skipIf($entryTable->hasColumn('published_by'), 'It seems that you already played this migration.');
$entryTable->addColumn('published_by', 'text', [
'notnull' => false,
]);
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf(!$entryTable->hasColumn('published_at'), 'It seems that you already played this migration.');
$entryTable->dropColumn('published_at');
$this->skipIf(!$entryTable->hasColumn('published_by'), 'It seems that you already played this migration.');
$entryTable->dropColumn('published_by');
}
}

View File

@ -0,0 +1,34 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Remove isPublic in Entry Table.
*/
class Version20170407200919 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf(!$entryTable->hasColumn('is_public'), 'It seems that you already played this migration.');
$entryTable->dropColumn('is_public');
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf($entryTable->hasColumn('is_public'), 'It seems that you already played this migration.');
$entryTable->addColumn('is_public', 'boolean', ['notnull' => false, 'default' => 0]);
}
}

View File

@ -0,0 +1,35 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Remove download_pictures in craue_config_setting.
*/
class Version20170420134133 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'download_pictures';");
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$downloadPictures = $this->container
->get('doctrine.orm.default_entity_manager')
->getConnection()
->fetchArray('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'download_pictures'");
$this->skipIf(false !== $downloadPictures, 'It seems that you already played this migration.');
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('download_pictures', '1', 'entry')");
}
}

View File

@ -0,0 +1,44 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Add site credential table to store username & password for some website (behind authentication or paywall).
*/
class Version20170501115751 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$this->skipIf($schema->hasTable($this->getTable('site_credential')), 'It seems that you already played this migration.');
$table = $schema->createTable($this->getTable('site_credential'));
$table->addColumn('id', 'integer', ['autoincrement' => true]);
$table->addColumn('user_id', 'integer');
$table->addColumn('host', 'string', ['length' => 255]);
$table->addColumn('username', 'text');
$table->addColumn('password', 'text');
$table->addColumn('createdAt', 'datetime');
$table->addIndex(['user_id'], 'idx_user');
$table->setPrimaryKey(['id']);
$table->addForeignKeyConstraint($this->getTable('user'), ['user_id'], ['id'], [], 'fk_user');
if ('postgresql' === $this->connection->getDatabasePlatform()->getName()) {
$schema->dropSequence('site_credential_id_seq');
$schema->createSequence('site_credential_id_seq');
}
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$schema->dropTable($this->getTable('site_credential'));
}
}

View File

@ -0,0 +1,43 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Changed length for username, username_canonical, email and email_canonical fields in wallabag_user table.
*/
class Version20170510082609 extends WallabagMigration
{
private $fields = [
'username',
'username_canonical',
'email',
'email_canonical',
];
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration only apply to MySQL');
foreach ($this->fields as $field) {
$this->addSql('ALTER TABLE ' . $this->getTable('user') . ' CHANGE ' . $field . ' ' . $field . ' VARCHAR(180) NOT NULL;');
}
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration only apply to MySQL');
foreach ($this->fields as $field) {
$this->addSql('ALTER TABLE ' . $this->getTable('user') . ' CHANGE ' . $field . ' ' . $field . ' VARCHAR(255) NOT NULL;');
}
}
}

View File

@ -0,0 +1,38 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Added `headers` field in entry table.
*/
class Version20170511115400 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf($entryTable->hasColumn('headers'), 'It seems that you already played this migration.');
$entryTable->addColumn('headers', 'text', [
'notnull' => false,
]);
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf(!$entryTable->hasColumn('headers'), 'It seems that you already played this migration.');
$entryTable->dropColumn('headers');
}
}

View File

@ -0,0 +1,79 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Migrations\SkipMigrationException;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Increase the length of the "quote" column of "annotation" table.
*/
class Version20170511211659 extends WallabagMigration
{
public function up(Schema $schema)
{
$tableName = $this->getTable('annotation');
switch ($this->connection->getDatabasePlatform()->getName()) {
case 'sqlite':
$this->addSql(<<<EOD
CREATE TEMPORARY TABLE __temp__wallabag_annotation AS
SELECT id, user_id, entry_id, text, created_at, updated_at, quote, ranges
FROM ${tableName}
EOD
);
$this->addSql('DROP TABLE ' . $tableName);
$this->addSql(<<<EOD
CREATE TABLE ${tableName}
(
id INTEGER PRIMARY KEY NOT NULL,
user_id INTEGER DEFAULT NULL,
entry_id INTEGER DEFAULT NULL,
text CLOB NOT NULL,
created_at DATETIME NOT NULL,
updated_at DATETIME NOT NULL,
quote CLOB NOT NULL,
ranges CLOB NOT NULL,
CONSTRAINT FK_A7AED006A76ED395 FOREIGN KEY (user_id) REFERENCES wallabag_user (id),
CONSTRAINT FK_A7AED006BA364942 FOREIGN KEY (entry_id) REFERENCES wallabag_entry (id) ON DELETE CASCADE
);
CREATE INDEX IDX_A7AED006A76ED395 ON wallabag_annotation (user_id);
CREATE INDEX IDX_A7AED006BA364942 ON wallabag_annotation (entry_id);
EOD
);
$this->addSql(<<<EOD
INSERT INTO ${tableName} (id, user_id, entry_id, text, created_at, updated_at, quote, ranges)
SELECT id, user_id, entry_id, text, created_at, updated_at, quote, ranges
FROM __temp__wallabag_annotation;
EOD
);
$this->addSql('DROP TABLE __temp__wallabag_annotation');
break;
case 'mysql':
$this->addSql('ALTER TABLE ' . $tableName . ' MODIFY quote TEXT NOT NULL');
break;
case 'postgresql':
$this->addSql('ALTER TABLE ' . $tableName . ' ALTER COLUMN quote TYPE TEXT');
break;
}
}
public function down(Schema $schema)
{
$tableName = $this->getTable('annotation');
switch ($this->connection->getDatabasePlatform()->getName()) {
case 'sqlite':
throw new SkipMigrationException('Too complex ...');
break;
case 'mysql':
$this->addSql('ALTER TABLE ' . $tableName . ' MODIFY quote VARCHAR(255) NOT NULL');
break;
case 'postgresql':
$this->addSql('ALTER TABLE ' . $tableName . ' ALTER COLUMN quote TYPE VARCHAR(255)');
break;
}
}
}

View File

@ -0,0 +1,35 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Add api_user_registration in craue_config_setting.
*/
class Version20170602075214 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$apiUserRegistration = $this->container
->get('doctrine.orm.default_entity_manager')
->getConnection()
->fetchArray('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'api_user_registration'");
$this->skipIf(false !== $apiUserRegistration, 'It seems that you already played this migration.');
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('api_user_registration', '0', 'api')");
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'api_user_registration';");
}
}

View File

@ -0,0 +1,36 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Remove wallabag_url from craue_config_setting.
* It has been moved into the parameters.yml.
*/
class Version20170606155640 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$apiUserRegistration = $this->container
->get('doctrine.orm.default_entity_manager')
->getConnection()
->fetchArray('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'wallabag_url'");
$this->skipIf(false === $apiUserRegistration, 'It seems that you already played this migration.');
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'wallabag_url'");
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('wallabag_url', 'wallabag.me', 'misc')");
}
}

View File

@ -0,0 +1,99 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Changed tags to lowercase.
*/
class Version20170719231144 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$this->skipIf('sqlite' === $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
// Find tags which need to be merged
$dupTags = $this->connection->query('
SELECT LOWER(label) AS lower_label
FROM ' . $this->getTable('tag') . '
GROUP BY LOWER(label)
HAVING COUNT(*) > 1'
);
$dupTags->execute();
foreach ($dupTags->fetchAll() as $duplicates) {
$label = $duplicates['lower_label'];
// Retrieve all duplicate tags for a given tag
$tags = $this->connection->executeQuery('
SELECT id
FROM ' . $this->getTable('tag') . '
WHERE LOWER(label) = :label
ORDER BY id ASC',
[
'label' => $label,
]
);
$first = true;
$newId = null;
$ids = [];
foreach ($tags->fetchAll() as $tag) {
// Ignore the first tag as we use it as the new reference tag
if ($first) {
$first = false;
$newId = $tag['id'];
} else {
$ids[] = $tag['id'];
}
}
// Just in case...
if (\count($ids) > 0) {
// Merge tags
$this->addSql('
UPDATE ' . $this->getTable('entry_tag') . '
SET tag_id = ' . $newId . '
WHERE tag_id IN (' . implode(',', $ids) . ')
AND entry_id NOT IN (
SELECT entry_id
FROM (SELECT * FROM ' . $this->getTable('entry_tag') . ') AS _entry_tag
WHERE tag_id = ' . $newId . '
)'
);
// Delete links to unused tags
$this->addSql('
DELETE FROM ' . $this->getTable('entry_tag') . '
WHERE tag_id IN (' . implode(',', $ids) . ')'
);
// Delete unused tags
$this->addSql('
DELETE FROM ' . $this->getTable('tag') . '
WHERE id IN (' . implode(',', $ids) . ')'
);
}
}
// Iterate over all tags to lowercase them
$this->addSql('
UPDATE ' . $this->getTable('tag') . '
SET label = LOWER(label)'
);
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
throw new SkipMigrationException('Too complex ...');
}
}

View File

@ -0,0 +1,51 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Add starred_at column and set its value to updated_at for is_starred entries.
*/
class Version20170824113337 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf($entryTable->hasColumn('starred_at'), 'It seems that you already played this migration.');
$entryTable->addColumn('starred_at', 'datetime', [
'notnull' => false,
]);
}
public function postUp(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf(!$entryTable->hasColumn('starred_at'), 'Unable to add starred_at colum');
$this->connection->executeQuery(
'UPDATE ' . $this->getTable('entry') . ' SET starred_at = updated_at WHERE is_starred = :is_starred',
[
'is_starred' => true,
]
);
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf(!$entryTable->hasColumn('starred_at'), 'It seems that you already played this migration.');
$entryTable->dropColumn('starred_at');
}
}

View File

@ -0,0 +1,48 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Changed reading_time field to prevent null value.
*/
class Version20171008195606 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$this->skipIf('sqlite' === $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
switch ($this->connection->getDatabasePlatform()->getName()) {
case 'mysql':
$this->addSql('UPDATE ' . $this->getTable('entry') . ' SET reading_time = 0 WHERE reading_time IS NULL;');
$this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CHANGE reading_time reading_time INT(11) NOT NULL;');
break;
case 'postgresql':
$this->addSql('UPDATE ' . $this->getTable('entry') . ' SET reading_time = 0 WHERE reading_time IS NULL;');
$this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' ALTER COLUMN reading_time SET NOT NULL;');
break;
}
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->skipIf('sqlite' === $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
switch ($this->connection->getDatabasePlatform()->getName()) {
case 'mysql':
$this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CHANGE reading_time reading_time INT(11);');
break;
case 'postgresql':
$this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' ALTER COLUMN reading_time DROP NOT NULL;');
break;
}
}
}

View File

@ -0,0 +1,38 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Add origin_url column.
*/
class Version20171105202000 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf($entryTable->hasColumn('origin_url'), 'It seems that you already played this migration.');
$entryTable->addColumn('origin_url', 'text', [
'notnull' => false,
]);
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf(!$entryTable->hasColumn('origin_url'), 'It seems that you already played this migration.');
$entryTable->dropColumn('origin_url');
}
}

View File

@ -0,0 +1,35 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Add store_article_headers in craue_config_setting.
*/
class Version20171120163128 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$storeArticleHeaders = $this->container
->get('doctrine.orm.default_entity_manager')
->getConnection()
->fetchArray('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'store_article_headers'");
$this->skipIf(false !== $storeArticleHeaders, 'It seems that you already played this migration.');
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('store_article_headers', '0', 'entry')");
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'store_article_headers';");
}
}

View File

@ -0,0 +1,35 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Add shaarli_share_origin_url in craue_config_setting.
*/
class Version20171125164500 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$shaarliShareOriginUrl = $this->container
->get('doctrine.orm.default_entity_manager')
->getConnection()
->fetchArray('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'shaarli_share_origin_url'");
$this->skipIf(false !== $shaarliShareOriginUrl, 'It seems that you already played this migration.');
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('shaarli_share_origin_url', '0', 'entry')");
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'shaarli_share_origin_url';");
}
}

View File

@ -0,0 +1,40 @@
# settings_changed: Configuration updated
download_pictures: Download billeder på din server
carrot: Aktiver deling til Carrot
diaspora_url: Diaspora URL, hvis tjenesten er aktiv
export_epub: Aktiver eksport til ePub
export_mobi: Aktiver eksport til .mobi
export_pdf: Aktiver eksport til PDF
export_csv: Aktiver eksport til CSV
export_json: Aktiver eksport til JSON
export_txt: Aktiver eksport til TXT
export_xml: Aktiver eksport til XML
# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
# import_with_redis: Enable Redis to import data asynchronously
shaarli_url: Shaarli-URL, hvis tjenesten er aktiv
scuttle_url: Scuttle-URL, hvis tjenesten er aktiv
unmark_url: Unmark-URL, hvis tjenesten er aktiv
share_diaspora: Aktiver deling til Diaspora
share_mail: Aktiver deling med email
share_shaarli: Aktiver deling gennem Shaarli
share_scuttle: Aktiver deling gennem Scuttle
share_twitter: Aktiver deling gennem Twitter
share_unmark: Aktiver deling gennem Unmark.it
show_printlink: Vis et link til print-indhold
wallabag_support_url: Support-URL for wallabag
entry: "artikel"
export: "eksport"
import: "import"
misc: "misc"
modify_settings: "Gem ændring"
piwik_host: Hosting af din side hos Piwik (uden http:// eller https://)
piwik_site_id: ID for din side hos Piwik
piwik_enabled: Aktiver Piwik
demo_mode_enabled: "Aktiver demo-indstilling? (anvendes kun til wallabags offentlige demo)"
demo_mode_username: "Demobruger"
# share_public: Allow public url for entries
# download_images_enabled: Download images locally
# restricted_access: Enable authentication for websites with paywall
# api_user_registration: Enable user to be registered using the API
# store_article_headers: Enable if wallabag stores HTTP headers for each article
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

View File

@ -0,0 +1,40 @@
settings_changed: 'Konfiguration aktualisiert'
download_pictures: 'Bilder auf den Server herunterladen'
carrot: 'Teilen zu Carrot aktivieren'
diaspora_url: 'Diaspora-URL, sofern der Service aktiviert ist'
export_epub: 'ePUB-Export aktivieren'
export_mobi: 'mobi-Export aktivieren'
export_pdf: 'PDF-Export aktivieren'
export_csv: 'CSV-Export aktivieren'
export_json: 'JSON-Export aktivieren'
export_txt: 'TXT-Export aktivieren'
export_xml: 'XML-Export aktivieren'
import_with_rabbitmq: 'Aktiviere RabbitMQ, um Artikel asynchron zu importieren'
import_with_redis: 'Aktiviere Redis, um Artikel asynchron zu importieren'
shaarli_url: 'Shaarli-URL, sofern der Service aktiviert ist'
scuttle_url: 'Scuttle-URL, sofern der Service aktiviert ist'
unmark_url: 'Unmark-URL, sofern der Service aktiviert ist'
share_diaspora: 'Teilen zu Diaspora aktiveren'
share_mail: 'Teilen via E-Mail aktiveren'
share_shaarli: 'Teilen zu Shaarli aktiveren'
share_twitter: 'Teilen zu Twitter aktiveren'
share_unmark: 'Teilen zu Unmark.it aktiveren'
show_printlink: 'Link anzeigen, um den Inhalt auszudrucken'
wallabag_support_url: 'Support-URL für wallabag'
wallabag_url: 'URL von *deiner* wallabag-Instanz'
entry: 'Artikel'
export: 'Export'
import: 'Import'
misc: 'Verschiedenes'
modify_settings: 'Übernehmen'
piwik_host: 'Host deiner Webseite in Piwik (ohne http:// oder https://)'
piwik_site_id: 'ID deiner Webseite in Piwik'
piwik_enabled: 'Piwik aktivieren'
demo_mode_enabled: 'Test-Modus aktivieren? (nur für die öffentliche wallabag-Demo genutzt)'
demo_mode_username: 'Test-Benutzer'
share_public: 'Erlaube eine öffentliche URL für Einträge'
download_images_enabled: 'Bilder lokal herunterladen'
restricted_access: 'Authentifizierung für Webseiten mit Paywall aktivieren'
api_user_registration: 'Registrierung eines Benutzers über die API ermöglichen'
store_article_headers: 'Speichern von HTTP-Headern für jeden Artikel aktivieren'
shaarli_share_origin_url: 'Original-URL mit Shaarli teilen, wenn der Service aktiviert ist'

View File

@ -0,0 +1,40 @@
settings_changed: Configuration updated
download_pictures: Download pictures on your server
carrot: Enable share to Carrot
diaspora_url: diaspora* URL, if the service is enabled
export_epub: Enable ePub export
export_mobi: Enable .mobi export
export_pdf: Enable PDF export
export_csv: Enable CSV export
export_json: Enable JSON export
export_txt: Enable TXT export
export_xml: Enable XML export
import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
import_with_redis: Enable Redis to import data asynchronously
shaarli_url: Shaarli URL, if the service is enabled
scuttle_url: Scuttle URL, if the service is enabled
unmark_url: Unmark URL, if the service is enabled
share_diaspora: Enable share to diaspora*
share_mail: Enable share by e-mail
share_shaarli: Enable sharing to Shaarli
share_scuttle: Enable sharing to Scuttle
share_twitter: Enable sharing to Twitter
share_unmark: Enable sharing to Unmark.it
show_printlink: Display a link to print content
wallabag_support_url: Support URL for wallabag
entry: "article"
export: "export"
import: "import"
misc: "misc"
modify_settings: "apply"
piwik_host: Host of your website in Piwik (without http:// or https://)
piwik_site_id: ID of your website in Piwik
piwik_enabled: Enable Piwik
demo_mode_enabled: "Enable demo mode? (Only used for the public wallabag demo)"
demo_mode_username: "Demo user"
share_public: Allow public URL for entries
download_images_enabled: Download images locally
restricted_access: Enable authentication for paywalled websites
api_user_registration: Enable user to be registered using the API
store_article_headers: Enable if wallabag stores HTTP headers for each article
shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

View File

@ -0,0 +1,40 @@
settings_changed: Configuración actualizada
download_pictures: Descargar imágenes en el servidor
carrot: Activar compartir con Carrot
diaspora_url: URL de Diaspora, si el servicio está activado
export_epub: Activar exportación a ePub
export_mobi: Activar exportación a .mobi
export_pdf: Activar exportación a PDF
export_csv: Activar exportación a CSV
export_json: Activar exportación a JSON
export_txt: Activar exportación a TXT
export_xml: Activar exportación a XML
import_with_rabbitmq: Activar RabbitMQ para importar datos de forma asíncrona
import_with_redis: Activar Redis para importar datos de forma asíncrona
shaarli_url: URL de Shaarli, si el servicio está activado
scuttle_url: URL de Scuttle, si el servicio está activado
unmark_url: URL de Unmark, si el servicio está activado
share_diaspora: Activar compartir con Diaspora
share_mail: Activar compartir con Email
share_shaarli: Activar compartir con Shaarli
share_scuttle: Activar compartir con Scuttle
share_twitter: Activar compartir con Twitter
share_unmark: Activar compartir con Unmark.it
show_printlink: Mostrar un enlace para imprimir contenido
wallabag_support_url: URL de soporte de wallabag
entry: "artículo"
export: "exportar"
import: "importar"
misc: "misc"
modify_settings: "guardar"
piwik_host: Host de tu website en Piwik (sin http:// o https://)
piwik_site_id: ID de tu website en Piwik
piwik_enabled: Activar Piwik
demo_mode_enabled: "Activar modo demo (sólo usado en la demo pública de wallabag)"
demo_mode_username: "Nombre de usuario demo"
share_public: Permitir URL pública para los artículos
download_images_enabled: Descargar imágenes localmente
restricted_access: Activar autenticación para websites con paywall
# api_user_registration: Enable user to be registered using the API
# store_article_headers: Enable if wallabag stores HTTP headers for each article
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

View File

@ -0,0 +1,40 @@
# settings_changed: Configuration updated
download_pictures: تصاویر را در کارگزار خودتان باربگیرید
carrot: فعال‌سازی هم‌رسانی به Carrot
diaspora_url: نشانی Diaspora، اگر فعال بود
export_epub: فعال‌سازی برون‌سپاری به ePub
export_mobi: فعال‌سازی برون‌سپاری به mobi
export_pdf: فعال‌سازی برون‌سپاری به PDF
export_csv: فعال‌سازی برون‌سپاری به CSV
export_json: فعال‌سازی برون‌سپاری به JSON
export_txt: فعال‌سازی برون‌سپاری به TXT
export_xml: فعال‌سازی برون‌سپاری به XML
# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
# import_with_redis: Enable Redis to import data asynchronously
shaarli_url: نشانی Shaarli، اگر فعال بود
scuttle_url: نشانی Scuttle، اگر فعال بود
unmark_url: نشانی Unmark، اگر فعال بود
share_diaspora: فعال‌سازی هم‌رسانی به Diaspora
share_mail: فعال‌سازی هم‌رسانی با ایمیل
share_shaarli: فعال‌سازی هم‌رسانی به Shaarli
share_scuttle: فعال‌سازی هم‌رسانی به Scuttle
share_twitter: فعال‌سازی هم‌رسانی به Twitter
share_unmark: فعال‌سازی هم‌رسانی به Unmark.it
show_printlink: نمایش پیوندی برای چاپ مطلب
wallabag_support_url: نشانی صفحهٔ پشتیبانی wallabag
entry: "مقاله"
export: "برون‌سپاری"
import: "درون‌ریزی"
misc: "غیره"
modify_settings: "اعمال"
# piwik_host: Host of your website in Piwik (without http:// or https://)
# piwik_site_id: ID of your website in Piwik
# piwik_enabled: Enable Piwik
# demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
# demo_mode_username: "Demo user"
# share_public: Allow public url for entries
# download_images_enabled: Download images locally
# restricted_access: Enable authentication for websites with paywall
# api_user_registration: Enable user to be registered using the API
# store_article_headers: Enable if wallabag stores HTTP headers for each article
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

View File

@ -0,0 +1,40 @@
settings_changed: Configuration mise à jour
download_pictures: Télécharger les images sur le serveur
carrot: Activer le partage vers Carrot
diaspora_url: URL de Diaspora, si le service Diaspora est activé
export_epub: Activer l'export ePub
export_mobi: Activer l'export .mobi
export_pdf: Activer l'export PDF
export_csv: Activer l'export CSV
export_json: Activer l'export JSON
export_txt: Activer l'export TXT
export_xml: Activer l'export XML
import_with_rabbitmq: Activer RabbitMQ pour gérer les imports de façon asynchrone
import_with_redis: Activer Redis pour gérer les imports de façon asynchrone
shaarli_url: URL de Shaarli, si le service Shaarli est activé
scuttle_url: URL de Scuttle, si le service Scuttle est activé
unmark_url: URL de Unmark, si le service Unmark est activé
share_diaspora: Activer le partage vers Diaspora
share_mail: Activer le partage par email
share_shaarli: Activer le partage vers Shaarli
share_scuttle: Activer le partage vers Scuttle
share_twitter: Activer le partage vers Twitter
share_unmark: Activer le partage vers Unmark.it
show_printlink: Afficher un lien pour imprimer
wallabag_support_url: URL de support de wallabag
entry: "article"
export: "export"
import: "import"
misc: "divers"
modify_settings: "appliquer"
piwik_host: URL de votre site dans Piwik (sans http:// ou https://)
piwik_site_id: ID de votre site dans Piwik
piwik_enabled: Activer Piwik
demo_mode_enabled: "Activer le mode démo ? (utiliser uniquement pour la démo publique de wallabag)"
demo_mode_username: "Utilisateur de la démo"
share_public: Autoriser une URL publique pour les articles
download_images_enabled: Télécharger les images en local
restricted_access: Activer l'authentification pour les articles derrière un paywall
api_user_registration: Activer la création de compte depuis l'API
store_article_headers: Activer le stockage des en-têtes HTTP de chaque article
shaarli_share_origin_url: Activer le partage de l'adresse d'origine vers Shaarli, si le service est activé

View File

@ -0,0 +1,40 @@
# settings_changed: Configuration updated
download_pictures: Scarica le immagini sul tuo server
carrot: Abilita la condivisione con Carrot
diaspora_url: Diaspora URL, se il servizio è abilitato
export_epub: Abilita esportazione ePub
export_mobi: Abilita esportazione .mobi
export_pdf: Abilita esportazione PDF
export_csv: Abilita esportazione CSV
export_json: Abilita esportazione JSON
export_txt: Abilita esportazione TXT
export_xml: Abilita esportazione XML
# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
# import_with_redis: Enable Redis to import data asynchronously
shaarli_url: Shaarli URL, se il servizio è abilitato
scuttle_url: Scuttle URL, se il servizio è abilitato
unmark_url: Unmark URL, se il servizio è abilitato
share_diaspora: Abilita la condivisione con Diaspora
share_mail: Abilita la condivisione per email
share_shaarli: Abilita la condivisione con Shaarli
share_scuttle: Abilita la condivisione con Scuttle
share_twitter: Abilita la condivisione con Twitter
share_unmark: Abilita la condivisione con Unmark.it
show_printlink: Mostra un collegamento per stampare il contenuto
wallabag_support_url: URL di supporto per wallabag
entry: "contenuto"
export: "esporta"
import: "importa"
misc: "misc"
modify_settings: "applica"
piwik_host: Host del tuo sito in Piwik (senza http:// o https://)
piwik_site_id: ID del tuo sito in Piwik
piwik_enabled: Abilita Piwik
demo_mode_enabled: "Abilita modalità demo ? (usato solo per la demo pubblica di wallabag)"
demo_mode_username: "Utente Demo"
# share_public: Allow public url for entries
# download_images_enabled: Download images locally
# restricted_access: Enable authentication for websites with paywall
api_user_registration: Abilita la registrazione dell'utente attraverso l'API
# store_article_headers: Enable if wallabag stores HTTP headers for each article
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

View File

@ -0,0 +1,40 @@
settings_changed: Configuracion mesa a jorn
download_pictures: Telecargar los imatges sul servidor
carrot: Activar lo partatge cap a Carrot
diaspora_url: URL de Diaspora, se lo servici Diaspora es activat
export_epub: Activar l'expòrt ePub
export_mobi: Activar l'expòrt .mobi
export_pdf: Activar l'expòrt PDF
export_csv: Activar l'expòrt CSV
export_json: Activar l'expòrt JSON
export_txt: Activar l'expòrt TXT
export_xml: Activar l'expòrt XML
import_with_rabbitmq: Activar RabbitMQ per importar de donadas de manièra asincròna
import_with_redis: Activar Redis per importar de donadas de manièra asincròna
shaarli_url: URL de Shaarli, se lo servici Shaarli es activat
scuttle_url: URL de Scuttle, se lo servici Scuttle es activat
unmark_url: URL de Unmark, se lo servici Scuttle es activat
share_diaspora: Activar lo partatge cap a Diaspora*
share_mail: Activar lo partatge per corrièl
share_shaarli: Activar lo partatge cap a Shaarli
share_scuttle: Activar lo partatge cap a Scuttle
share_twitter: Activar lo partatge cap a Twitter
share_unmark: Activar lo partatge cap a Unmark.it
show_printlink: Afichar un ligam per imprimir
wallabag_support_url: URL d'assisténcia de wallabag
entry: "article"
export: "expòrt"
import: "impòrt"
misc: "divèrs"
modify_settings: "aplicar"
piwik_host: URL de vòstre site dins Piwik (sense http:// o https://)
piwik_site_id: ID de vòstre site dins Piwik
piwik_enabled: Activar Piwik
demo_mode_enabled: "Activar lo mode demostracion ? (utilizar solament per la demostracion publica de wallabag)"
demo_mode_username: "Utilizaire de la demostracion"
share_public: Autorizar una URL publica pels articles
download_images_enabled: Telecargar los imatges en local
restricted_access: Activar l'autenticacion pels sites amb peatge
api_user_registration: Autorizar los utilizaires a se marcar amb l'API
store_article_headers: Activar se wallabag garda las entèstas HTTP per cada article
shaarli_share_origin_url: Activar lo partatge de lurl amb Shaarli, se lo servici es activat

View File

@ -0,0 +1,39 @@
settings_changed: Konfiguracja zaktualizowana
download_pictures: Pobierz obrazy na swój serwer
carrot: Włącz udostępnianie dla Carrot
diaspora_url: Adres URL Diaspora, jeżeli usługa jest włączona
export_epub: Włącz eksport do ePub
export_mobi: Włącz eksport do .mobi
export_pdf: Włącz eksport do PDF
export_csv: Włącz eksport do CSV
export_json: Włącz eksport do JSON
export_txt: Włącz eksport do TXT
export_xml: Włącz eksport do XML
import_with_rabbitmq: Włącz RabbitMQ dla asynchronicznego importu danych
import_with_redis: Włącz Redis dla asynchronicznego importu danych
shaarli_url: Adress URL Shaarli, jeżeli usługa jest włączona
scuttle_url: Adress URL Scuttle, jeżeli usługa jest włączona
share_diaspora: Włącz udostępnianie dla Diaspora
share_mail: Włącz udostępnianie przez email
share_shaarli: Włącz udostępnianie dla Shaarli
share_scuttle: Włącz udostępnianie dla Scuttle
share_twitter: Włącz udostępnianie dla Twitter
share_unmark: Włącz udostępnianie dla Unmark.it
show_printlink: Pokaż link do wydrukowania zawartości
wallabag_support_url: Adres URL wsparcia dla wallabag
entry: "artykuł"
export: "eksport"
import: "import"
misc: "różne"
modify_settings: "zatwierdź"
piwik_host: Host twojej strony Piwik (bez http:// lub https://)
piwik_site_id: ID twojej strony Piwik
piwik_enabled: Włacz Piwik
demo_mode_enabled: "Włacz tryb demo? (używany wyłącznie dla publicznej demonstracji Wallabag)"
demo_mode_username: "Użytkownik Demonstracyjny"
share_public: Zezwalaj na publiczny adres url dla wpisow
download_images_enabled: Pobierz obrazy lokalnie
restricted_access: Włącz autoryzację dla stron z paywallem
api_user_registration: Włącz rejestrację użytkownika przy użyciu API
# store_article_headers: Enable if wallabag stores HTTP headers for each article
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

View File

@ -0,0 +1,41 @@
# settings_changed: Configuration updated
download_pictures: Download imagens no seu servidor
carrot: Habilitar compartilhamento para o Carrot
diaspora_url: URL Diaspora caso o serviço esteja habilitado
export_epub: Habilita exportação para ePub
export_mobi: Habilita exportação para .mobi
export_pdf: Habilita exportação para PDF
export_csv: Habilita exportação para CSV
export_json: Habilita exportação para JSON
export_txt: Habilita exportação para TXT
export_xml: Habilita exportação para XML
# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
# import_with_redis: Enable Redis to import data asynchronously
shaarli_url: URL Shaarli caso o serviço esteja habilitado
scuttle_url: URL Scuttle caso o serviço esteja habilitado
unmark_url: URL Unmark caso o serviço esteja habilitado
pocket_consumer_key: Chave de consumidor do Pocket para importar conteúdo (https://getpocket.com/developer/docs/authentication)
share_diaspora: Habilitar compartilhamento para o Diaspora
share_mail: Habilitar compartilhamento por e-mail
share_shaarli: Habilitar compartilhamento para o Shaarli
share_scuttle: Habilitar compartilhamento para o Scuttle
share_twitter: Habilitar compartilhamento para o Twitter
share_unmark: Habilitar compartilhamento para o Unmark.it
show_printlink: Mostrar um link para imprimir o conteúdo
wallabag_support_url: URL de Suporte do wallabag
entry: "artigo"
export: "exportar"
import: "importar"
misc: "misc"
modify_settings: "aplicar"
piwik_host: Host de seu website Piwik
piwik_site_id: ID de seu website Piwik
piwik_enabled: Habilitar Piwik
demo_mode_enabled: "Habilitar modo demo? (somente usado para o demo público do wallabag)"
demo_mode_username: "Usuário demo"
# share_public: Allow public url for entries
# download_images_enabled: Download images locally
# restricted_access: Enable authentication for websites with paywall
# api_user_registration: Enable user to be registered using the API
# store_article_headers: Enable if wallabag stores HTTP headers for each article
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

View File

@ -0,0 +1,40 @@
# settings_changed: Configuration updated
download_pictures: Descarcă poze pe server
carrot: Permite share către Carrot
diaspora_url: Diaspora URL, dacă serviciul este permis
export_epub: Permite exportare ePub
export_mobi: Permite exportare .mobi
export_pdf: Permite exportare PDF
export_csv: Permite exportare CSV
export_json: Permite exportare JSON
export_txt: Permite exportare TXT
export_xml: Permite exportare XML
# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
# import_with_redis: Enable Redis to import data asynchronously
shaarli_url: Shaarli URL, dacă serviciul este permis
scuttle_url: Scuttle URL, dacă serviciul este permis
unmark_url: Unmark URL, dacă serviciul este permis
share_diaspora: Permite share către Diaspora
share_mail: Permite share prin email
share_shaarli: Permite share către Shaarli
share_scuttle: Permite share către Scuttle
share_twitter: Permite share către Twitter
share_unmark: Permite share către Unmark.it
show_printlink: Afișează un link pentru a printa content-ul
wallabag_support_url: URL-ul de suport pentru wallabag
entry: "alticol"
export: "exportă"
import: "importă"
misc: "diverse"
modify_settings: "aplică"
# piwik_host: Host of your website in Piwik (without http:// or https://)
# piwik_site_id: ID of your website in Piwik
# piwik_enabled: Enable Piwik
# demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
# demo_mode_username: "Demo user"
# share_public: Allow public url for entries
# download_images_enabled: Download images locally
# restricted_access: Enable authentication for websites with paywall
# api_user_registration: Enable user to be registered using the API
# store_article_headers: Enable if wallabag stores HTTP headers for each article
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

View File

@ -0,0 +1,40 @@
settings_changed: "Настройки обновлены"
download_pictures: "Скачивать картинки на Ваш сервер"
carrot: "Включить возможность отслеживания событий через Carrot"
diaspora_url: "Diaspora URL, если сервис включен"
export_epub: "Включить ePub экспорт"
export_mobi: "Включить .mobi экспорт"
export_pdf: "Включить PDF экспорт"
export_csv: "Включить CSV экспорт"
export_json: "Включить JSON экспорт"
export_txt: "Включить TXT экспорт"
export_xml: "Включить XML экспорт"
import_with_rabbitmq: "Включить RabbitMQ для импорта данных(асинхронно)"
import_with_redis: "Включить Redis для импорта данных(асинхронно)"
shaarli_url: "Shaarli URL, если сервис включен"
scuttle_url: "Scuttle URL, если сервис включен"
unmark_url: "Unmark URL, если сервис включен"
share_diaspora: "Включить возможность поделиться в соц.сети Diaspora"
share_mail: "Включить возможность поделиться по email"
share_shaarli: "Включить возможность поделиться в Shaarli"
share_twitter: "Включить возможность поделиться в Twitter"
share_unmark: "Включить возможность поделиться в Unmark.it"
show_printlink: "Отображать ссылки в версии для печати"
wallabag_support_url: "Поддержка URL для wallabag"
wallabag_url: "URL *вашего* wallabag сервиса"
entry: "запись"
export: "экспорт"
import: "импорт"
misc: "разное"
modify_settings: "применить"
piwik_host: "Ссылка на Ваш сайт на Piwik (с http:// или https://)"
piwik_site_id: "ID Вашего сайта на Piwik"
piwik_enabled: "Включить Piwik"
demo_mode_enabled: "Включить демо режим ? (только для публичной демонстрации wallabag)"
demo_mode_username: "Демо пользователь"
share_public: "Разрешить публичные ссылки на записи"
download_images_enabled: "Скачивать изображения локально"
restricted_access: "Включить авторизацию на сайте с помощью paywall"
# api_user_registration: Enable user to be registered using the API
# store_article_headers: Enable if wallabag stores HTTP headers for each article
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

View File

@ -0,0 +1,37 @@
settings_changed: ปรับปรุงองค์ประกอบ
download_pictures: ดาวน์โหลดรูปภาพผ่านเซิฟเวอร์ของคุณ
carrot: เปิดการแชร์ Carrot
diaspora_url: Diaspora-URL, ถ้าเซิฟเวอร์ถูกเปิดใช้งาน
export_epub: เปิดใช้งานการนำเข้าข้อมูลแบบ ePub
export_mobi: เปิดใช้งานการนำเข้าข้อมูลแบบ .mobi
export_pdf: เปิดใช้งานการนำเข้าข้อมูลแบบ PDF
export_csv: เปิดใช้งานการนำเข้าข้อมูลแบบ CSV
export_json: เปิดใช้งานการนำเข้าข้อมูลแบบ JSON
export_txt: เปิดใช้งานการนำเข้าข้อมูลแบบ TXT
export_xml: เปิดใช้งานการนำเข้าข้อมูลแบบ XML
import_with_rabbitmq: เปิดใช้งาน RabbitMQ เพื่อดึงข้อมูลแบบ asynchronous
import_with_redis: เปิดใช้งาน Redis เพื่อดึงข้อมูลแบบ asynchronous
shaarli_url: Shaarli-URL, ถ้าเซิฟเวอร์ถูกเปิดใช้งาน
share_diaspora: เปิดการแชร์ Diaspora
share_mail: เปิดการแชร์ผ่าน email
share_shaarli: เปิดการแชร์ Shaarli
share_scuttle: เปิดการแชร์ Scuttle
share_twitter: เปิดการแชร์ Twitter
share_unmark: เปิดการแชร์ Unmark.it
show_printlink: แสดงลิงค์เพื่อปรินท์เนื้อหา
wallabag_support_url: URL ที่สนับสนุนจาก wallabag
entry: "บทความ"
export: "นำข้อมูลออก"
import: "นำเข้าข้อมูล"
misc: "เบ็ดเตล็ด"
modify_settings: "ปรับใช้"
piwik_host: โฮสบนเว็บไซต์ของคุณใน Piwik (ยกเว้น http:// หรือ https://)
piwik_site_id: ไอดีบนเว็บไซต์ของคุณใน Piwik
piwik_enabled: เปิดการใช้ Piwik
demo_mode_enabled: "เปิดการใช้งานโหมดเดโม ? (เฉพาะการใช้สำหรับเดโมสาธารณะของ wallabag)"
demo_mode_username: "ผู้ใช้ส่วนเดโม"
share_public: ยอมรับ URL สาธารณะจากการเข้าถึงข้อมูล
download_images_enabled: ดาวน์โหลดรูปภาพเฉพาะ
restricted_access: เปิดใช้งานการรองรับบนเว็บไซต์กับ paywall
api_user_registration: เปิดใช้งานให้ผู้ใช้ลงทะเบียนการใช้ API
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

View File

@ -0,0 +1,41 @@
# settings_changed: Configuration updated
# download_pictures: Download pictures on your server
# carrot: Enable share to Carrot
# diaspora_url: Diaspora URL, if the service is enabled
# export_epub: Enable ePub export
# export_mobi: Enable .mobi export
# export_pdf: Enable PDF export
# export_csv: Enable CSV export
# export_json: Enable JSON export
# export_txt: Enable TXT export
# export_xml: Enable XML export
# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
# import_with_redis: Enable Redis to import data asynchronously
# shaarli_url: Shaarli URL, if the service is enabled
# scuttle_url: Scuttle URL, if the service is enabled
# unmark_url: Unmark URL, if the service is enabled
# share_diaspora: Enable share to Diaspora
# share_mail: Enable share by email
# share_shaarli: Enable share to Shaarli
# share_scuttle: Enable share to Scuttle
# share_twitter: Enable share to Twitter
# share_unmark: Enable share to Unmark.it
# show_printlink: Display a link to print content
# wallabag_support_url: Support URL for wallabag
# wallabag_url: URL of *your* wallabag instance
# entry: "article"
# export: "export"
# import: "import"
# misc: "misc"
# modify_settings: "apply"
# piwik_host: Host of your website in Piwik (without http:// or https://)
# piwik_site_id: ID of your website in Piwik
# piwik_enabled: Enable Piwik
# demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
# demo_mode_username: "Demo user"
# share_public: Allow public url for entries
# download_images_enabled: Download images locally
# restricted_access: Enable authentication for websites with paywall
# api_user_registration: Enable user to be registered using the API
# store_article_headers: Enable if wallabag stores HTTP headers for each article
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

View File

@ -0,0 +1,40 @@
{% extends "WallabagCoreBundle::layout.html.twig" %}
{% block title %}{{ 'menu.left.internal_settings'|trans }}{% endblock %}
{% block content %}
<div class="row">
<div class="col s12">
<div class="card-panel settings">
{{ form_start(form, {'attr': {'class': 'craue_config_settings_modify'}}) }}
{{ form_errors(form) }}
<div class="row">
<div class="div_tabs col s12">
<ul class="tabs">
{% for section in sections | craue_sortSections %}
<li class="tab col s12 m6 l3"><a href="#set-{{ section }}">{{ section | trans({}, 'CraueConfigBundle') }}</a></li>
{% endfor %}
</ul>
</div>
{% for section in sections | craue_sortSections %}
<div id="set-{{ section }}" class="col s12">
{% for setting in form.settings if setting.vars.value.section == section %}
{{ form_row(setting.value, {
'label': setting.vars.value.name | trans({}, 'CraueConfigBundle'),
}) }}
{% endfor %}
</div>
{% endfor %}
</div>
<button class="btn waves-effect waves-light" type="submit" name="action">
{{ 'modify_settings' | trans({}, 'CraueConfigBundle') }}
</button>
{{ form_widget(form._token) }}
</div>
</div>
</div>
{% endblock %}

View File

@ -0,0 +1,13 @@
/* Rules for sizing the icon. */
.material-icons.md-18 { font-size: 18px; }
.material-icons.md-24 { font-size: 24px; }
.material-icons.md-36 { font-size: 36px; }
.material-icons.md-48 { font-size: 48px; }
/* Rules for using icons as black on a light background. */
.material-icons.md-dark { color: rgba(0, 0, 0, 0.54); }
.material-icons.md-dark.md-inactive { color: rgba(0, 0, 0, 0.26); }
/* Rules for using icons as white on a dark background. */
.material-icons.md-light { color: rgba(255, 255, 255, 1); }
.material-icons.md-light.md-inactive { color: rgba(255, 255, 255, 0.3); }

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -0,0 +1,334 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="800"
height="770"
id="svg4004"
version="1.1"
inkscape:version="0.48.4 r9939"
sodipodi:docname="New document 11">
<defs
id="defs4006" />
<sodipodi:namedview
id="base"
pagecolor="#000"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.7"
inkscape:cx="359.23155"
inkscape:cy="349.10374"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:window-width="1631"
inkscape:window-height="1026"
inkscape:window-x="49"
inkscape:window-y="24"
inkscape:window-maximized="1" />
<metadata
id="metadata4009">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(21.42857,-101.6479)">
<image
y="101.6479"
x="-21.42857"
id="image4071"
xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAMCCAYAAACRFKJVAAAABHNCSVQICAgIfAhkiAAAIABJREFU
eJzt3e2VVEeWLuCXu/r/ZFswiQU3sUApC7qwQGDBgAUqLICxAGQB1RYorwUqD5QeqDyo+yPIJkVS
ReXHORFxzvOsxWK6B1TRiDoZ79k7djy7v78PAADAGP5P7QUAAADzIYAAAACjEUAAAIDRCCAAAMBo
BBAAAGA0AggAADAaAQQAABiNAAIAAIxGAAEAAEYjgAAAAKMRQAAAgNH845hf/OzZs6HWATCEV0l+
qb0IuIDbJG9rLwJ6cn9/X3sJPOCoAALQmWWSdeU1AAB7tGABAACjEUAAAIDRCCAA0L5F7QUAXIoA
AgDtW9VeAMClCCAAAMBoBBAAAGA0AggAADAaAQQAABiNAAIAAIxGAAGm7L9qLwAA+DsBBJgyo0sB
oDECCAAAMBoBBAD6sK69AIBLEEAAAIDRCCAAAMBoBBAAAGA0AggAADAaAQQAABiNAAIAAIxGAAEA
AEYjgAAAAKMRQACgD+vaCwC4BAEEAAAYjQACAACMRgABAABGI4AAAACjEUAAAIDRCCAAAMBoBBAA
AGA0AggAADAaAQQA+vB/ay8A4BIEEADow6L2AgAuQQABAABGI4AAAACjEUAAAIDRCCAAAMBoBBAA
AGA0AggAADAaAQQAABiNAAIAfVjWXgDAJQggANCHZe0FAFzCs/v7+6f/4mfPBlwKwMU9/QEHffBB
DE90zB6XcamAAAAAoxFAAACA0QggAADAaAQQAABgNAIIAAAwmn/UXgAAAFxay9Nb5z6hSwUEAPqx
rL0AgHMJIADQj2XtBQCcSwABAABGI4AAAACjEUAAAIDRCCAAAMBoBBAAAGA0AggAADAaAQQAABiN
AAIA/VjUXgDAuQQQAOjHqvYCAM4lgAAAAKMRQAAAgNEIIAAAwGgEEAAAYDQCCAAAMBoBBAAAGI0A
AgAAjEYAAQAARiOAAEA/fqq9AIBzCSAAAMBoBBAAAGA0AggAADAaAQQAABiNAAJM1br2AgCAQwII
AAAwGgEEAAAYjQACAACMRgABgH6sai8A4FwCCAD0Y1F7AQDnEkAAAIDRCCAAAMBoBBAAAGA0AggA
ADAaAQQAABiNAAIAAIxGAAEAAEYjgABAX1xGCHRNAAGAvriMEOiaAAIAAIxGAAEAAEYjgAAAAKMR
QAAAgNEIIAAAwGgEEAAAYDQCCAAAMBoBBAD6sqy9AIBzCCAA0Jdl7QUAnEMAAQAARiOAAAAAoxFA
AACA0QggAADAaAQQAABgNAIIAAAwGgEEAAAYjQACTNWq9gJgIP9VewEA5xBAgKla1F4ADES4Brom
gAAAAKMRQAAAgNEIIAAAwGgEEAAAYDQCCAAAMBoBBAAAGI0AAgAAjEYAAYC+uOMG6JoAAgB9cREh
0DUBBAAAGI0AAgAAjEYAAQAARiOAAAAAoxFAAACA0QggAADAaAQQAABgNAIIAAAwGgEEAPqzrr0A
gFMJIAAAwGgEEAAAYDQCCAAAMBoBBAAAGI0AAgAAjEYAAQAARiOAAAAAoxFAAACA0QggANCfVe0F
AJxKAAGA/ixqLwDgVAIIAAAwGgEEmKr/rr0AAOCQAAJM1bL2AgCAQwIIAAAwGgEEAAAYjQACAACM
RgABAABGI4AAQH9MeQO6JYAAQH+WtRcAcCoBBAAAGI0AAgAAjEYAAQAARiOAAAAAoxFAAACA0Qgg
AADAaAQQAABgNAIIAPRnWXsBAKcSQACgP8vaCwA4lQACAACMRgABAABGI4AAAACjEUAAAIDRCCAA
AMBoBBAAAGA0AggAADAaAQQA+rSovQCAUwggANCnVe0FAJxCAAEAAEYjgAAAAKMRQAAAgNEIIAAA
wGgEEAAAYDQCCDBVy9oLAAAOCSDAVC1rLwAAOCSAAAAAoxFAAKBP69oLADiFAAIAAIxGAAEAAEYj
gHz1McmbOLgKAACDEUCKZZJXSd4n+TPJHxFGAADg4gSQ4uqb/7zKYRhZjb0oAACYmn/UXkAj/vXI
/2+Vr+Fjm+QmyW9JbgdeEwAATI4KSLLI00cZLlOqIX+kVEfeR2UEAACeTAA5bL96qmWEEQAAOIoA
8nj71VMtI4wAMK6fai8A4BTP7u/vn/6Lnz0bcClVLJL8NeA/fxtnRqCWpz/coE+bJD/XXgRwvGP2
31M09wrIqe1XT7WMyggAAPzH3APImOXrZQ7DyNABCACAuq5S9n18MfcWrL9S2rBquktp0/r3l5+B
y5h3fZs52EQLFrRqleSXlIuud3vNF/nSkq8Fa76uUj98JGUNr5J8TglEH6MyAgDQm+9dZL2/17S/
+2LOAeQS068uTRgBAOjH90LH8oFf2+Les4o5t2C10H71VNq04Hjzrm8zB5towYIadu1VV3k4bDzk
eZKtFqx5Wqef8JGojAAA1HRMpeMx9m+ZbwXkfcpfnN6pjMDD5v16iTm4S/LP2ouACVumBIb/yWlh
43s2SX6eewVkrgHkz1zuL1JL9sPIXeW1QG3zfrozF5P5YIZGLFNCxy8Z7u62f97f3896nzbHALJK
KZ1NnTDC3AkgzMEkPpihsmWGDx37Xt/f338a4es0a44BZCrtV8cQRpgjAYQ5mMQHM1SwzLihY9/N
/f39y5G/ZlPmGED+yPh/0VoijDAXAghzMIkPZhjJMvVCx767+/v7WZ/fmlsAWaac/6AQRpgyAYQ5
6P6DGQa2SAkd/0pbE6heZgIDhE49TD+3Mbwt/cVrwVXKSN+/Ukb8vkpf44kBAL7Vw/UFs76UcG4V
kLm3Xz3VTZL/9+Xnbd2lwMlUQJiD7j+Y4UJarXQ8ZJtyKWHXTq2AzCmALKP96hS3SX6LMEJ/BBDm
oOsPZjhTb6HjWy9S9lnd0oL1Yz3+xWzBpW7+BODylrUXACProb3qqX6pvYBa5lQB+Zx+/4K2SGWE
li1SPphg6n5OuVkZpm6/0jGV86rbdN6GpQXrcTYjwxJGaM06ye+1FwEjEECYsimGjm89T8d7Jy1Y
j1P5GJY2LQDgEuY2oXOWe9S5BJBZjzobmTACABxjbqFj3yzPgcyhBUv7VRtuU9oEfkvnEx/owjpa
sJgHLVj0ap2y+Z5ye9VT/TOdXgitBeth69oLIEmpjLxJqYr8mVIlcScLAMzHfpfE75lXpeMxs2vD
mkMA0X7VnmWEEQCYA63ZPza7veocWrD+inTdi23KJC1tWpxrHS1YzIMWLFq0ytf2qmXdpXSjyzYs
LVjfp6+wL8uojAAcw2ccrVDpOM+69gLGNPUAMruS1oQsI4wA/IjnIjUtI3Rcyqz2rFMPILM71DNR
yxyGkXXF9QDAXC3z989koeMyZrVnnXIAWUVpeoqWKQ+731PO93zMzL5pAWBky+hKGNoiM3q5OuUA
MsuLXWZmkTLC73OEEQC4pGWEjrHNpg1rygHERnRehBEAOM8yQkdNs9m3TDWArKIfcc6EEQB4mt1n
ptBR3zIz+bOfagCx2WRHGAGAv/veZ+MsNr4dmMUeZaoBZDY9dBxFGAFgrnwG9mEWe9h/1F7AAJaR
4vmx3YP4VcrNo5sk/065ib27m0iB2fqv2gugaYuUkPGvCBu92B0j2NZdxrCmWAHxDcaxdg/ojylv
hT6nBBNjnIHWeeHGt1Q6+jf5f19TDCDG73IuYQSA3lxF6JiKn2ovYGjP7u/vn/6Lnz0bcCkXsUyZ
4ABDuIk2rV6sUy6rhKnbJPm59iKoZr+9youyaflnOthrHJMj9k2tArKuvQAmTWUEgNp8Fs3DpCtY
Uwsgs5gcQBN8AAAwFp858zPpNqwptWAtUr4xoSZtWm1YRwsW87CJFqyp0l41b3cpbVhN04I18VIV
3dh/S/VHkjcpZ5MA4EdWKTeRq3Swm9A5SVMKINqvaM3ug+TPCCMAfN/3PiuEDpIJ722n1IJ1Wg0I
xneb5LeUNq1t3aVM1jpasJiHTbRg9WiVcm3AVbyY4mHbJM9rL+Ixp7ZgTSWA7GZfQ2+EkWGsI4Aw
H81+OPM3QgeneJGyV2jSqQHkHxdeRy2TLVExeat8Lb8LIwDTInRwrl/ScAA51VQqIH9FvyTTIoyc
Zx0VEOaj2Q/nmVqmBI7/idDB+W5TqiBNmnMLlvYrpu42X0f7Tu4tyEDWEUCYjyY/nGdmmbIf+SWl
6gGX9DyNvoyc8xhe7VdM3SrJrynTUf5MadfyAfc4FVFgaMuUiVWezQxtcuN4p1AB+TNKnMzTNqUq
8ltURr51nRLaYA6a/HCeqGVUOhhfs21Yc23BWqW8eYC520YY2XcdAYT5aO7DeWKWETqo758pt6M3
Za4tWL/UXgA0YhmtAACXski5hfxzPFNpw6TasHoPIJP6lwEXsowwAnCs/dDxV5KPsc+gHZM689xz
C5b2KzjONvNp07qOFizmo+mLyhq3SAkZ/4qwQfua2ogn82zBWtdeAHRmma+VEW/3YDpMfTuOSge9
mszf054DiPMfcDofwMCceOYxBZNpw+o1gCyjpx0uxQczMFVXKc+0P+PZRv8m8/f3H7UXcKLJ/AuA
xuzCyKuUcX83+XoLO0AP9s90aE9jShYpL+C7P/PVawDRfgXDE0aAXggdzMUvmUAA6bEFa5f+gPFo
0wJas2uv+ivl2fQqwgfTN4nP3h4rIJP4g4eOPVQZ2aTBW1qBSVmnvAFW6WCulplAG1aPAWQyEwBg
AvbDSPL3Ni1hBLiEVb6GjmXdpUAT1uk8gPTWgrW7MAhok5YIGN8U25JXSd6nTK/6I+UOo2XNBUFD
uj8L3VsAET6gH8IIjGMq31dCBzzNKp1/b/QWQLRfQZ+EEeB7hA44zbr2As7RWwBZ114AcDZhBOZt
GaEDztX1S/meAoiJFzA9wgjMwzIlaPyREjyEDjhP1/vingJI10kP+KH9MPJ7bFCgd8v8PXS8zzQP
zEMt3Z6N7imAdPuHDBxtHS0a0KNlhA4Yy0+1F3CqXgJI12Um4CwOqULblhE6oIZuX873EkC6TXjA
RQkj0IbdJaRCB9TT7f14vQSQLv9wgUEJI1D890hfZxc6Pqec1foYoQNq6/Il/bP7+/un/+JnzwZc
yoNWKZsLgKe4TXIXY7uZj02Snwf6Z+/esP4rXgZCi7ZJntf64sfkiH3/uPA6htD9dfPAqLyRhfMI
HdCPZcrn3m3ldRylhwDi4QcAwxI6oF9X6SyAtH4GZBk93QAwlKv8/UyH8AH96e6uvNYrIB6EAHBZ
+5UOI+6hf6uUF/bbust4utYDiPMfAHA+oQOm7SrJh9qLeKqWA8gyDpMCwKmEDpiPf0UAuQjtVwBw
HKED5mmd8j1/V3kdT9JyAOnuQA0AVLBIuZTzVYQOmLOrJJ9qL+IpWr2IcJEykQMAAPixmyQvx/yC
p15E2OoYXu1XAADwdOvaC3iqVgOI9isAAHi63YWizWsxgHTzhwcAAA3p4iV+iwFE+AAAgON1sY9u
MYD8VHsBAADQoUU6uEevxQDSRXIDAIAG/VJ7AT/SWgBxcRIAAJyu+Zf5rQWQLg7OAABAo5ZffjSr
tQDSfGIDAIDGNb2nbimArKP9CgAAztX0OZCWAoj2KwAAON8qDbdhtRRAmi4VAQBAR9a1F/CQVgJI
0ykNAAA602x3USsBpOk+NQAA6Eyz11u0EkDWtRcAAAATs669gO9pIYAs08GV8QAA0Jkm27BaCCAO
nwMAwOU1uc9uIYA4/wEAAJe3SINtWLUDyDLarwAAYCjNtWHVDiBNloUAAGAimttv1w4gP1X++gAA
MGXLNNZxVDOALNJgIgMAgIlpas9dM4A09QcBAAAT1dQ5kJoBpKk/CAAAmKhVSitWE2oFEO1XAAAw
nmb23rUCyLrS1wUAgDlqZvhTrQCi/QoAAMZzldKFVF2tANJMCQgAAGaiiT14jQDSTPoCAIAZaaIL
qUYAaeJ/OAAAzMy69gKSehUQAABgXE1Moh07gKyi/QoAAGqp3o00dgD5ZeSvBwAAfLWuvYCxA0j1
kg8AAMzYMqUrqZoxA0hTV8ADAMBMVe1KGjOAqH4AAEB965pffMwAUv3ACwAAULczaawAskzlXjMA
AOA/qnUnjRVAtF8BAEA7qp0DeXZ/f//0X/zs2alf54+ogAAAQEv+meTu1N98TI7YN0YFZBnhAwAA
WlOlS2mMALIe4WsAAADHqTIkaowAYvoVAAC0Z5IVkEUcQAcAgFaNvlcfOoAIHwAA0K7Ru5WGDiDa
rwAAoF2jFwyGHsN72mwuAABgLD8n2Rz7m1ocw6v9CgAA2jdq19KQAUT7FQAAtG/UwsGQLVh/pUzB
AgAA2vYiye0xv6G1FqyrCB8AANCL9VhfaKgAov0KAAD68ctYX2ioFqw/kyxPWA8AAFDH8yTbp/7i
llqwVhE+AACgN6McRh8igIxWvgEAAC7mpzG+yBAtWNqvAACgT/9McveUX9hKC5b2KwAA6NfgbViX
DiDrC//zAACA8QzehnXpFqw/UqogAABAf+5S2rB+qIUWrGWEDwAA6NkiA7dhXTKAjDK2CwAAGNSg
bViXbMHSfgUAAP3bplxK+KhTW7AuFUAWSf46aQUAAEBrXiS5fewX1D4Dov0KAACmY7DLxS8VQP51
oX8OAABQ33qof/AlWrC0XwEAwPQ8TzkP8l01W7C0XwEAwPQMss+/RADRfgUAANMzyD7/Ei1Yf6W0
YQEAANPyz5Tb0Q/UasG6ivABAABTdfE2rHMDiPYrAACYrovv989twdJ+BQAA0/bdcxg1WrC0XwEA
wPRdtA3rnADy08VWAQAAtOqibVjntGD9mWR5ycUAAADNuUuZhvU3Y7dgrSJ8AADAHCxS9v8XcWoA
+eVSCwAAAJp3sf3/qS1Y2q8AAGA+tkme7/8XY7ZgLSN8AADAnCxzoQxwSgC5+G2IAABA8y6SA04J
IM5/AADA/FwkBxx7BmSZcv4DAACYn+cp50FGOwOi/QoAAOZrfe4/4NgAcpfk9twvCgAAdOnsW9FP
HcO7TKmG/JILXkoCAAA0759J7k5twTo1gOxbRhgBAIC5eJnkpmYA2beMMAIAAFP2KcnrVgLIvmWE
EQAAmJq7JP9sMYDsW0YYAQCAqXh5f39/c8pvPOUiwlNsk3xI8iJldvDbJCctGAAAqO6nU3/jWBWQ
hyxSKiP/ijtGAACgF9v7+/vnp/zGowLIkJ49eyaMAABAP17c398ffUfgWC1YT3GXcqL+Zcps4dfR
pgUAAK06qWjQUgDZJ4wAAEC77k79jS21YD3ll2nTAgCAem6S/DulWJBTskRvAWSfMAIAAMPbhY6b
fFP5mFsA2SeMAADA5TwYOvbNOYDsE0YAAOB4Twod+wSQQ8IIAAA87OjQsU8AeZwwAgAAyW2S31IO
kp88zSoRQI4hjAAAMCe70HGTZHupf6gAchphBACAKRokdOwTQM4njAAA0LPBQ8c+AeSyhBEAAHow
aujYJ4AMRxgBAKAl25TA8VtKAKlCABmHMAIAQA3bNBA69gkg4xNGAAAY0jaNhY59AkhdwggAAJew
TcOhY58A0o5dGPnpy8+LussBAKBx23QSOvYJIO3ar4wIIwAAJOUW8psk//7yc3cEkD4IIwAA89V9
6NgngPRHGAEAmL6/hY5W9t+1CCDtEEYAAKbjwUpHK/vvWgSQNgkjAAD9eVJ7VSv771oEkPYJIwAA
bdsPHXc/+sWt7L9rEUD6IowAALThqNCxr5X9dy0CSL+EEQCAcZ0cOva1sv+uRQCZBmEEAGAYFwkd
+1rZf9cigEyPMAIAcJ6Lh459rey/axFApk0YAQB4mtskv6WEju2QX6iV/XctAsh8CCMAAH83WujY
18r+uxYBZJ6EEQBgrqqEjn2t7L9rEUAQRgCAqaseOva1sv+uRQBhnzACAEzFNsn/ppHQsa+V/Xct
AggPEUYAgN5sUwLHbylVjya1sv+uRQDhKYQRAKBV23QQOva1sv+uRQDhWMIIAFDbNp2Fjn2t7L9r
EUA4x1WSn778vKy7FABg4rbpOHTsa2X/XYsAwqWskvwSYQQAuJy7JJ8ygdCxr5X9dy0CCEMQRgCA
U92lVDr+/eXnyWll/12LAMLQhBEA4EcmHzr2tbL/rkUAYUzCCACwM6vQsa+V/XctAgi1CCMAMD+z
DR37Wtl/1yKA0AJhBACm7VNmHjr2tbL/rkUAoTXCCABMw36l467yWprSyv67FgGElgkjANAXoeMJ
Wtl/1yKA0AthBADaJHQcqZX9dy0CCD0SRgCgLqHjDK3sv2sRQOidMAIA49ik3EgudJyplf13LQII
UyKMAMBl3eZr6NjWXcp0tLL/rkUAYaqEEQA4jdAxsFb237UIIMyBMAIAjxM6RtTK/rsWAYS5EUYA
oBA6Kmll/12LAMKcCSMAzM02JXR8itBRTSv771oEECiEEQCmaptS5fgtpepBZa3sv2sRQOCQMAJA
77YROprVyv67FgEEHrdKCSL/+vJ/A0CrthE6utDK/rsWAQSebpkSRn6JMAJAG7YROrrTyv67FgEE
TrOMMAJAHXcpoeN/I3R0qZX9dy0CCJxvGWEEgGHtQse/v/xMx1rZf9cigMBlLSOMAHAZQsdEtbL/
rkUAgeEsI4wAcByhYwZa2X/XIoDAOJYRRgD4PqFjAK3scTkkgMD4lhFGAPg6vUroGEAre1wOCSBQ
1zLCCMCc7Fc67iqvZdJa2eNySACBdiwjjABMkdBRQSt7XA4JINCmZYQRgJ4JHZW1ssflkAAC7VtG
GAHogdDRkFb2uBwSQKAvywgjAC25TbmRXOhoTCt7XA4JINCvZYQRgBpu83V61bbuUnhIK3tcDgkg
MA3LlDDyvvI6AKZK6OhMK3tcDv2j9gKAi9jWXgDABAkdMAAVEJiGZZI/kiwqrwOgd0LHRLSyx+WQ
CghMw8cIHwCn2qYEjv+N0AGDE0Cgf9dJ1pXXANCbbUro+C2l6gGMRAsW9G2V0noFwI9tI3TMRit7
XA6pgEDfPtZeAEDjthE6oCkCCPTrfdz/AfA92wgd0CwtWNCndZLfay8CoCF3+Ro6NnWXQgta2eNy
SACB/ixSzn0sK68DoLZd6Pj3l5/hP1rZ43JICxb0532ED2C+hA7onAoI9OUqyefaiwAYmdDB0VrZ
43JIAIF+LJL8GRcOAvMgdHCWVva4HNKCBf1w2zkwB7vQ8anyOoCBCCDQh1cp7VcAU/dbVDxg0rRg
QfuWKVOvVD+AObhL8vzLz3CyVva4HPo/tRcA/JDWK2BOFinPPWCiBBBo25uUSwcB5uQq2k5hsrRg
QbtWKa1XAHOkFYuztLLH5ZAKCLRLCwIwZ4u49wgmSQCBNl2nVEAA5myd0ooKTIgWLGjPOsnvtRcB
0Ii7JC+SbCuvg860ssflkAoItMX0F4C/81yEiRFAoC2/ptz7AcBX62jFgsnQggXtWEfrFcBD7pL8
nOS29kLoQyt7XA4JINCGRZI/48JBgMfcppwHgR9qZY/LIS1Y0Aa3nQP82CplSiDQMRUQqO8qZt0D
HONFtGLxA63scTkkgEBdy5TbzlU/AJ5OKxY/1Moel0NasKAurVcAx1sleV97EcBpBBCo503K5CsA
jucZCp3SggV1rFJG7qp+AJxum9KKdVd5HTSolT0uh1RAoA6tVwDnW6Zc4Ap0RACB8V2nVEAAOJ9W
LOiMFiwY1ypl6hUAl7ONViy+0coel0MqIDCeRUrrFQCXtYznK3RDAIHx/BqtVwBDufryA2icFiwY
xzpl6hUAw7lL8jxasYgWrJapgMDwtF4BjMPzFjoggMDwPqb0JwMwvKskr2ovAniYFiwY1lWSz7UX
ATAzdylTsbaV10FFrexxOSSAwHAWSf6MCwcBatgk+bn2IqinlT0uh7RgwXA+R/gAqGWdckkh0BgV
EBjGmyTvay8CYOa0Ys1YK3tcDgkgcHnLlNvOVT8A6rtNCSHMTCt7XA5pwYLL+xjhA6AVqyTXtRcB
fKUCApd1nXLjOQBteZFSDWEmWtnjckgAgctZpbReAdAerVgz08oel0NasOBy3L4L0C6tWNAIFRC4
jPcx7hGgB1qxZqKVPS6HBBA43zrJ77UXAcCTbFNCyF3ldTCwVva4HNKCBedZROsVQE+WMSwEqhJA
4DzvUz7MAOjHm5TqNVCBFiw43VWSz7UXAcBJttGKNWmt7HE5pAICp9F6BdC3ZUoVGxiZAAKncds5
QP9epVSzgRFpwYLjvYrqB8BU3CV5Hq1Yk9PKHpdDKiBwnGWU7AGmREstjEwAgeNovQKYnqtoxYLR
CCDwdMY2AkyXF0wwEmdA4GlWSf6ovQgABrVJ8nPtRXAZrexxOaQCAk+jPxhg+tYp1W5gQAII/Nh1
SgUEgOn7NWXgCDAQLVjwuHWS32svAoBRbaIVq3ut7HE5pAICDzOaEWCe1tGKBYMRQOBhyvAA8/U+
2m9hEFqw4PvW0XoFMHe3SV7UXgSnaWWPyyEVEDi0SPK59iIAqG6VMogEuCAVEDj0OW7EBeCrFynV
EDrSyh6XQyog8HdXET4A+Du3pMMFCSDw1TKmXgFwaJUymAS4AC1Y8NXvKYfPAeB7fk65I4QOtLLH
5ZAKCBRvInwA8DitWHABAggorQPwNMv4vICzacGC5I+4bAqAp9OK1YFW9rgcUgFh7q4jfABwnM/R
igUnUwFhzlYp1Q8AONZNkpe1F8HDWtnjckgFhLlaxMhdAE7n3ig4kQDCXP0arVcAnMdULDiBAMIc
rVPG7gLAOVTT4QQCCHPjwwKAS7qKl1pwFIfQmZvP0bMLwGXdJXmRZFt5HexpZY/LIRUQ5sSBQQCG
oLoORxBAmAsfDgAMaR2tWPAkWrCYi99TPhwAYChasRrSyh6XQyogzMGbCB8ADG+RctYQeIQAwtQt
U+78AIAxrJJc114EtEwLFlOn9QqAGl4kua29iDlrZY/LIRUQpuw6wgcAdRh8Ag8QQJiqVbReAVCP
Vix4gBYspuqPlIc/ANT0c5JN7UXMUSt7XA6pgDBF7yN8ANCGjynTsYC0+wmHAAAZv0lEQVQvBBCm
Zh0XQQHQjmW0BMPfaMFiShYprVfLyusAgG9pxRpZK3tcDqmAMCXvI3wA0CatWPCFAMJUXCV5VXsR
APCAZYzmhSRasJiGRZI/480SAO17meSm9iLmoJU9LodUQJgCZW0AeuEzi9kTQOjdq5T2KwDowSJa
sZg5LVj0bJky9cqbJAB6oxVrYK3scTkkgNCz31Pu/QCA3twleZFkW3kdk9XKHpdDWrDo1ZsIHwD0
SysWs6UCQo9WKa1XANC7t0k+1F7EFLWyx+WQAEKP/kgJIQDQO61YA2llj8shLVj05jrCBwDToRWL
2RFA6Mk6ya+1FwEAF7ZOecEGs6AFi14sUlqvlpXXAQBDeZHktvYipqKVPS6HVEDoxa8RPgCYNq1Y
zIIAQg/WKWN3AWDKVtGKxQxowaJ1iyR/xm3nAMyHVqwLaGWPyyEVEFr3McIHAPPis49JE0Bo2dWX
HwAwJ6uY+siEacGiVcuUqVfeAAEwVz8n2dReRK9a2eNySAWEVik/AzB3PguZJAGEFr1JmXwFAHO2
jFYsJkgLFq1ZJfk93vgAwM7LJDe1F9GbVva4HBJAaM0fKSEEqOttkv+OO3igBXdJnn/5mSdqZY/L
IS1YtOQ6wge0YJPkQ5J3cRcBtGARt6QzISogtGKVUv0A6vr2TavvTWiHVqwjtLLH5ZAKCC3wZgfa
8TJ/b/O4TWnHAuozFYtJEEBowa/RegUt+JDv3znw0H8PjGuR5HPtRcC5tGBR2zpl6hVQ122SF4/8
/xdJ/oy3r9CCtykvBnhEK3tcDgkg1LRI6S1fVl4HzN1dSvjY/uDXreOFAbTgqd+zs9bKHpdDWrCo
6WOED2jB6zxtI7OJt67QAmcn6ZoAQi1XX34AdX3KcVN13sZoXmjBOu7poVNasKhBLzm04TbJzzn+
crNVSiuW72Go6y7le9hLge9oZY/LIRUQavgcGxdoweucdrPybcolhUBdWrHokgDC2N6klI2Bus5t
pfoQF6JBC1ZJrmsvAo6hBYsxLVOmXql+QF03KRcOnks7JbTjRbRi/U0re1wOqYAwJje4Qn13Ka1X
l/pnXSLIAOfTikU3BBDGch2tV9CClznt3MdDNjGaF1qwSvK+9iLgKbRgMYZVSusVUNe7DNcr/kfK
9zpQ188pLwZmr5U9LocEEMZgYwL13ab0iA/FaF5owzble/2Slc4utbLH5ZAWLIb2PsIH1DbGWQ2j
eaENyyS/1l4EPEYFhCGtU96IAnW9zHgjcz8nuRrpawEPm30rVit7XA4JIAxlkdJ6tay8Dpi7T7nc
1KunMJoX2rDNzFuxWtnjckgLFkN5H+EDartNuXBwTEbzQhuWMZqXRgkgDOEqyavai4CZ2933UePt
5yZG80ILrqIlkgZpweLStF9AG96mfggwAQ/qu0vyPDNsxWplj8shFRAuzW3nUN9N6oePpF4FBvhq
Ea1YNEYA4ZJeRakXattm3EPnj6lxBgU4pDWapmjB4lKWKe0Wqh9QV4ujN43mhfruUqZibSuvYzSt
7HE5pALCpWi9gvrepb3wkZSKzLb2ImDmtGLRDAGES3iTcukgUM8myXXlNTxkN5ELqGud8pkNVWnB
4lyrlNYroJ5eWiuuk/xaexEwc708L87Wyh6XQwII5zJmE+p7mTL5qgeeGVDfbUoImbRW9rgc0oLF
Oa5jIwG1fUg/4SMpYcloXqhrlXZbNpkBFRBOtU7ye+1FwMzdpky96m1D/yoOw0ILXqQ8RyaplT0u
hwQQTrFIaaNYVl4HzNldSvjodfNgNC/UN+lWrFb2uBzSgsUpfo3wAbW9S7/hIzGaF1qgFYsqVEA4
1jpar6C2m5SzFL1bx/MEWjDJVqxW9rgcUgHhGIuUtgmgnm2mc6fGJqWSA9T1OS4TZkQCCMdw2znU
9zr9HTp/zHUm+OYVOrOMO3oYkQDCU13FgVGo7V1K1WBqjOaF+t6ktEXC4JwB4SmWKVOvVD+gnk3K
1KupehWjeaG2bcp5kEm8EGhlj8shFRCeQusV1HWXaRw6f8yn9HWhIkzRMsn72otg+gQQfkRJFuqb
2rmPhxjNC/W9ipZrBqYFi8esUkZkqn5APR+SvK29iBGtUlo+gXrukjxP5y8+WtnjckgFhMdovYK6
bjOv8JGU/81G80JdiziTxYAEEB5ynfImEqjjLtO57+NY15nmtC/oiemXDEYLFt+jBQLqe51yMHuu
ljF9D2rruhWrlT0uh1RA+JayK9R3k3mHj2RaN75DrxYpt6TDRQkgfOvXaL2Cmrax8d4RxKC+dcpE
TLgYLVjsW6dMvQLqeZFyEJtikdKKtay8Dpizu5Rn07byOo7Syh6XQyog7Gi9gvreRfj41hwuYYTW
2SNwUQIIOx/jDSPUtEmZ/sQho3mhvnW0YnEhWrBIypg9h8ygnq4nzYzo95RNEFBPN22irexxOSSA
sEjyZ4y6hJpephy45nHLGM0Ltd2mhJDmtbLH5ZAWLD7HhznU9CHCx1NtY0IY1LaKdlHOpAIyb2+S
vK+9CJixbt4kNuZjkle1FwEz13wrVit7XA4JIPO1jFYGqOkuyc9p/AO8UUbzQn23Kc+wZs+utbLH
5ZAWrPn6GOEDanob4eNURvNCfauUy4vhaALIPF3HJBmo6VPc8H0uo3mhvjexn+AEWrDmZ5XSugDU
sU3pnW62baEzRvNCXds0+kxrZY/LIRWQ+XGTKdT1Mg1+UHfsdfx5Qk3LaMXiSALIvLxPqYAAdTj3
cXnbGM0LtWnF4ihasOZjndKqANSxSZkYwzDep2yCgDrukjxPQxXJVva4HBJA5sHISqiruQ/mCVqk
vGRR5YV6btLQhLpW9rgc0oI1D+8jfEBNzn0M7y5asaC2qy8/4FECyPRdxY3BUNOHlPYrhnebcs4G
qMc9Y/yQFqxpWyT5Mx4EUMttynhKxmU0L9TVRCtWK3tcDqmATJu3EFCP27rr0fIGdV3FUAgeIYBM
16vow4Sa3qaMiGV8zoNAfb/G+VMeIIBM0zLl4DlQx6cvP6jnJuX8DVDHIi4/5gHOgEyT/meoZ5ty
7kMLUH1G80J9b1PpZUAre1wOCSDT8yaqH1DTi7jtvCWrlHuQgDruUp6L27G/cCt7XA5pwZqWVYQP
qOlthI/WGM0LdS2SfK69CNqiAjItf0SrAdSySfJz7UXwIK2pUNe7JNdjfsFW9rgcEkCm4zpl4gQw
vrskz+PcR8vciwT1jdqi2soel0NasKZhHeEDanLvRPuM5oX6TMUiiQAyBcbcQV3vUtqvaJ/RvFDX
KiO3YdEmLVj9ex+3jUIttyktBfTDaF6o7+eM8OKmlT0uhwSQvq1TPkiB8VUbLcnZVinPTudBoI5t
RrgvqZU9Loe0YPXLWDuo63WEj17dprTOAXUs4+zqrKmA9Otzkqvai4CZ+hQHmqfAcxTqGrQVq5U9
LocEkD5dRfUDarlN+dA09ap/RvNCXdsM2IrVyh6XQ1qw+rOMqVdQ0+sIH1NxlzJCGahjGXuaWRJA
+vMx3tZBLW8z4iVajGITo3mhpqtohZwdLVh9eZMydhcY3028LZ+yP2I0L9Ryl+R5LlxdbmWPyyEB
pB/GRkI9g3w40hTPWKjr4i95WtnjckgLVj+0XkE9LyN8TJ3RvFCXVqwZEUD6cB2tAVDLu4xwYy9N
+JDyFhao42PKwXQmTgtW+1YpvcnA+G5TRkQyH0bzQl2blFHnZ2tlj8shFZC2LWI8HdRiROs8+fcO
da1Thu4wYQJI236N1iuo5XXKJVnMzyZG80JNv0Yr1qRpwWrXOmUiCzC+Dyl3fjBvRvNCPZuc2YrV
yh6XQyogbdJ6BfWYhsSOW++hnnXKEB4mSABpkykQUMddbDr5ShiFurSiT5QA0h5zsKGedymbTtgx
mhfq0hEyQc6AtMX4R6jn4rfwMhmLlPMgy8rrgLl6lxPasVrZ43JIAGnL7yk9j8C4tin3fWi94iHr
GAwCNb3IkRXqVva4HNKC1Y43ET6gFuc++JFNnAeBmj5Gh8hkqIC0YZlS3veNBeM7qbTPbBnNC/Uc
NSK9lT0uhwSQNmi9gjo2OXPOPLOzjBdGUNPPKc/uH2plj8shLVj1LeODDGrYjdyFY2zjkkqoSSvW
BAgg9W1TDlbpLYZxvU75/oNjfYrRvFDLMuV+EDqmBast67iEEMZwVB8xfIfRvFDXy/zgRUAre1wO
CSDtWSR5n+RV5XXAVN2m9BCbesW51jGaF2q5S/I8jzzLW9njckgLVnt2fekvY4MEl7b7/vK9xSVs
on0WalnELendEkDadZNyNmRTeR0wJe9y5EVW8APX8XcKalnWXgCnEUDatk1pFdGrDue7STn7AZem
Yg3j+xRj1LvlDEg/VimlRhdgwfG2KRVFm0SG8iraQWAMu1baH06ia2WPyyEBpD/vk7ypvQjozIto
k2F4n5Nc1V4ETNhtSsVx+5Rf3Moel0NasPrzNqXkuK28DuiFcx+Mxd0yMJwPKS+TtpXXwQWogPRr
N/3B2zZ42CZ6hBnXOkbzwiU9ueXqW63scTmkAtKvu5QypJGi8H277xEY0yZG88KlbFLu+jg6fNA2
AaR/n2JcL3yPcE4t19H2B+d6F5fGTpYAMg3blG9Sb92g+BBvzKjLaF44zV3Knua68joYkDMg02Nc
L3N3m1IVhNquUiZjAU9zkwtWr1vZ43JIBWR6blPeHLhwjTnaHVaEFtyktMkCP/Y2KoezoQIybVcp
1ZBF7YXASF7Hho+2LJL8kWRZeR3Qqm1K8Lj4ualW9rgcUgGZtpuYHsF8eNtMi0xjg4d9iotiZ0kA
mb7dh9/bKGsyXdtovaJdtzEkBPbt2mVNK5wpLVjzskw5EOmAOlPjDRo9+D3lokKYs9uU4DH4M7uV
PS6HVEDmZZuyUfMmjil5F+GDPnjby9x9SBmU45k9cyog87VOOaC+rLsMOMsm5cMMemE0L3O0a7ka
9UxqK3tcDgkg87ZI8j7Jq8rrgFPcpQxZ8EaZ3nyM5y7zcZtyFnU79hduZY/LIS1Y87Z7I2HuNj3S
zkKv3qbCZgwq+JDS+r2tvA4aowLCziKlLWBdeR3wFB9SNnHQq1XK/SAwRbsJnJuai2hlj8shFRB2
7lJ66W3qaN1t/D2lf0bzMlWblPbYTd1l0DIVEL5nldKjbFwvrbmLcj7TYjQvU/IuyXXtRey0ssfl
kAoI33Obssn7UHsh8A2980yNs0xMwTali+K67jLohQDCY96mPFC2ldcBSfLpyw+Ykm1KCIFe3aS8
tNxUXgcd0YLFUyxSWrKuai+E2dqmfMB5U8xUGc1Lj96m4W6JVva4HBJAOMarlHtDFpXXwfy8iJtz
mbZFynkQZ+/owW1K5a7p53Ire1wOacHiGJ+izMr43qbxDzm4gN29TNC6Tynt2Z7LnEwA4VjblAeP
8ZGMYZOGy/twYUZM07JdSDY4gbNpweIcxvUypLuUWfI+6Jgbo3lpTRctV99qZY/LIRUQznGbUg3x
hpohvIzwwTz5u09LPsQ5PC5MAOFcd/k6rtcHJpfyIc4aMV/Og9CCu5QwrC2Qi9OCxSUZ18sl7C7C
hLl7n+RN7UUwS7cp4WNbeR1naWWPyyEVEC5p/22Jagin2P0dAsqwD20vjO1dykugbeV1MGEqIAxl
meRzHFDnOK/jtnPYt0ryR+1FMAu7F0Cbyuu4mFb2uBxSAWEo25Q3KMb18lSfInzAt4zmZQyblKmD
m7rLYC5UQBjDKqUasqy8Dtq1m6imdQ++z2hehvIuyXXtRQyhlT0uhwQQxrJIOVD5qvI6aJMRj/C4
RZI/v/wMl7BNabma7LO3lT0uh7RgMZbdWEnz7fnW20z4AxAuxGheLukmXvxQkQDC2G6iz5SvbuIi
S3gq3y+ca3d3l5eBVKUFi5reJPk1Wgrm6i4ljPoQhKdbpJwHMWGQY92mVNFmU/VoZY/LIRUQavqQ
cvB4Ng9D/sYbODieVixO8Sk+b2mIAEJtu1uvtRXMy7tow4NTGc3LU+0C6+t44UNDtGDRknWSjzGu
d+p2oRM4z+ckV7UXQbNuUyrN28rrqKaVPS6HBBBas0gJIT5Up+kuJXxsK68DpsBoXh7yIapkAkjD
tGDRmruUNzbOB0zT6wgfcCm75yXs7P5OzD580DYBhFbtZpRvKq+Dy/mU8u8VuJxNnKGj2KR8bnrO
0jwtWPTgOmVcL/26TZnAoqoFw/gjRvPO2buUz0r2tLLH5ZAAQi9WKWdDfMD2yY27MKxVyv0gzoPM
y67lalN5HU1qZY/LIS1Y9GL3Bl2rQX/eRviAod2mvAVnPjYpl7lu6i4DjqcCQo/WKeMnvelr300c
koUxGc07D2/jhdwPtbLH5ZAAQq+M623fXcrbOec+YDxG807bNuWljqryE7Syx+WQFix6tT9q0Aa3
TUYpw/iM5p2u3XRI4YPuCSD07kM8kFv0LvqSoZZNtOdMyV3KHUpe6jAZWrCYkusY19uCTcrAAKAu
o3n7d5sSPrxkO0Ere1wOCSBMzSrlEOay8jrm6i6lIrWtvA7AaN7efYo247O0ssflkBYspuY2ZQOs
/aCO1xE+oBVG8/Zpd47ndYQPJkoFhCm7SpmU5e3fOD6kvK0D2mI0bz9uU8LHtvI6JqGVPS6HBBCm
bpHy4buuvI6p210U6W0dtMdo3j54iXNhrexxOaQFi6m7S9kY66Mdzm5Ciz9faJPRvG3bHysPsyCA
MBcfUoKISSKX9y7+XKF1mzgb16JNyoWtN5XXAaPSgsUcXce43ku5iTer0BOjedvxLuXziIG0ssfl
kADCXK1TDqgv6y6ja9uUiWNar6Afy5QQ4jxIPbuWq03ldUxeK3tcDmnBYq42KZtnZe/TOfcB/dnG
WYOablJarjaV1wFVCSDM2e4t1MvYSB/rXXyAQq8+xcuXGt7G5w0k0YIFO8uUlqx13WV0YZNyoB/o
1yKlFWtZeR1zsE0JHoZ1jKyVPS6HVECg2ObruF4ethu5C/TN9/I4PqW0+wofsEcAgb/7EB8Wj3kd
N/TCVGxS2im5vF3Ac1YOvkMLFnzfImVU75vaC2mIW3phmozmvazblODhRVZlrexxOSSAwOPWST7H
yMrblBY1b/JgepYxmvdSPqRUlTwrG9DKHpdDWrDgcZu4pXbXSuADFaZpG9XNc+2mKr6NZyX8kAAC
P7b7YJnrJvxttBLA1H3KvF+0nOM27pWCo2jBguMsU1qy5tIvfZMSvoDpM5r3eM7GNayVPS6HVEDg
ONuUN11zmByzjTGdMCdG8z7dXYxuh5MJIHCa65Qgsq27jEG5sRfmZ5N5vGA5xyblbOCm7jKgXwII
nG7X9/uh9kIG8C7OfcBcXcf3/0PexURAOJszIHAZV0k+ZhpjLDcpH7DAfC1jNO++bUp72qbuMjhG
K3tcDqmAwGXcZBol+d3EL2DetnG+Yecmpdq9qbwOmAwBBC5n/1Bir+X5uY4aBg59+vJjzt7GeTi4
uGZasGBKnj17tkppyeppXO+H+/t7bzyB/3j27NlcR/PeJnl9f3/vLAwMQACBAeydabpO8mu9lTzZ
bZIXngfAvi/PslVKCJmLT/lSyfZMhGFowYJhXae0ZW3rLuNRZv8Dj7nNPEbz7p6FWlFhYCogMIDv
THVbJHmf5NXoi/mx1/nS5+15AOz75ln2e5J1nZUM7jblWfi3livPRBiGAAIDeGSsdGvjem+yN/XK
8wDY982zbJlpjub9kAcmfnkmwjAEEBjAD+61WaaEkPUYa3nENmW05H9aDTwPgH3feZZdJflcYSlD
2LVc3Tz0CzwTYRjOgMD4tvk6rrcmoyWBY91kGqN5b1NewDwYPoDhCCBQz4eUD8AaYx7fVvq6QP/e
pu3BGj/yLuXZu628DpgtLVgwgB+0YH3P+yRvBljK92xSKjAHPA+AfY88y3oczXuXUvndPPU3eCbC
MFRAoA1vU0LB0C1Ruw9ggHP0Npp3k+R5jggfwHAEEGjHJuUDcsieZOc+gEu5Th8b+ncZ5wUP8EQC
CLRlV6EY4iKsD+ljswD0o+VL+7YpZz2u6y4D+JYzIDCAE86AfM8ylxvXu5v48ijPA2DfE59lLY7m
vckFwpFnIgxDBQTatU1pGzi3z9q5D2BILY3mvUs5U6fdFBqmAgIDuFAFZN8q5Q3j8oTf+zpP3Bx4
HgD7jniWLVKmYi0HW8yP3aY87y42YtwzEYahAgJ92LVQfTjy931KO28mgemqXWn9lFIxdr8RdEAA
gX4c21qwTf3b1oH5qDGa9y6l6tHyYXjgG1qwYAADtGB9a5FyQP3qkV9z9C3rngfAvhOfZb/nMsMz
fuQ25YXMdqgv4JkIw1ABgT7t2h3e5vtv/d5GKwJQxxgHwD+kvGTZDvx1gAGogMAARqiA7FulVENW
X/7zJqUX+mieB8C+M55lQ43m3bVcDXlh6394JsIwVECgf7sD6u9S/yAoQFICwrFDM35kk/KsGyV8
AMNRAQEAvuvMau4i5TzI6ke/8AnepcKN5vZIMAwBBAD4rgu0k65S7gc51a6quzl3IaewR4JhaMEC
AIZym9PHgW+SPE+l8AEMRwUEAPiuCw7UOHY079tc/gzJ0eyRYBgCCADwXRcMIIskf375+THblJar
JsaI2yPBMLRgAQBD243PfcxNTrhAFeiPAAIAjOGh0by7cDLGBYZAA7RgAQDfNcClqt+O5r1NCR9N
Vj3skWAYKiAAwFj2W7E+Jfk5jYYPYDgqIADAdw1QAdlZphw4b5o9EgxDAAEAAEajBQsAABiNAAIA
AIxGAAEAAEYjgAAAAKMRQAAAgNEIIAAAwGj+P10o1H/ia8mRAAAAAElFTkSuQmCC
"
height="770"
width="800" />
<path
style="fill:#FFF"
d="m 482.45517,806.8979 c -21.575,-30.1125 -55.23748,-77.12866 -74.80551,-104.48035 -19.98598,-27.9359 -36.2457,-49.73896 -37.10125,-49.75 -0.87914,-0.0113 -32.32337,42.25713 -74.37706,99.98035 -40.06973,55 -73.18741,100 -73.59485,100 -1.1396,0 -144.46068,-100.94983 -144.829571,-102.01235 -0.178476,-0.51406 32.221521,-48.07611 72.000001,-105.69344 39.77847,-57.61732 72.3245,-105.66675 72.3245,-106.77649 0,-1.78957 -12.89022,-6.31508 -114,-40.0232 -62.7,-20.90302 -114.613999,-38.24519 -115.364443,-38.53815 -1.043816,-0.4075 4.925559,-20.38013 25.402971,-84.99452 14.722078,-46.45402 27.100359,-84.84113 27.507293,-85.3047 0.406933,-0.46357 54.900599,16.97442 121.097029,38.75107 66.19643,21.77666 120.91108,39.59345 121.5881,39.59285 0.67702,-5.9e-4 1.44284,-1.01357 1.70181,-2.25107 0.25898,-1.2375 0.83006,-57.6 1.26906,-125.25 0.439,-67.65 1.16224,-123.5625 1.6072,-124.25 0.63709,-0.98436 19.23178,-1.24675 87.5,-1.23469 47.68004,0.008 87.18776,0.34593 87.79493,0.75 0.76529,0.50931 2.07325,37.70117 4.26357,121.23469 3.5965,137.16189 3.67401,139 5.86123,139 0.84816,0 53.3106,-17.56056 116.58321,-39.02347 63.2726,-21.46291 115.34958,-38.67541 115.72663,-38.25 1.27822,1.44219 53.1745,170.39371 52.53554,171.03267 -0.34901,0.34901 -53.15524,18.43347 -117.34717,40.18769 -88.30357,29.92548 -116.78951,39.96068 -117.02855,41.22754 -0.17651,0.93542 30.19001,46.31568 68.80279,102.8201 38.0153,55.63011 68.97925,101.56053 68.80877,102.06759 -0.39157,1.16463 -142.63129,105.93788 -143.82081,105.93788 -0.48298,0 -18.53042,-24.6375 -40.10542,-54.75 z"
id="path4093"
inkscape:connector-curvature="0" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 612 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 926 B

Some files were not shown because too many files have changed in this diff Show More