Compare commits

...

3066 Commits
0.2.1 ... 2.1.4

Author SHA1 Message Date
5fdb74b88c Release wallabag 2.1.4 2016-11-19 13:51:13 +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
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
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
50540682ff Undo translation of 'in english'. 2016-11-18 09:08:16 +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
9e0a49e6ac Merge pull request #2578 from wallabag/questionmark-icon
Added help on config screen
2016-11-17 09:53:14 +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
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
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
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
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
06283bef72 Merge pull request #2552 from wallabag/reading-time-round
Round readingtime to avoid crazy number
2016-11-06 23:32:39 +01:00
d61b24e459 Round readingtime to avoid crazy number
Like `8.666666666667 min`
2016-11-06 21:41:32 +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
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
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
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
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
9c15470691 wallabag is full lowercase 2016-11-02 07:15:24 +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
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
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
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
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
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
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
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
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
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
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
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
f69636c4db Merge pull request #2484 from bmillemathias/fix_2479
Document what to backup in Wallabag
2016-10-22 13:55:46 +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
89abc0b61b Add missing words in the documentation 2016-10-22 13:21:53 +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
fc75009de7 Document what to backup in Wallabag
Fixes issue #2479
2016-10-22 09:14:07 +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
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
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
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
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
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
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
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
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
5112b3556b update German installation.rst 2016-10-08 20:28:18 +02:00
5334381509 update German installation.rst 2016-10-08 20:25:48 +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
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
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
d47d2533ac change doc link 2013-10-03 19:03:52 +02:00
27a74816da change export link 2013-10-03 18:33:20 +02:00
47baa1077e reopen #219 when archive last poched links from a page, redirect to an other page 2013-10-03 15:43:24 +02:00
f0f7b94362 remove print_r 2013-10-03 14:53:08 +02:00
747c6698b6 Merge branch 'dev' of git://github.com/tcitworld/poche into tcitworld-dev 2013-10-03 14:51:20 +02:00
8f91e10faa preparing to 1.0.0 2013-10-03 14:51:04 +02:00
6cd8af85da bug fix #227: Deleting element in archive redirect to home 2013-10-03 14:48:53 +02:00
34d67c835e bug fix #219: when archive last poched links from a page, redirect to an other page 2013-10-03 14:46:46 +02:00
7f17a38d35 change instructions messages 2013-10-03 14:23:03 +02:00
07ae20eeed change reading time displaying 2013-10-03 14:17:45 +02:00
4cc3c2ac17 embed themes 2013-10-03 14:10:44 +02:00
66e074b43d remove themes 2013-10-03 14:09:58 +02:00
eb44ca4213 embed themes with poche 2013-10-03 14:06:20 +02:00
dfbbc14b33 remove themes 2013-10-03 14:05:50 +02:00
34bf601a56 change submodule & gitignore 2013-10-03 13:59:52 +02:00
969a91a1e3 site_config is now embedded with poche 2013-10-03 13:48:58 +02:00
fbe8e27568 Merge pull request #250 from NumEricR/dl-export
Force download on poche export
2013-10-03 01:52:07 -07:00
4ee705a79c Add .htaccess file to force download of poche export 2013-09-28 11:15:35 +02:00
8623a53200 Merge pull request #245 from NumEricR/themes-list
Avoid ".git" option in themes list of config page
2013-09-27 02:19:26 -07:00
4e5b04113d Changed Flattr Caching System
From md5(url) to the ID of an article. Easier and faster.
2013-09-27 11:11:45 +02:00
3cc22aab82 Avoid ".git" option in themes list of config page 2013-09-26 23:37:07 +02:00
be2b9055b9 Changed url's encryption from base64 to md5
Fixes Issue #243.
md5 hashes are only coded on 32 hexadecimal characters, so it won't make
too long file names.
2013-09-26 22:00:44 +02:00
92cd6e9af8 change import files constants 2013-09-21 21:44:49 +02:00
58ace4941e bug fix #229: theme not stored on updated poches 2013-09-21 14:37:53 +02:00
37527034ab unactivate debug 2013-09-21 14:18:28 +02:00
88e1108f11 upgrading themes 2013-09-20 14:30:07 +02:00
3408ed48ba fix bug #225: blank page on article page 2013-09-20 14:09:26 +02:00
b8c67f8068 remove define.inc.php 2013-09-20 13:48:29 +02:00
79026b73a8 Merge pull request #226 from inthepoche/dev
beta5
2013-09-20 04:36:35 -07:00
6a6c1c1172 update themes submodule 2013-09-20 11:58:08 +02:00
18bd1cc3b1 update themes 2013-09-20 11:54:39 +02:00
74c0733c1e update themes 2013-09-20 11:50:19 +02:00
f55f734fda remove themes 2013-09-20 11:35:46 +02:00
d477db2cfb add themes 2013-09-20 11:32:19 +02:00
6fe07ab815 remove themes 2013-09-20 11:31:28 +02:00
1a1142893f remove themes 2013-09-20 11:30:53 +02:00
7bda34c66b help when sqlite file not found 2013-09-20 11:25:44 +02:00
2af5015668 remove config.inc.php 2013-09-20 11:05:12 +02:00
5801355cbc chmod & mail address 2013-09-20 11:04:36 +02:00
d6b28d43c8 update themes 2013-09-20 11:00:33 +02:00
6d7e6f5e36 themes submodule 2013-09-20 10:58:53 +02:00
469590fde5 remove themes folder 2013-09-20 10:55:46 +02:00
00dbaf90bc merge #224 2013-09-20 10:21:39 +02:00
705250b93d fixes with new session class 2013-09-20 09:32:49 +02:00
0d64be15de remove csrf check 2013-09-18 09:25:28 +02:00
f6597c7cb9 fix bug #127: update session class 2013-09-17 14:48:16 +02:00
a8778dc23e fix bug #105: Scroll position save / sync 2013-09-17 13:27:16 +02:00
d62dfd88d2 Merge pull request #221 from NumEricR/language
Fix #183: language declaration
2013-09-15 10:12:56 -07:00
d081f272b0 Use dynamic lang value in IE conditional comments 2013-09-14 10:06:59 +02:00
1b2abab6dd Add lang attribute in html tag 2013-09-14 10:06:59 +02:00
10ab20d8e2 Fix missing lang in html tag of update pages 2013-09-14 10:06:59 +02:00
48207b6814 remove poche.js 2013-09-13 10:29:03 +02:00
1a08e7b6f6 titles with colon bad parsed 2013-09-13 09:01:33 +02:00
b9523a0ba0 fix bug #209: titles with colon bad parsed 2013-09-12 19:28:59 +02:00
084ec2a63d change strings for gettext 2013-09-12 14:26:30 +02:00
b9e0514783 update locale files 2013-09-12 13:24:09 +02:00
3e05742568 Merge branch 'dev' of https://github.com/inthepoche/poche into dev 2013-09-12 12:36:07 +02:00
660b998eb7 add english language 2013-09-12 12:28:22 +02:00
b084cde854 Merge pull request #216 from NumEricR/css-icons
Move icon's no-repeat to common code and clean CSS
2013-09-10 21:43:46 -07:00
8ca368e7e3 fix flattr span 2013-09-11 06:40:29 +02:00
a0fd7c5b44 Format CSS code 2013-09-10 23:54:40 +02:00
7eb64927cc Move icons no-repeat into common style 2013-09-10 23:54:18 +02:00
9074534c93 fix flattr span 2013-09-10 22:19:34 +02:00
12d9cfbcaa Merge branch 'Flattr' of git://github.com/tcitworld/poche into tcitworld-Flattr
Conflicts:
	inc/3rdparty/site_config
2013-09-10 19:22:47 +02:00
f3a6080fce add site_config submodule 2013-09-10 18:50:42 +02:00
f16b0747a4 remove site_config to manage them by a submodule 2013-09-10 18:28:17 +02:00
964481d023 Fixed bugs, added a flattr button and an option
There's a button and an option in define.inc.php to show the button or
not.
2013-09-10 18:23:56 +02:00
d143cae25a remove comments in poche_compatibility_test 2013-09-10 15:47:09 +02:00
d11e2bcf48 change doc url 2013-09-10 15:46:05 +02:00
3c33e40b61 change email address in header 2013-09-10 15:43:01 +02:00
eaf2c769be Merge branch 'dev' of https://github.com/inthepoche/poche into dev 2013-09-10 14:44:59 +02:00
ce4a1dcc19 changes to add url directly from poche 2013-09-10 14:41:58 +02:00
2230a38cd6 Merge pull request #205 from NumEricR/less-is-more
Less is more :-)
2013-09-09 05:01:58 -07:00
ef6051b95e Merge pull request #199 from NumEricR/nb-results
Add the number of results next to pager
2013-09-09 04:55:56 -07:00
af1d279226 Fixed errors and changed source of flattrs
Fixed errors, and the number displayed is no longer the number of peope
who has flattred an article, but the number of flattrs he has got.
2013-09-08 21:52:01 +02:00
d5ce28df67 Fixed bugs due to migration 2013-09-08 21:26:30 +02:00
693b3f8677 Implemented Add Button
Added a button to add an URL when directly into Poche. If JS isn't
enabled, nothing happens.
2013-09-08 21:07:59 +02:00
a322312740 Implemented Flattr changes
Added a button to say if the article is flattrable or not and how many
people have flattred this object.
2013-09-08 20:54:11 +02:00
2edde7fe33 Display sort links only if there is at least 2 articles in current list 2013-09-05 22:16:36 +02:00
08a12b6dbb Hide disabled pagination links 2013-09-05 22:01:15 +02:00
876bb3af42 Remove on login and home views useless link "back to home" 2013-09-03 23:56:37 +02:00
7f9f5281e5 Add number of results next to pager 2013-08-28 21:23:26 +02:00
3eb049036e Add warning message when there is no entry in current view 2013-08-27 16:03:50 +02:00
093f1efb21 Update comment 2013-08-27 16:03:50 +02:00
7d1778bbd2 config file for tldp.org 2013-08-27 12:52:35 +02:00
5ebf6eeca1 add configuration to parse bfmtv.com 2013-08-27 11:05:57 +02:00
6fb4600334 fix bug #186: content was empty when enabling downloading pictures 2013-08-26 17:38:01 +02:00
b6b36e1b5a fix bug #182: Wrong title on favorites and archives pages 2013-08-26 17:18:08 +02:00
c51be6b697 Merge pull request #181 from inthepoche/dev
beta4
2013-08-25 12:12:53 -07:00
063fc1a7ba changelog in update 2013-08-25 21:10:01 +02:00
07a5909d73 Merge branch 'dev' of github.com:inthepoche/poche into dev 2013-08-25 20:10:34 +02:00
ec3972361d poche now uses Full Text RSS to fetch content 2013-08-25 20:10:23 +02:00
fccd59e2e3 fix display message for import 2013-08-25 20:08:07 +02:00
eb16ab407b Merge pull request #180 from NumEricR/externalize-css
Externalize some CSS code
2013-08-25 08:04:51 -07:00
e6ba035911 Add bookmarklet id in config page 2013-08-25 16:57:37 +02:00
8e1ed353bb Externalize top link style 2013-08-25 16:42:04 +02:00
a4990dd294 Externalize bookmarklet style 2013-08-25 16:42:04 +02:00
b4f5c46ab0 doc updated 2013-08-25 13:04:03 +02:00
6fa7d08860 poche compatibility test file 2013-08-25 12:40:16 +02:00
3044b21eb6 title page in article view was wrong 2013-08-25 08:49:21 +02:00
d7e8dd590c links to original article were wrong 2013-08-25 08:43:22 +02:00
b66802446d contributing.md updated 2013-08-25 08:32:58 +02:00
d7c2f0cc47 fix bug #175 IP addresses do not appear in view original 2013-08-25 08:01:18 +02:00
27574abf46 README updated with languages 2013-08-25 08:00:51 +02:00
e6a8dd60af Merge pull request #169 from NumEricR/entries-height
Entries height with short description
2013-08-24 22:44:09 -07:00
1cbd70639c Merge pull request #170 from NumEricR/login-button
Login button
2013-08-24 22:43:16 -07:00
217bacc663 Merge pull request #173 from EliasZ/dev
Graceful error-handling with imports and defining where import files are stored
2013-08-24 22:42:37 -07:00
83954e711d Merge pull request #174 from nicofrand/dev
Add support for URLS with digits
2013-08-24 22:36:26 -07:00
149df445d6 Add IPv4 url support (and others beginning by a digit) 2013-08-24 16:50:28 +02:00
38b95e7be9 Add IPv4 url support (and others beginning by a digit) 2013-08-24 16:31:22 +02:00
db4767e22b config template its import section reflects defines 2013-08-24 16:03:49 +02:00
66b6a3b5e2 graceful error-handling with imports, define where import files are stored 2013-08-24 15:59:51 +02:00
7374ff30ef Add IPv4 url support (and others beginning by a digit) 2013-08-24 11:10:07 +02:00
06cf8fb963 Fix login button wording 2013-08-24 10:27:33 +02:00
6a7d779024 Fix issue on entries' height 2013-08-24 09:56:59 +02:00
5ae45084dc CSS clean up again 2013-08-24 09:53:02 +02:00
38b418b7d6 resolve conflicts 2013-08-23 23:18:36 +02:00
fa5f9764ae Add SHAARLI support to view template 2013-08-23 23:11:34 +02:00
fd99a8c02d Revert "Add SHAARLI support to view template"
This reverts commit 0269cd8213.
2013-08-23 23:09:43 +02:00
0269cd8213 Add SHAARLI support to view template 2013-08-23 23:05:45 +02:00
d29b3e5f9e changes in md files 2013-08-23 23:04:56 +02:00
cb844c4238 Restore config modifications related to #162 2013-08-23 22:52:37 +02:00
679b6b85ad preparing to beta4 2013-08-23 22:43:16 +02:00
258d7032bb Clean up the templates markup 2013-08-23 22:38:14 +02:00
6d7defc87c new messages when update / install 2013-08-23 22:24:41 +02:00
b548b2192c Clean markup 2013-08-23 22:24:11 +02:00
f3e4f109a3 Revert "Clean markup in templates"
This reverts commit 8413a63f7d.
2013-08-23 22:23:55 +02:00
8413a63f7d Clean markup in templates 2013-08-23 22:20:04 +02:00
76beb27135 new default content in poche.sqlite 2013-08-23 22:12:37 +02:00
12c9c72984 text in shaarli link 2013-08-23 22:05:14 +02:00
cf9e886076 encode url to share with twitter / email / shaarli 2013-08-23 22:04:09 +02:00
3008e36a3e fix bug #162 links to firefox / chrome / android apps 2013-08-23 22:01:17 +02:00
b64a882696 notice with poche_version undefined' 2013-08-23 21:30:55 +02:00
8be8c44596 gitignore 2013-08-23 21:17:41 +02:00
b48fd706b7 assets directory 2013-08-23 21:16:37 +02:00
d9afe1abd7 Merge branch 'dev' of github.com:inthepoche/poche into dev 2013-08-23 21:15:39 +02:00
70c39d1618 tabs2spaces 2013-08-23 21:07:32 +02:00
ffc966d72f fix bug #151: HTML entities in titles are encoded twice 2013-08-23 21:06:45 +02:00
1e0f9166cc set shaarli to false 2013-08-23 19:49:17 +02:00
c2618ca791 Merge pull request #163 from NumEricR/tools-list
Improve tools list code
2013-08-23 10:42:31 -07:00
4b4afc7322 Add textual content on tools links 2013-08-23 18:45:34 +02:00
8340fedd64 fix bug #150 Add support of text files by setting a default title 2013-08-23 18:29:36 +02:00
b194cf21dc fix bug #147 add db directory in versionning 2013-08-23 18:19:47 +02:00
29773c9729 Fix HTML code of tools lists 2013-08-23 18:10:42 +02:00
fd21828080 updated german translation, thanks to HLFH 2013-08-23 17:43:49 +02:00
a458cff25e Merge pull request #159 from NumEricR/css-cleanup
CSS clean up on style.css file
2013-08-23 08:34:58 -07:00
e93c7c9c46 Merge pull request #160 from nicofrand/dev
Add a print stylesheet
2013-08-23 08:32:03 -07:00
00e4700abb Fix #157 2013-08-23 13:45:46 +02:00
096fb74bf1 CSS clean up on style.css file
Syntax homogenization (spaces, lowercase for hexa, ...)
Code refactoring
Simplification of some selectors
Simplification of "0px" and hexa values
More detailed font stack
Add cursor pointer on ".bouton" elements
2013-08-23 12:12:05 +02:00
64fa45e262 Merge pull request #154 from nicofrand/dev
poche won't import the content of some articles
2013-08-22 23:09:46 -07:00
57c91e427d Merge branch 'dev' of https://github.com/nicofrand/poche into dev 2013-08-22 00:57:11 +02:00
2bf93dc034 Fix #149 2013-08-22 00:49:23 +02:00
746f93c290 fix bug #148 Use of undefined constant POCHE_VERSION 2013-08-20 11:23:32 +02:00
38330bfd65 fix bug #112 link to shaarli 2013-08-20 11:23:00 +02:00
2fdcbd1ac3 typo in gitignore 2013-08-17 21:27:14 +02:00
8d52e6b4e3 Merge branch 'dev' of github.com:inthepoche/poche into dev 2013-08-17 21:26:11 +02:00
e8d1f1e5f0 gitignore 2013-08-17 21:25:53 +02:00
7ba37bd91a Merge pull request #141 from inthepoche/dev
beta3
2013-08-17 11:27:13 -07:00
9067b484ce Merge pull request #140 from inthepoche/master
beta3
2013-08-17 11:23:21 -07:00
c3df0ebdc2 typo 2013-08-16 21:21:25 +02:00
abed0f2122 some precisons in updating poche 2013-08-16 20:40:31 +02:00
12c4098773 rename german folder & files 2013-08-16 20:21:12 +02:00
bb5a7d9ede updating script 2013-08-16 20:19:31 +02:00
1c9cd3463b spanish language, thanks to Nitche 2013-08-16 20:18:11 +02:00
6bc2da5191 ignore myconfig.inc.php in git 2013-08-16 20:17:16 +02:00
042b590606 german language 2013-08-15 20:00:02 +02:00
0b05568c9f fix #138: change pattern to parse url with # 2013-08-15 11:46:40 +02:00
2021fc614e close #137 : Mixed content alert in HTTPS 2013-08-15 11:31:28 +02:00
c0d321c1bf #136 error during readability import 2013-08-15 11:29:28 +02:00
20ced8a806 contributing file 2013-08-15 11:03:36 +02:00
b448a9214c fix #130 : disallow robots 2013-08-15 10:58:25 +02:00
4a2912880f more verif while installing 2013-08-15 10:54:14 +02:00
ca1b0a1a6f install 2013-08-12 19:02:36 +02:00
86848edc84 upgrading README 2013-08-12 18:17:13 +02:00
f93aaa65c4 how installing poche 2013-08-12 18:11:56 +02:00
cd03b575df error msg when install folder exists 2013-08-12 14:27:51 +02:00
667009727a Merge pull request #132 from inthepoche/dev
merge with beta2
2013-08-12 05:14:04 -07:00
6a9e4bfc90 version number 2013-08-11 21:04:04 +02:00
15493df62d fixed #114 : minimum & maximum scale removed 2013-08-11 19:42:52 +02:00
82051a6a6a fixed #128: back to home after mark a link as read is fixed 2013-08-11 19:10:48 +02:00
5bf30b0060 layout 2013-08-10 22:17:00 +02:00
baea9b6de5 new logo 2013-08-10 21:39:11 +02:00
fa0483b361 closed #120: top link 2013-08-10 12:21:36 +02:00
b58e261db9 bug in downloading pictures : article content wasn't updated anymore 2013-08-09 23:30:20 +02:00
d8d1542e52 typo 2013-08-09 22:15:40 +02:00
56ab22d02c only display latest dev version if DEBUG is on 2013-08-09 13:05:35 +02:00
6c15854448 Closed #111 : test of install folder moved before 2013-08-09 11:47:37 +02:00
d91787589b fix #113 - reading time 2013-08-09 08:25:16 +02:00
3d8bded89e debug false 2013-08-08 21:28:37 +02:00
5f9bff0f71 some urls weren't well parsed 2013-08-08 21:13:37 +02:00
301e4c5acb installation 2013-08-08 18:41:40 +02:00
82757801b9 installation 2013-08-08 18:40:55 +02:00
9a8b4ff4ed Merge pull request #109 from inthepoche/dev
merge dev into master
2013-08-08 09:36:10 -07:00
572e758bf2 empty phpunit file 2013-08-08 14:07:43 +02:00
64f8970215 travis img 2013-08-08 13:50:53 +02:00
a3436d4cba travis 2013-08-08 13:49:57 +02:00
07ee09f49a comments 2013-08-08 12:33:02 +02:00
25b5caeed1 ignore doc output 2013-08-08 09:57:18 +02:00
313f4ca785 ignore doc output 2013-08-08 09:55:04 +02:00
ed06f04077 test if /install exists 2013-08-08 09:11:12 +02:00
7aa8ccc47d preparing travis 2013-08-08 07:16:07 +02:00
04b55e97de populate user_config 2013-08-07 21:16:12 +02:00
76e9ca2acf good version of poche.sqlite 2013-08-07 21:00:06 +02:00
77dea8a234 1.0 beta1 2013-08-07 20:05:14 +02:00
01c0e050ad Merge pull request #104 from inthepoche/twig
Twig version on dev branch
2013-08-07 10:41:26 -07:00
339d510fda installation instructions 2013-08-07 19:33:56 +02:00
6e5f8db8bb installation instructions 2013-08-07 19:33:13 +02:00
145f50402e installation instructions 2013-08-07 19:31:11 +02:00
1d517de67b installation instructions 2013-08-07 19:23:00 +02:00
c7ec97ce98 cache to FALSE 2013-08-07 19:14:48 +02:00
b916bcfccc fixes for 1.0-beta 2013-08-07 19:14:28 +02:00
580d60b941 file to update from 0.x to 1.x \o/ 2013-08-07 15:46:17 +02:00
68857cea8c setup of storage 2013-08-07 14:38:58 +02:00
bc1ee8524e postgres 2013-08-07 14:24:07 +02:00
8d3275bee4 multi user 2013-08-06 15:51:48 +02:00
7ce7ec4c94 prepare to multi users 2013-08-06 14:18:03 +02:00
17a9cb9608 minify bookmarklet js 2013-08-06 11:00:42 +02:00
f6df40db46 default sorting 2013-08-05 23:11:10 +02:00
6fb3a2a185 move xsrf test 2013-08-05 22:50:00 +02:00
d28a7ca30f remove js 2013-08-05 21:59:21 +02:00
6a361945ea new design, pagination & more 2013-08-05 21:56:32 +02:00
55821e04c1 share email +twitter / class messages 2013-08-05 15:54:37 +02:00
b161295d0b remove xsrf check 2013-08-05 12:53:56 +02:00
4d0e254491 link to download poche when update available 2013-08-05 12:39:24 +02:00
3252078501 close #69: in the config page, you are notified of the release of a new version 2013-08-05 12:34:16 +02:00
21e0af98eb information about db/poche.sqlite 2013-08-05 10:34:57 +02:00
7f959169b7 copy of poche.sqlite 2013-08-05 10:32:15 +02:00
e4ed594d82 rm poche.sqlite 2013-08-05 10:29:49 +02:00
a12832488d update poche.sqlite 2013-08-05 10:03:59 +02:00
a62788c61e #100: welcome to you, instapaper users 2013-08-05 09:43:33 +02:00
3208d538a7 mysql support 2013-08-05 08:54:42 +02:00
2a1791a4b1 view of an article 2013-08-04 22:51:12 +02:00
63c35580c7 twig implementation 2013-08-04 22:35:08 +02:00
c765c3679f import in poche and not in an external file 2013-08-04 21:42:46 +02:00
eb1af59219 refactoring 2013-08-04 20:58:31 +02:00
3ba5f81b7b twig implementation 2013-08-04 18:07:41 +02:00
07b9821e24 composer 2013-08-04 18:03:30 +02:00
15771f4452 gitignore 2013-08-04 18:02:29 +02:00
3dcab1a782 rm composer.phar 2013-08-04 17:51:33 +02:00
46b77928f7 rm vendor 2013-08-04 17:50:34 +02:00
68abd9c71b gitignore vendor 2013-08-04 17:44:17 +02:00
d51ecb6ea8 ignore vendor 2013-08-04 17:35:02 +02:00
7d2eb7a7b9 composer 2013-08-03 20:47:17 +02:00
4f5b44bd3b twig implementation 2013-08-03 19:26:54 +02:00
2b840e0cfb twig implementation 2013-08-03 08:57:35 +02:00
8cbb2a8802 twig implementation 2013-08-03 08:25:11 +02:00
c67e13e04b new tpl files 2013-08-03 08:24:42 +02:00
afe60d614b remove file 2013-08-03 08:05:02 +02:00
161395d709 mv pochetool pochetools 2013-08-02 23:04:24 +02:00
5ffe5cf541 rename pocheTool -> pocheTools 2013-08-02 23:00:57 +02:00
8069e235fd move Twig in 3rdparty 2013-08-02 22:43:56 +02:00
45161a6402 delete some files 2013-08-02 22:41:21 +02:00
a4565e88ed add Twig & refactor poche 2013-08-02 22:40:51 +02:00
f6c9baab3e rename myTool -> pocheTool and delete some stuff 2013-08-02 21:40:29 +02:00
da2c5d6fc3 display URL at home poche 2013-08-02 13:51:22 +02:00
408f3df28e URL is now encoded 2013-08-02 11:48:57 +02:00
2ee436eaa1 poche / pocket / bolsillo / Tasche & more 2013-08-02 10:39:03 +02:00
02ea9f0769 first test for readability import 2013-08-01 18:34:50 +02:00
99dd7d3877 testing icon in bookmarklet, thanks to @GeekShadow in #94 2013-08-01 11:00:27 +02:00
4d8bcc0c6b set demo mode to false 2013-07-31 19:58:14 +02:00
538cdfa883 fix #70: if demo mode, fields are filled 2013-07-31 19:37:14 +02:00
70b5d24f72 fix #80: add a link in the footer to report a wrong display 2013-07-31 19:21:49 +02:00
3db95a85de update external libs 2013-07-31 19:09:06 +02:00
95a7596cb4 fix #92: add a link to the top 2013-07-31 19:03:02 +02:00
85ebc80c7e Merge branch 'dev' 2013-07-31 17:19:50 +02:00
6588517b2d typo in readme 2013-07-31 11:51:24 +02:00
6d37de5f82 typo in readme 2013-07-31 11:50:38 +02:00
9c902708da google groups link 2013-07-31 11:49:25 +02:00
66ce09ba03 google groups link 2013-07-31 11:45:10 +02:00
6499b26ae8 demo mode (you can't update password in demo mode 2013-06-01 08:29:37 +02:00
da368cc84f update password in config screen 2013-06-01 08:23:37 +02:00
aa8c9f2a32 Installation mode 2013-05-31 22:55:52 +02:00
baa8617364 update JSLikeHTMLElement 2013-04-24 08:27:55 +02:00
494e21b4da add tidy call to clean html output 2013-04-23 16:03:52 +02:00
0ace6cab0b Fix #47 - update Readability class (thx to http://code.fivefilters.org/php-readability/) 2013-04-23 15:57:23 +02:00
c1c9f252f7 display flash message in article view 2013-04-23 15:37:03 +02:00
2987031bc3 Fixed #73 - Can't Poch url with special caracter 2013-04-23 15:25:12 +02:00
3e7188185d Merge branch 'memiks-gestion_erreur_readability' into dev 2013-04-23 15:19:33 +02:00
8d5aab49c1 lien corrigé dans le README 2013-04-23 15:18:22 +02:00
cdcc8d2533 Remove debug on Readability output 2013-04-23 08:09:54 -05:00
ae9571694f Correction erreur sur le Self 2013-04-23 07:29:16 -05:00
4ddbd26787 Ajout du global msg et gestion du retour dans Readability 2013-04-23 07:22:19 -05:00
8444bb0600 Merge branch 'master' of github.com:inthepoche/poche 2013-04-23 09:40:35 +02:00
29c6fd4607 messages d'erreur si pas possible d'ajouter ou de supprimer un lien 2013-04-23 09:38:57 +02:00
37f2773aa5 Merge pull request #74 from inthepoche/dev
v0.2.1
2013-04-22 23:34:55 -07:00
e682978e5b Revert "Update style.css"
This reverts commit 176d733a44.
2013-04-23 08:30:48 +02:00
176d733a44 Update style.css
coquille pour l'affichage des liens sur la page view
2013-04-22 19:57:40 +03:00
37c6ed4e7a Merge pull request #67 from inthepoche/dev
tag 0.2
2013-04-21 10:53:22 -07:00
675 changed files with 183074 additions and 6385 deletions

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"
}
}

14
.editorconfig Normal file
View File

@ -0,0 +1,14 @@
; 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
[*.css]
indent_style = space
indent_size = 2

10
.eslintrc.json Normal file
View File

@ -0,0 +1,10 @@
{
"extends": "airbnb-base",
"parser": "babel-eslint",
"env": {
"browser": 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/master/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 http://gitter.im/wallabag/wallabag.
### 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).

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

@ -0,0 +1,16 @@
| 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
| Fixed tickets | #...
| License | MIT
<!--
- 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.
-->

52
.gitignore vendored Normal file
View File

@ -0,0 +1,52 @@
# 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
# Parameters
/app/config/parameters.yml
# Managed by Composer
/vendor/
# Assets and user uploads
web/uploads/
!web/bundles
web/bundles/*
!web/bundles/wallabagcore
# Build
/app/build
/build
# Composer PHAR
/composer.phar
# Data for wallabag
data/assets/*
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/*

28
.scrutinizer.yml Normal file
View File

@ -0,0 +1,28 @@
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

3
.stylelintrc Normal file
View File

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

80
.travis.yml Normal file
View File

@ -0,0 +1,80 @@
language: php
services:
- rabbitmq
- redis
# faster builds on docker-container setup
sudo: false
# used for HHVM
addons:
apt:
packages:
- tidy
# cache vendor dirs
cache:
apt: true
directories:
- vendor
- $HOME/.composer/cache
- node_modules
- $HOME/.cache/bower
- $HOME/.npm
php:
- 5.5
- 5.6
- 7.0
- 7.1
- 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: 7.1
- php: nightly
# exclude v1 branches
branches:
except:
- legacy
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
- if [[ $PHP = 5.5 ]]; then composer require "phpunit/phpunit:4.*" --no-update; fi;
- composer self-update --no-progress
- if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi;
install:
- if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.7; fi;
- if [[ $ASSETS = build ]]; then npm install -g npm@latest; fi;
- if [[ $ASSETS = build ]]; then npm install; fi;
before_install:
- if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
script:
- travis_wait composer update --no-interaction --no-progress
- ant prepare-$DB
- if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then phpunit -v ; fi;
- if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix src/ --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 app/Resources/FOSUserBundle/translations -v ; fi;
- if [[ $ASSETS = build ]]; then ./node_modules/grunt-cli/bin/grunt tests; 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

476
CHANGELOG.md Normal file
View File

@ -0,0 +1,476 @@
## Changelog
### 2.1.4 2016/11/18
- [#2550](https://github.com/wallabag/wallabag/pull/2550) Reordered documentation (@jlnostr, @nicosomb)
- [#2578](https://github.com/wallabag/wallabag/pull/2578) Added help on config screen (@nicosomb)
- [#2570](https://github.com/wallabag/wallabag/pull/2570) Added creation date on entries view (@nicosomb)
- [#2587](https://github.com/wallabag/wallabag/pull/2587) User-agents have moved to site-config (@j0k3r)
- [#2584](https://github.com/wallabag/wallabag/pull/2584) fix #2582 - Documentation, Nginx config: disable all other PHP file from symphony (@blankoworld)
- [#2577](https://github.com/wallabag/wallabag/pull/2577) Added tooltips in header bar (@nicosomb)
- [#2562](https://github.com/wallabag/wallabag/pull/2562) Bigger image preview in case of only image content (@j0k3r)
- [#2571](https://github.com/wallabag/wallabag/pull/2571) Changed behavior when we change language (@nicosomb)
- [#2565](https://github.com/wallabag/wallabag/pull/2565) Removed support website on about page (@nicosomb)
- [#2563](https://github.com/wallabag/wallabag/pull/2563) Improve PR template (@j0k3r)
- [#2561](https://github.com/wallabag/wallabag/pull/2561) fix #2559 (@Rurik19)
- [#2555](https://github.com/wallabag/wallabag/pull/2555) Reorder variable assignation in update.sh script, fix #2554 (@dkrmr)
- [#2556](https://github.com/wallabag/wallabag/pull/2556) Replaced TokenStorage with TokenStorageInterface (@nicosomb)
- [#2552](https://github.com/wallabag/wallabag/pull/2552) Round readingtime to avoid crazy number (@j0k3r)
- [#2546](https://github.com/wallabag/wallabag/pull/2546) Updated default parameters.yml file in documentation (@nicosomb)
- [#2545](https://github.com/wallabag/wallabag/pull/2545) Update the upgrade documentation (@nicosomb)
### 2.1.3 2016/11/04
- [#2536](https://github.com/wallabag/wallabag/pull/2536) Prepare wallabag 2.1.3 :rocket: (@nicosomb)
- [#2460](https://github.com/wallabag/wallabag/pull/2460) UI Changes (@tcitworld, @j0k3r)
- [#2534](https://github.com/wallabag/wallabag/pull/2534) Use created_at as default sort (@j0k3r)
- [#2530](https://github.com/wallabag/wallabag/pull/2530) Added documentation about failed to load external entity error (@j0k3r, @Strubbl, @nicosomb)
- [#2519](https://github.com/wallabag/wallabag/pull/2519) Translation update - French (@j0k3r, @Jibec)
- [#2528](https://github.com/wallabag/wallabag/pull/2528) Force user-agent for .slashdot.org (@Kdecherf)
- [#2524](https://github.com/wallabag/wallabag/pull/2524) Add Instapaper to CLI import (@lologhi)
- [#2521](https://github.com/wallabag/wallabag/pull/2521) fix path for the install scripts (@foxmask)
- [#2520](https://github.com/wallabag/wallabag/pull/2520) Inject parameter instead of service (@j0k3r)
- [#2518](https://github.com/wallabag/wallabag/pull/2518) docs: fix link to wallabag-stats project (@Strubbl)
- [#2514](https://github.com/wallabag/wallabag/pull/2514) docs: update 3rd party projects by Strubbl (@Strubbl)
- [#2513](https://github.com/wallabag/wallabag/pull/2513) Updated Capistrano configuration (@nicosomb)
- [#2506](https://github.com/wallabag/wallabag/pull/2506) Fixed entries export filtered with a tag (@nicosomb)
- [#2509](https://github.com/wallabag/wallabag/pull/2509) Exploded WallabagRestController into many controllers (@nicosomb)
- [#2508](https://github.com/wallabag/wallabag/pull/2508) Added the whole path to parameters.yml file (@nicosomb)
- [#2507](https://github.com/wallabag/wallabag/pull/2507) Added require.sh to check if composer is installed (@nicosomb)
- [#2500](https://github.com/wallabag/wallabag/pull/2500) Added a check in Makefile to see if composer is installed (@nicosomb)
- [#2504](https://github.com/wallabag/wallabag/pull/2504) Added tag label in the page title (@nicosomb)
- [#2473](https://github.com/wallabag/wallabag/pull/2473) Portuguese (Brazilian) translation (@pmichelazzo, @j0k3r, @nicosomb, @Quent-in, @danbartram, @even-allmighty, @Strubbl, @tcitworld, @benages, @Simounet, @charno6, @Rurik19, @bmillemathias, @cstuder, @egilli, @pmartin)
- [#2493](https://github.com/wallabag/wallabag/pull/2493) Add relevant links to fetch content error page (@nicosomb, @bmillemathias)
- [#2486](https://github.com/wallabag/wallabag/pull/2486) Added :fr: documentation for wallabag backup (@jlnostr, @nicosomb)
- [#2484](https://github.com/wallabag/wallabag/pull/2484) Document what to backup in Wallabag (@bmillemathias)
- [#2485](https://github.com/wallabag/wallabag/pull/2485) Fix missing words in Android application documentation (@bmillemathias)
- [#2481](https://github.com/wallabag/wallabag/pull/2481) Some fixes (@j0k3r)
- [#2482](https://github.com/wallabag/wallabag/pull/2482) If reload content failed, dont update it (@j0k3r)
- [#2467](https://github.com/wallabag/wallabag/pull/2467) Update wallabag version for master branch (@nicosomb)
- [#2466](https://github.com/wallabag/wallabag/pull/2466) Removed MD5 hash in documentation (@nicosomb)
### 2.1.2 2016/10/17
- [#2452](https://github.com/wallabag/wallabag/pull/2452) Prepare wallabag 2.1.2 :rocket: (@nicosomb)
- [#2464](https://github.com/wallabag/wallabag/pull/2464) Fixed hardcoded title for internal settings (@nicosomb)
- [#2455](https://github.com/wallabag/wallabag/pull/2455) Fix tabs on material (@tcitworld)
- [#2454](https://github.com/wallabag/wallabag/pull/2454) Fix baggy display on small screens (@tcitworld)
- [#2459](https://github.com/wallabag/wallabag/pull/2459) German: improve existing and add missing translation (@Strubbl)
- [#2457](https://github.com/wallabag/wallabag/pull/2457) add link to German documentation in about page (@Strubbl)
- [#2451](https://github.com/wallabag/wallabag/pull/2451) Bring make dev (@tcitworld)
- [#2450](https://github.com/wallabag/wallabag/pull/2450) View improvements (@tcitworld)
- [#2412](https://github.com/wallabag/wallabag/pull/2412) Fix PostgreSQL migrations (@j0k3r)
- [#2446](https://github.com/wallabag/wallabag/pull/2446) Added information about tagging rules in documentation (@Strubbl, @nicosomb)
- [#2447](https://github.com/wallabag/wallabag/pull/2447) Fixed french and german doc homepages (@nicosomb)
- [#2444](https://github.com/wallabag/wallabag/pull/2444) Mention example instance in docs (@Kaligule)
- [#1](https://github.com/wallabag/wallabag/pull/1) Mention example instance (@Kaligule)
- [#2435](https://github.com/wallabag/wallabag/pull/2435) Added french documentation for upgrade (@nicosomb, @Strubbl)
- [#2434](https://github.com/wallabag/wallabag/pull/2434) Added french documentation for parameters.yml (@Strubbl, @nicosomb)
- [#2439](https://github.com/wallabag/wallabag/pull/2439) Minor fixes in the english documentation (@zertrin)
- [#2432](https://github.com/wallabag/wallabag/pull/2432) Update ISSUE_TEMPLATE.md (@j0k3r)
- [#2429](https://github.com/wallabag/wallabag/pull/2429) Lock deps for FOSUser (@j0k3r)
- [#2422](https://github.com/wallabag/wallabag/pull/2422) Fixed display for note in installation page (@nicosomb)
- [#2426](https://github.com/wallabag/wallabag/pull/2426) Fix links on english documentation homepage (@nicosomb)
- [#2420](https://github.com/wallabag/wallabag/pull/2420) Avoid error when Redis isn't here in tests (@j0k3r)
- [#2403](https://github.com/wallabag/wallabag/pull/2403) Cleaned up documentation for installation process (@nicosomb, @j0k3r, @Strubbl)
- [#2419](https://github.com/wallabag/wallabag/pull/2419) Fixed Twitter Cards by adding a description tag (@nicosomb)
- [#2418](https://github.com/wallabag/wallabag/pull/2418) Added support of Twitter Cards for public articles (@nicosomb)
- [#2417](https://github.com/wallabag/wallabag/pull/2417) Define a dev version for the master (@j0k3r)
- [#2411](https://github.com/wallabag/wallabag/pull/2411) Fix entities definition (@j0k3r)
- [#2414](https://github.com/wallabag/wallabag/pull/2414) Remove automatic closing of the window from bookmarklet (@szafranek)
- [#2413](https://github.com/wallabag/wallabag/pull/2413) When a sub command fail, display error message (@j0k3r)
- [#2410](https://github.com/wallabag/wallabag/pull/2410) Optimize tag list display (@j0k3r)
- [#2406](https://github.com/wallabag/wallabag/pull/2406) Show number of annotations instead of nbAnnotations placeholder (@szafranek)
- [#2405](https://github.com/wallabag/wallabag/pull/2405) Fix few invalid HTML tags (@szafranek)
- [#2402](https://github.com/wallabag/wallabag/pull/2402) Removed 1.x stuff in CHANGELOG (@nicosomb)
- [#2351](https://github.com/wallabag/wallabag/pull/2351) Changed relation between API client and refresh token (@j0k3r, @nicosomb)
- [#2393](https://github.com/wallabag/wallabag/pull/2393) Ability to check multiple urls in API (@j0k3r)
- [#2397](https://github.com/wallabag/wallabag/pull/2397) Ensure orphan tag are remove in API (@j0k3r)
- [#2399](https://github.com/wallabag/wallabag/pull/2399) Use default locale for user config (@j0k3r)
- [#2400](https://github.com/wallabag/wallabag/pull/2400) Set env to prod in documentation (@j0k3r)
- [#2396](https://github.com/wallabag/wallabag/pull/2396) Update messages.pl.yml (@mruminski)
- [#2395](https://github.com/wallabag/wallabag/pull/2395) Add ability to use socket (@j0k3r)
- [#2386](https://github.com/wallabag/wallabag/pull/2386) Changed Changelog by using github-changelog-generator from @skywinder (@nicosomb)
- [#2389](https://github.com/wallabag/wallabag/pull/2389) Added default picture if preview picture is null (@nicosomb)
- [#2388](https://github.com/wallabag/wallabag/pull/2388) Fixed two-factor checkbox display in user admin panel (@nicosomb)
- [#2385](https://github.com/wallabag/wallabag/pull/2385) Added documentation about siteconfig fix (@nicosomb)
- [#2383](https://github.com/wallabag/wallabag/pull/2383) Added OpenGraph support for public articles (@nicosomb)
- [#2332](https://github.com/wallabag/wallabag/pull/2332) Fix relations export for Entry (@j0k3r)
- [#2377](https://github.com/wallabag/wallabag/pull/2377) Fix exists API call (@j0k3r, @tcitworld)
- [#2374](https://github.com/wallabag/wallabag/pull/2374) Clickable tags (@tcitworld)
- [#2375](https://github.com/wallabag/wallabag/pull/2375) try to reduce assets build npm connection failing by updating nodejs (@tcitworld)
- [#2363](https://github.com/wallabag/wallabag/pull/2363) Remove mouf/nodejs-installer from composer (@j0k3r)
### 2.1.1 2016/10/04
- [#2349](https://github.com/wallabag/wallabag/pull/2349) Prepare wallabag 2.1.1 (@nicosomb, @j0k3r)
- [#2353](https://github.com/wallabag/wallabag/pull/2353) Basically, fix everything (@tcitworld, @nicosomb, @j0k3r)
- [#2359](https://github.com/wallabag/wallabag/pull/2359) Create config even if user is disabled (@j0k3r)
- [#2354](https://github.com/wallabag/wallabag/pull/2354) Add php-bcmath extension to requirements (@Zayon)
- [#2341](https://github.com/wallabag/wallabag/pull/2341) Update messages.pl.yml (@mruminski)
- [#2340](https://github.com/wallabag/wallabag/pull/2340) small improvement for german translation (@Strubbl)
- [#2338](https://github.com/wallabag/wallabag/pull/2338) Fix for 2.1 installation (@j0k3r)
### 2.1.0 2016/10/03
- [#2334](https://github.com/wallabag/wallabag/pull/2334) Prepare wallabag 2.1.0 :rocket: (@nicosomb)
- [#2335](https://github.com/wallabag/wallabag/pull/2335) Fixed CSS for quickstart links (@nicosomb)
- [#2333](https://github.com/wallabag/wallabag/pull/2333) for 2.1, translate all strings to German, which haven't been translated yet (@j0k3r, @nicosomb, @jlnostr, @Strubbl)
- [#2314](https://github.com/wallabag/wallabag/pull/2314) Assets work (@tcitworld)
- [#2331](https://github.com/wallabag/wallabag/pull/2331) Fix parameters in API _links (@j0k3r)
- [#2327](https://github.com/wallabag/wallabag/pull/2327) Add users management UI (@j0k3r)
- [#2330](https://github.com/wallabag/wallabag/pull/2330) Remove error message when creating ePub versions (@pmichelazzo)
- [#2325](https://github.com/wallabag/wallabag/pull/2325) Add an exists endpoint in API (@j0k3r)
- [#2328](https://github.com/wallabag/wallabag/pull/2328) Avoid duplicate url with accents (@j0k3r)
- [#2326](https://github.com/wallabag/wallabag/pull/2326) Changed quickstart layout (@j0k3r, @nicosomb)
- [#2324](https://github.com/wallabag/wallabag/pull/2324) Add ability to edit a tagging rule (@j0k3r)
- [#2323](https://github.com/wallabag/wallabag/pull/2323) Add simple stats in footer (@j0k3r)
- [#2329](https://github.com/wallabag/wallabag/pull/2329) Occitan version update (@j0k3r, @Quent-in)
- [#2322](https://github.com/wallabag/wallabag/pull/2322) Customize errors templates (@j0k3r)
- [#2320](https://github.com/wallabag/wallabag/pull/2320) Create user config in one place. (@j0k3r)
- [#2319](https://github.com/wallabag/wallabag/pull/2319) Docker : install PHP 'gd' extension (@pmartin)
- [#2318](https://github.com/wallabag/wallabag/pull/2318) Removed duplicated templates files (@nicosomb)
- [#2315](https://github.com/wallabag/wallabag/pull/2315) Fixes about upgrade (@nicosomb, @Strubbl, @jlnostr)
- [#2316](https://github.com/wallabag/wallabag/pull/2316) Update messages.pl.yml (@mruminski)
- [#2313](https://github.com/wallabag/wallabag/pull/2313) Remove CSS class who caused long loading on Firefox (@nicosomb)
- [#2309](https://github.com/wallabag/wallabag/pull/2309) Update messages.pl.yml (@mruminski)
- [#2192](https://github.com/wallabag/wallabag/pull/2192) Import Firefox & Chrome bookmarks into wallabag (@nicosomb, @j0k3r, @tcitworld)
- [#2308](https://github.com/wallabag/wallabag/pull/2308) Fix duplicate tags on import (@j0k3r)
- [#2306](https://github.com/wallabag/wallabag/pull/2306) Some checks about Redis & RabbitMQ (@j0k3r)
- [#2301](https://github.com/wallabag/wallabag/pull/2301) fix feeds not syncing on android app (@tcitworld, @nicosomb, @Quent-in, @j0k3r, @danbartram, @even-allmighty, @Strubbl, @benages, @Simounet, @charno6, @Rurik19, @bmillemathias, @cstuder, @egilli)
- [#2239](https://github.com/wallabag/wallabag/pull/2239) Update documentation with new features for 2.1 (@nicosomb)
- [#2299](https://github.com/wallabag/wallabag/pull/2299) polish version (@mruminski)
- [#2297](https://github.com/wallabag/wallabag/pull/2297) Fix issue #2296: epub export with special chars in the title. (@egilli)
- [#1941](https://github.com/wallabag/wallabag/pull/1941) Use asynchronous jobs for imports (@j0k3r, @nicosomb)
- [#2292](https://github.com/wallabag/wallabag/pull/2292) Fixed label for mark as read link in entry view (@nicosomb)
- [#2291](https://github.com/wallabag/wallabag/pull/2291) Add links to translations in documentation homepage (@nicosomb)
- [#2287](https://github.com/wallabag/wallabag/pull/2287) Remove footer part (@nicosomb)
- [#2290](https://github.com/wallabag/wallabag/pull/2290) Update messages.oc.yml (@Quent-in)
- [#2279](https://github.com/wallabag/wallabag/pull/2279) Check if asset is enable instead of opposite (@j0k3r)
- [#2275](https://github.com/wallabag/wallabag/pull/2275) Export dates from entries (@j0k3r)
- [#2274](https://github.com/wallabag/wallabag/pull/2274) Re-use JsonResponse (@j0k3r)
### 2.0.8 2016/09/07
- [#2271](https://github.com/wallabag/wallabag/pull/2271) Prepare wallabag 2.0.8 (@nicosomb)
- [#2266](https://github.com/wallabag/wallabag/pull/2266) Added tags counter in sidebar (material theme) (@nicosomb)
- [#2267](https://github.com/wallabag/wallabag/pull/2267) Occitan updated (@Quent-in)
- [#2263](https://github.com/wallabag/wallabag/pull/2263) Instead of selecting the whole data, just count it (@j0k3r)
- [#2002](https://github.com/wallabag/wallabag/pull/2002) Feature display items number (@nicosomb)
- [#2262](https://github.com/wallabag/wallabag/pull/2262) Add a check for the database connection (@j0k3r)
- [#2260](https://github.com/wallabag/wallabag/pull/2260) Fixed different font-size for labels in config screen (@nicosomb)
- [#2252](https://github.com/wallabag/wallabag/pull/2252) Fixed last merge who caused CSS/JS bugs (@j0k3r, @nicosomb)
- [#2242](https://github.com/wallabag/wallabag/pull/2242) Fix print / article views (@nicosomb)
- [#2258](https://github.com/wallabag/wallabag/pull/2258) Update messages.pl.yml (@mruminski)
- [#2255](https://github.com/wallabag/wallabag/pull/2255) Add Readability import (@nicosomb, @j0k3r)
- [#2243](https://github.com/wallabag/wallabag/pull/2243) Add untagged entries (@j0k3r, @nicosomb)
- [#2245](https://github.com/wallabag/wallabag/pull/2245) Changed where page title is displayed (@nicosomb)
- [#2240](https://github.com/wallabag/wallabag/pull/2240) Add icon for public share link (@nicosomb)
- [#2241](https://github.com/wallabag/wallabag/pull/2241) Fix issue #1991: correction of the height field to add articles (@modos189)
- [#2238](https://github.com/wallabag/wallabag/pull/2238) V2 improve view (@modos189)
- [#2237](https://github.com/wallabag/wallabag/pull/2237) Add original link in public view of the article (@nicosomb)
- [#1904](https://github.com/wallabag/wallabag/pull/1904) Share entry with a public URL (@j0k3r, @nicosomb)
- [#2236](https://github.com/wallabag/wallabag/pull/2236) Allow failure for PHP 7.1 (@j0k3r)
- [#2186](https://github.com/wallabag/wallabag/pull/2186) Add option to disable registration (@nicosomb, @j0k3r, @tcitworld)
- [#2234](https://github.com/wallabag/wallabag/pull/2234) Fixes mailto link in documentation (@cstuder)
- [#2235](https://github.com/wallabag/wallabag/pull/2235) Add configuration for german documentation (@nicosomb)
- [#2230](https://github.com/wallabag/wallabag/pull/2230) Cut entries title in card view: continued (@bmillemathias)
- [#2218](https://github.com/wallabag/wallabag/pull/2218) Delete tag or tags by label (@j0k3r, @tcitworld, @nicosomb)
### 2.0.7 2016/08/22
- [#2226](https://github.com/wallabag/wallabag/pull/2226) Prepare wallabag 2.0.7 (@nicosomb)
- [#2222](https://github.com/wallabag/wallabag/pull/2222) Added creation date and reading time on article view (@j0k3r, @nicosomb)
- [#2221](https://github.com/wallabag/wallabag/pull/2221) Replaced favorite word/icon with star one (@nicosomb)
- [#2224](https://github.com/wallabag/wallabag/pull/2224) Avoid breaking import when fetching fail (@j0k3r)
- [#2220](https://github.com/wallabag/wallabag/pull/2220) Enable PATCH method for CORS in API part (@Rurik19)
- [#2134](https://github.com/wallabag/wallabag/pull/2134) Run tests on an uptodate HHVM (@j0k3r)
- [#2095](https://github.com/wallabag/wallabag/pull/2095) Fix form user display when 2FA is disabled (@j0k3r, @nicosomb)
- [#2216](https://github.com/wallabag/wallabag/pull/2216) Enable CORS headers for OAUTH part (@Rurik19)
### 2.0.6 2016/08/10
- [#2212](https://github.com/wallabag/wallabag/pull/2212) Prepare release 2.0.6 (@nicosomb)
- [#2202](https://github.com/wallabag/wallabag/pull/2202) add some missing phpdoc parameters (@tcitworld)
- [#2200](https://github.com/wallabag/wallabag/pull/2200) Fixed typo in entry:notice:entry_saved (@charno6)
- [#2199](https://github.com/wallabag/wallabag/pull/2199) Handling socials links into a config file (@Simounet)
- [#2198](https://github.com/wallabag/wallabag/pull/2198) FIX image inside a figure element max-width (@Simounet)
- [#2195](https://github.com/wallabag/wallabag/pull/2195) Remove binary from repo (@j0k3r)
- [#2048](https://github.com/wallabag/wallabag/pull/2048) Run PHP 7.1 on Travis (@j0k3r)
- [#2194](https://github.com/wallabag/wallabag/pull/2194) Fixed spelling Artúclos --> Artículos (@benages)
- [#2183](https://github.com/wallabag/wallabag/pull/2183) Bring tags on entries view to baggy (@tcitworld)
- [#2185](https://github.com/wallabag/wallabag/pull/2185) Fix 3rd-Party Apps links (Chrome & Firefox) (@tcitworld)
- [#2174](https://github.com/wallabag/wallabag/pull/2174) Add filter for tags on API (@tcitworld)
- [#2176](https://github.com/wallabag/wallabag/pull/2176) Add since parameter (@tcitworld)
- [#2170](https://github.com/wallabag/wallabag/pull/2170) Add tags on entries view and minor ui fixes (@tcitworld)
- [#2172](https://github.com/wallabag/wallabag/pull/2172) Change the way to login user in tests (@j0k3r)
- [#2169](https://github.com/wallabag/wallabag/pull/2169) fix font paths (@tcitworld)
- [#2168](https://github.com/wallabag/wallabag/pull/2168) Add modules when NodeJS versions are too low. (@tcitworld)
- [#2157](https://github.com/wallabag/wallabag/pull/2157) Handle only upper or only lower reading filter (@j0k3r)
- [#2165](https://github.com/wallabag/wallabag/pull/2165) Fix a few french translations typos (@tcitworld)
- [#2142](https://github.com/wallabag/wallabag/pull/2142) Manage assets through npm (@tcitworld)
- [#2132](https://github.com/wallabag/wallabag/pull/2132) Jump to Symfony 3.1 (@j0k3r)
- [#2160](https://github.com/wallabag/wallabag/pull/2160) Update symlink to php-cs-fixer (@j0k3r)
- [#2155](https://github.com/wallabag/wallabag/pull/2155) Use friendsofphp instead of fabpot (@j0k3r)
- [#2156](https://github.com/wallabag/wallabag/pull/2156) Try to find bad redirection after delete (@j0k3r)
- [#2148](https://github.com/wallabag/wallabag/pull/2148) translate documentation to German (@Strubbl)
- [#2145](https://github.com/wallabag/wallabag/pull/2145) Corrected Regex for lighttpd rewrite (@even-allmighty)
### 2.0.5 2016/05/31
- [#2118](https://github.com/wallabag/wallabag/pull/2118) Prepare wallabag 2.0.5 (@nicosomb)
- [#2122](https://github.com/wallabag/wallabag/pull/2122) Fix the deletion of Tags/Entries relation when delete an entry (@j0k3r, @nicosomb)
- [#2052](https://github.com/wallabag/wallabag/pull/2052) Add unread filter to entries pages (@danbartram)
- [#2112](https://github.com/wallabag/wallabag/pull/2112) Docs proposal (@Poorchop)
- [#2111](https://github.com/wallabag/wallabag/pull/2111) add screenshots of android docu in English (@Strubbl)
- [#2109](https://github.com/wallabag/wallabag/pull/2109) Improve English translation (@Poorchop)
- [#2097](https://github.com/wallabag/wallabag/pull/2097) Fix image path in 2-factor authentification email (@bmillemathias)
- [#2098](https://github.com/wallabag/wallabag/pull/2098) CS (@j0k3r)
- [#2092](https://github.com/wallabag/wallabag/pull/2092) Starred and Archived clears if article is already exists (@Rurik19)
- [#2093](https://github.com/wallabag/wallabag/pull/2093) Replace vertical dots in material theme with horizontal dots (@nicosomb)
- [#2094](https://github.com/wallabag/wallabag/pull/2094) Update CONTRIBUTING file (@nicosomb)
- [#2069](https://github.com/wallabag/wallabag/pull/2069) Do not specify language in Firefox addon link (@merwan)
- [#2068](https://github.com/wallabag/wallabag/pull/2068) Added information about permissions on data/ (@mariovor)
- [#2054](https://github.com/wallabag/wallabag/pull/2054) Update CraueConfigBundle.it.yml (@jamiroconca)
- [#2049](https://github.com/wallabag/wallabag/pull/2049) Update api.rst (@joshp23)
- [#2044](https://github.com/wallabag/wallabag/pull/2044) Update api.rst (@joshp23)
- [#2038](https://github.com/wallabag/wallabag/pull/2038) new details in the doc about the rights access again;) (@foxmask)
### 2.0.4 2016/05/07
- [#2035](https://github.com/wallabag/wallabag/pull/2035) Prepare wallabag 2.0.4 (@nicosomb)
- [#2023](https://github.com/wallabag/wallabag/pull/2023) Fix translation for validators (@nicosomb)
- [#2016](https://github.com/wallabag/wallabag/pull/2016) Update documentation (@nicosomb)
- [#2020](https://github.com/wallabag/wallabag/pull/2020) Fix number of entries in tag/list (@nicosomb)
- [#2024](https://github.com/wallabag/wallabag/pull/2024) Update messages.it.yml (@jamiroconca)
- [#2029](https://github.com/wallabag/wallabag/pull/2029) Change Travis/Scrutinizer pictures in README (@nicosomb)
- [#2028](https://github.com/wallabag/wallabag/pull/2028) Docu for android app (@Strubbl)
- [#2022](https://github.com/wallabag/wallabag/pull/2022) Fix pagination bar on small devices (@nicosomb)
- [#2017](https://github.com/wallabag/wallabag/pull/2017) Create messages.it.yml (@jamiroconca)
- [#2018](https://github.com/wallabag/wallabag/pull/2018) Update config.yml, add italian as available language (@jamiroconca)
- [#2019](https://github.com/wallabag/wallabag/pull/2019) Create CraueConfigBundle.it.yml (@jamiroconca)
- [#2013](https://github.com/wallabag/wallabag/pull/2013) Fix tags listing (@nicosomb)
- [#1976](https://github.com/wallabag/wallabag/pull/1976) Fix filter reading time (@nicosomb)
- [#2005](https://github.com/wallabag/wallabag/pull/2005) Fix reading speed not defined when user was created via config page (@nicosomb)
- [#2012](https://github.com/wallabag/wallabag/pull/2012) integrate upgrade.rst (@biva)
- [#2011](https://github.com/wallabag/wallabag/pull/2011) upgrade.rst (Creation of an upgrade page in the documentation) (@biva)
- [#2010](https://github.com/wallabag/wallabag/pull/2010) Set the title via POST /api/entries (@nicosomb)
- [#2001](https://github.com/wallabag/wallabag/pull/2001) Fix old branch name urls (@tcitworld)
- [#1992](https://github.com/wallabag/wallabag/pull/1992) Update CraueConfigBundle.es.yml (@jami7)
- [#1985](https://github.com/wallabag/wallabag/pull/1985) Rights access to the folders of the project (@foxmask)
- [#1977](https://github.com/wallabag/wallabag/pull/1977) Es translation (@j0k3r, @jami7)
- [#1970](https://github.com/wallabag/wallabag/pull/1970) Fix typos in API documentation (@nicosomb)
- [#1969](https://github.com/wallabag/wallabag/pull/1969) Create 3rd Resources chapter in API documentation (@nicosomb)
- [#1967](https://github.com/wallabag/wallabag/pull/1967) Add FAQ page in documentation (@nicosomb)
### 2.0.3 2016/04/22
- [#1965](https://github.com/wallabag/wallabag/pull/1965) Prepare release 2.0.3 (@nicosomb)
- [#1962](https://github.com/wallabag/wallabag/pull/1962) Update API documentation with cURL examples (@nicosomb)
### 2.0.2 2016/04/21
- [#1948](https://github.com/wallabag/wallabag/pull/1948) Prepare release 2.0.2 (@nicosomb)
- [#1957](https://github.com/wallabag/wallabag/pull/1957) Fix translation for Go to your account button after subscription (@nicosomb)
- [#1945](https://github.com/wallabag/wallabag/pull/1945) Added some curl examples (@ddeimeke)
- [#1954](https://github.com/wallabag/wallabag/pull/1954) Update links in documentation (@nicosomb)
- [#1953](https://github.com/wallabag/wallabag/pull/1953) Actualisation des liens morts (Documentation de traduction) (@maxi62330)
- [#1942](https://github.com/wallabag/wallabag/pull/1942) Optimize import (@nicosomb)
- [#1944](https://github.com/wallabag/wallabag/pull/1944) Update Travis configuration with branches renaming (@nicosomb)
### 1.9.2 2016/04/18
- [#1938](https://github.com/wallabag/wallabag/pull/1938) Display pagination only if we have more than one page (@nicosomb)
- [#1935](https://github.com/wallabag/wallabag/pull/1935) Update messages.es.yml (@jami7)
- [#1933](https://github.com/wallabag/wallabag/pull/1933) Hide pagination if we only have one entry to display (@nicosomb)
- [#1925](https://github.com/wallabag/wallabag/pull/1925) Redirect to homepage if referer is null (@nicosomb)
- [#1929](https://github.com/wallabag/wallabag/pull/1929) Change guid and link in RSS feeds to give original entry URL (@nicosomb)
- [#1916](https://github.com/wallabag/wallabag/pull/1916) Convert array + phpDoc (@j0k3r)
- [#1918](https://github.com/wallabag/wallabag/pull/1918) Improve pagination when user has lot of entries (@nicosomb)
- [#1919](https://github.com/wallabag/wallabag/pull/1919) Remove useless dependancy (@nicosomb)
- [#1911](https://github.com/wallabag/wallabag/pull/1911) add title hover on entry titles (@tcitworld)
- [#1915](https://github.com/wallabag/wallabag/pull/1915) Fix doc links (@j0k3r)
### 2.0.1 2016/04/11
- [#1912](https://github.com/wallabag/wallabag/pull/1912) Move setup config outside setupAdmin (@j0k3r)
- [#1909](https://github.com/wallabag/wallabag/pull/1909) Prepare release 2.0.1 (@nicosomb)
- [#1902](https://github.com/wallabag/wallabag/pull/1902) Add changelog (@nicosomb)
- [#1823](https://github.com/wallabag/wallabag/pull/1823) Translation fa (@j0k3r, @mabkenar)
- [#1903](https://github.com/wallabag/wallabag/pull/1903) Force server version to avoid connexion error (@j0k3r)
- [#1901](https://github.com/wallabag/wallabag/pull/1901) Update Spanish translation (@j0k3r, @jami7)
- [#1887](https://github.com/wallabag/wallabag/pull/1887) Fix duplicate article when added via the bookmarklet (@nicosomb)
- [#1895](https://github.com/wallabag/wallabag/pull/1895) All the entries are fetched via GET /api/entries (@nicosomb)
- [#1900](https://github.com/wallabag/wallabag/pull/1900) Remove empty portugese documentation (@nicosomb)
- [#1899](https://github.com/wallabag/wallabag/pull/1899) Add documentation about importing large file into nginx (@nicosomb)
- [#1898](https://github.com/wallabag/wallabag/pull/1898) Fix estimated reading time in material view (@nicosomb)
- [#1896](https://github.com/wallabag/wallabag/pull/1896) Fix internal settings (@nicosomb)
- [#1894](https://github.com/wallabag/wallabag/pull/1894) Fix documentation link in developer page (@nicosomb)
- [#1891](https://github.com/wallabag/wallabag/pull/1891) Fix typo on configuration page (@nicosomb)
- [#1824](https://github.com/wallabag/wallabag/pull/1824) Remove SMTP configuration environment overrides (@nicosomb)
- [#1879](https://github.com/wallabag/wallabag/pull/1879) Move tag form in Material theme (@nicosomb)
- [#1884](https://github.com/wallabag/wallabag/pull/1884) Change the installation method in issue template (@nicosomb)
- [#1804](https://github.com/wallabag/wallabag/pull/1804) Force user-agent for iansommerville.com (@j0k3r)
- [#1868](https://github.com/wallabag/wallabag/pull/1868) Remove keyboard shortcut and add tagging rule panel in baggy (@nicosomb)
- [#1862](https://github.com/wallabag/wallabag/pull/1862) Add production environment for CLI import (@nicosomb)
- [#1861](https://github.com/wallabag/wallabag/pull/1861) Round estimated time and add reading speed for Baggy (@nicosomb)
- [#1856](https://github.com/wallabag/wallabag/pull/1856) Documentation about wallabag v1 CLI import (@nicosomb)
- [#1840](https://github.com/wallabag/wallabag/pull/1840) Fix Archive page title translation (@nicosomb)
### 2.0.0 2016/04/03
- [#1835](https://github.com/wallabag/wallabag/pull/1835) :rocket: Prepare v2.0.0 :birthday: (@nicosomb)
- [#1838](https://github.com/wallabag/wallabag/pull/1838) Hide search buttons (@nicosomb)
- [#1832](https://github.com/wallabag/wallabag/pull/1832) Check selected PDO driver on install (@j0k3r)
- [#3](https://github.com/wallabag/wallabag/pull/3) Fix simple quote (@j0k3r)
- [#1822](https://github.com/wallabag/wallabag/pull/1822) Update messages.es.yml (@jami7)
- [#1820](https://github.com/wallabag/wallabag/pull/1820) Refacto wallabag import (@j0k3r)
- [#1821](https://github.com/wallabag/wallabag/pull/1821) Update messages.es.yml (@jami7)
- [#1805](https://github.com/wallabag/wallabag/pull/1805) Fix #1768 Split tags with commas from UI (@j0k3r)
- [#1819](https://github.com/wallabag/wallabag/pull/1819) Some cleanup (@j0k3r)
- [#1818](https://github.com/wallabag/wallabag/pull/1818) add migration docs (@tcitworld)
- [#1817](https://github.com/wallabag/wallabag/pull/1817) Correct translation (@mruminski)
- [#1813](https://github.com/wallabag/wallabag/pull/1813) [v2] German translation (@wallabag)
- [#1807](https://github.com/wallabag/wallabag/pull/1807) fix typo diaspora* share (@nikaro)
- [#1806](https://github.com/wallabag/wallabag/pull/1806) Translate flash message in baggy theme (@nicosomb)
- [#1774](https://github.com/wallabag/wallabag/pull/1774) Switch to keys in translated files (@j0k3r)
- [#1767](https://github.com/wallabag/wallabag/pull/1767) Setting for reading time (@nicosomb)
- [#1799](https://github.com/wallabag/wallabag/pull/1799) fix tabs display on mobile view (@tcitworld)
- [#1791](https://github.com/wallabag/wallabag/pull/1791) fix api properties and typo (@tcitworld)
- [#1797](https://github.com/wallabag/wallabag/pull/1797) Don't add entry through API if it already exists (@tcitworld)
- [#1792](https://github.com/wallabag/wallabag/pull/1792) add tests on user in API responses (@tcitworld)
- [#1786](https://github.com/wallabag/wallabag/pull/1786) API shows just what needed for user (@tcitworld)
- [#1784](https://github.com/wallabag/wallabag/pull/1784) add refresh-token grant-type (@tcitworld)
### 2.0.0-beta.2 2016/03/12
- [#1775](https://github.com/wallabag/wallabag/pull/1775) Some fixes (@j0k3r)
- [#1776](https://github.com/wallabag/wallabag/pull/1776) clarify that wllbg is compatible php 7 (@tcitworld)
- [#1763](https://github.com/wallabag/wallabag/pull/1763) Prepare files for 2.0.0-beta.2 (@nicosomb)
- [#1771](https://github.com/wallabag/wallabag/pull/1771) Docker timezone (@DjayDev)
- [#1766](https://github.com/wallabag/wallabag/pull/1766) Fix #1756: Added 'wallabag' in page title (@nicosomb)
- [#1762](https://github.com/wallabag/wallabag/pull/1762) Change documentation links in quickstart (@nicosomb)
- [#1761](https://github.com/wallabag/wallabag/pull/1761) V2 api version (@tcitworld, @ZeddZull)
- [#1675](https://github.com/wallabag/wallabag/pull/1675) Ability to create new client for the API (@j0k3r, @nicosomb, @tcitworld)
- [#1750](https://github.com/wallabag/wallabag/pull/1750) Documentation about filters / Quickstart changes (@nicosomb)
- [#1670](https://github.com/wallabag/wallabag/pull/1670) Mark all imported articles as read (@j0k3r, @tcitworld)
- [#1754](https://github.com/wallabag/wallabag/pull/1754) Add starred & archive properties to API (@j0k3r, @tcitworld)
- [#1753](https://github.com/wallabag/wallabag/pull/1753) Doc: fix typo in php-hash ext name (@Horgix)
- [#1745](https://github.com/wallabag/wallabag/pull/1745) V2 spanish translation (@benages)
- [#1743](https://github.com/wallabag/wallabag/pull/1743) Releasing documentation (@nicosomb)
- [#1615](https://github.com/wallabag/wallabag/pull/1615) Added RELEASE_PROCESS document (@bdunogier)
- [#1740](https://github.com/wallabag/wallabag/pull/1740) minor typofix again (@goofy-bz)
- [#1742](https://github.com/wallabag/wallabag/pull/1742) Add the way to install (package or composer) (@nicosomb)
### 2.0.0-beta.1 2016/03/01
- [#1738](https://github.com/wallabag/wallabag/pull/1738) Prepare wallabag for first beta :rocket: (@nicosomb)
- [#1739](https://github.com/wallabag/wallabag/pull/1739) minor typofix + missing quotes (@goofy-bz)
- [#1736](https://github.com/wallabag/wallabag/pull/1736) Update Capistrano libraries with last versions (@nicosomb)
- [#1734](https://github.com/wallabag/wallabag/pull/1734) Remove extra definition (@j0k3r)
- [#1732](https://github.com/wallabag/wallabag/pull/1732) Adding Danish translations to Wallabag v2 (@mjjzf)
- [#1731](https://github.com/wallabag/wallabag/pull/1731) Fix: #1703: authentication for PR by external contributors (@nicosomb)
- [#1653](https://github.com/wallabag/wallabag/pull/1653) V2 annotator comments (@nicosomb, @tcitworld)
- [#1728](https://github.com/wallabag/wallabag/pull/1728) Fix #1717: Change remove tag icon in entry view with material theme (@wallabag)
- [#1723](https://github.com/wallabag/wallabag/pull/1723) Make English welcome message more natural (@shtrom)
- [#1712](https://github.com/wallabag/wallabag/pull/1712) Fix #1711: Update CONTRIBUTING file (@nicosomb)
- [#1716](https://github.com/wallabag/wallabag/pull/1716) Fix #1603: Enhance requirements in InstallCommand (@j0k3r, @tcitworld)
- [#1710](https://github.com/wallabag/wallabag/pull/1710) Fix #811: Display a human message when graby fails to fetch articles (@nicosomb)
- [#1715](https://github.com/wallabag/wallabag/pull/1715) Fix #1694 #1669 #1684: Add contributors and 3rd party libraries (@wallabag)
- [#1714](https://github.com/wallabag/wallabag/pull/1714) Change wording for create a new user (@j0k3r)
- [#1683](https://github.com/wallabag/wallabag/pull/1683) Demonstration mode to prevent password changes (@j0k3r)
- [#1701](https://github.com/wallabag/wallabag/pull/1701) Fix #1351: add maintenance mode (@j0k3r)
- [#1709](https://github.com/wallabag/wallabag/pull/1709) Fix #1708: typos in french documentation (@wallabag)
- [#1702](https://github.com/wallabag/wallabag/pull/1702) Added Piwik implementation (@j0k3r)
- [#1707](https://github.com/wallabag/wallabag/pull/1707) typo in french documentation (@nicosomb)
- [#1706](https://github.com/wallabag/wallabag/pull/1706) Documentation for wallabag installation (@tcitworld, @nicosomb)
- [#1705](https://github.com/wallabag/wallabag/pull/1705) French translation for documentation (@nicosomb)
- [#1699](https://github.com/wallabag/wallabag/pull/1699) Move assignTagsToEntry in ContentProxy helper (@j0k3r)
- [#1700](https://github.com/wallabag/wallabag/pull/1700) Fix #1551 - Redirect to the last page when current page is out of range (@delyriand)
- [#1693](https://github.com/wallabag/wallabag/pull/1693) Fix #1691 create ISSUE_TEMPLATE and PULL_REQUEST_TEMPLATE (@wallabag)
- [#1696](https://github.com/wallabag/wallabag/pull/1696) Add some missing french translations (@wallabag)
- [#1688](https://github.com/wallabag/wallabag/pull/1688) Create messages.pl.yml (@mruminski)
- [#1690](https://github.com/wallabag/wallabag/pull/1690) translate estimated time minutes (@tcitworld)
- [#1689](https://github.com/wallabag/wallabag/pull/1689) Create validators.pl.yml (@mruminski)
- [#1686](https://github.com/wallabag/wallabag/pull/1686) Polish translation (@mruminski)
- [#1687](https://github.com/wallabag/wallabag/pull/1687) Translated another two files into romanian. (@0wnrepo)
- [#1681](https://github.com/wallabag/wallabag/pull/1681) two more Persian translated files (@mabkenar)
- [#1679](https://github.com/wallabag/wallabag/pull/1679) Documentation about translation (@wallabag)
- [#1680](https://github.com/wallabag/wallabag/pull/1680) Update Capistrano configuration for symfony3 (@wallabag)
- [#1678](https://github.com/wallabag/wallabag/pull/1678) Translation file for the 'Romanian' language. Also recognised by ro_RO. Known in romanian as "Română". (@0wnrepo)
- [#1676](https://github.com/wallabag/wallabag/pull/1676) Translation for Persian (@mabkenar)
- [#1668](https://github.com/wallabag/wallabag/pull/1668) Few updates (@j0k3r)
- [#1672](https://github.com/wallabag/wallabag/pull/1672) improve baggy theme (add new tag panel) (@tcitworld)
- [#1671](https://github.com/wallabag/wallabag/pull/1671) display pictures properly (@tcitworld)
- [#1658](https://github.com/wallabag/wallabag/pull/1658) import tags from v1 (#1657) (@tcitworld)
- [#1656](https://github.com/wallabag/wallabag/pull/1656) fix labels on new user prompt (@tcitworld)
- [#1654](https://github.com/wallabag/wallabag/pull/1654) fix #1636 (@tcitworld)
- [#1663](https://github.com/wallabag/wallabag/pull/1663) remove tag from entry #1377 (@tcitworld)
- [#1665](https://github.com/wallabag/wallabag/pull/1665) lots of diverse translation stuff & some typos (@tcitworld)
- [#1666](https://github.com/wallabag/wallabag/pull/1666) reimport v1 entries if they were not fetched (@tcitworld)
- [#1659](https://github.com/wallabag/wallabag/pull/1659) Update README.md with the environment parameters (@0wnrepo)
- [#1651](https://github.com/wallabag/wallabag/pull/1651) Test if some keys are missing in v2 import (@wallabag)
- [#1650](https://github.com/wallabag/wallabag/pull/1650) Exported entries were added twice in export file (@wallabag)
- [#1652](https://github.com/wallabag/wallabag/pull/1652) User created via wallabag:install is now a SUPER_ADMIN :crown: (@wallabag)
- [#1648](https://github.com/wallabag/wallabag/pull/1648) Fix project version in installation command (@lologhi)
- [#1647](https://github.com/wallabag/wallabag/pull/1647) Force prod env on project creation (@j0k3r)
- [#1633](https://github.com/wallabag/wallabag/pull/1633) Exporttxt (@j0k3r, @tcitworld)
- [#1642](https://github.com/wallabag/wallabag/pull/1642) Unescape content for Material card (@j0k3r)
- [#1644](https://github.com/wallabag/wallabag/pull/1644) Fix #1622: parameter for FosUser confirmation (@wallabag)
- [#1645](https://github.com/wallabag/wallabag/pull/1645) Fix #1643: fix the way to load the HTML template in 2factor auth (@wallabag)
- [#1612](https://github.com/wallabag/wallabag/pull/1612) Settings page (@j0k3r)
- [#1641](https://github.com/wallabag/wallabag/pull/1641) Update import.rst to fix a doc typo (@nicosomb)
- [#1601](https://github.com/wallabag/wallabag/pull/1601) [#1590] Add JSON import from wallabag v2 (@wallabag)
- [#1605](https://github.com/wallabag/wallabag/pull/1605) [#1604] First draft to fix SensioLabsInsight report (@wallabag)
- [#1639](https://github.com/wallabag/wallabag/pull/1639) Fix #1635: change database name for test environments (mysql/pgsql) (@wallabag)
- [#1630](https://github.com/wallabag/wallabag/pull/1630) Add @GitterHQ badge on README (@nicosomb)
- [#1629](https://github.com/wallabag/wallabag/pull/1629) fix #1620 and introduce new parameters to export (@tcitworld)
- [#1628](https://github.com/wallabag/wallabag/pull/1628) Add Turkish translation (@ogunkarakus)
- [#1625](https://github.com/wallabag/wallabag/pull/1625) [#1621] Add default address for FosUser (@nicosomb)
- [#1619](https://github.com/wallabag/wallabag/pull/1619) Move public assets for themes (@j0k3r)
- [#1618](https://github.com/wallabag/wallabag/pull/1618) Updated version in README (@wallabag)
### 2.0.0-alpha.2 2016/01/22
- [#1614](https://github.com/wallabag/wallabag/pull/1614) Few fixes (@j0k3r)
- [#1565](https://github.com/wallabag/wallabag/pull/1565) Use HTML email for 2FA (@j0k3r)
- [#1610](https://github.com/wallabag/wallabag/pull/1610) Disable xdebug all the time (@j0k3r)
- [#1606](https://github.com/wallabag/wallabag/pull/1606) Remove tag relation when removing an entry (@j0k3r)
- [#1607](https://github.com/wallabag/wallabag/pull/1607) Ignore composer.lock (@j0k3r)
- [#1599](https://github.com/wallabag/wallabag/pull/1599) Add configuration for portuguese documentation (@wallabag)
- [#1594](https://github.com/wallabag/wallabag/pull/1594) Create index.rst (@araujo0205)
- [#1587](https://github.com/wallabag/wallabag/pull/1587) Use translator interface instead of final class (@j0k3r)
- [#1584](https://github.com/wallabag/wallabag/pull/1584) some cleanup (@wallabag)
- [#1564](https://github.com/wallabag/wallabag/pull/1564) Remove Flattr references (@wallabag)
- [#1583](https://github.com/wallabag/wallabag/pull/1583) Fix `findOneByUrl` side effect in tests (@j0k3r)
- [#1524](https://github.com/wallabag/wallabag/pull/1524) Upgrade to Symfony 3.0 (@j0k3r)
- [#1560](https://github.com/wallabag/wallabag/pull/1560) Fix #1501 Quickstart for beginners (@nicosomb)
- [#1574](https://github.com/wallabag/wallabag/pull/1574) Fix typo and set version in the README (@jjanvier)
- [#1561](https://github.com/wallabag/wallabag/pull/1561) Add basic docker-compose configuration (@FabienM)
- [#1563](https://github.com/wallabag/wallabag/pull/1563) #1394 Fixed 'mark as read' and 'mark as unread' links (@nicosomb)
- [#1562](https://github.com/wallabag/wallabag/pull/1562) add import link on baggy theme (@nicosomb)
- [#1558](https://github.com/wallabag/wallabag/pull/1558) [v2] documentation cleaning (@wallabag)
- [#1559](https://github.com/wallabag/wallabag/pull/1559) Installation & configuration of Doctrine Migrations (@j0k3r)
### 2.0.0-alpha.1 2016/01/07
- [#1493](https://github.com/wallabag/wallabag/pull/1493) v2 1st draft for Pocket import via API & Wallabag v1 import (@nicosomb, @j0k3r)
- [#1553](https://github.com/wallabag/wallabag/pull/1553) Hide export button if we are not on entries list (@nicosomb)
- [#1545](https://github.com/wallabag/wallabag/pull/1545) v2 Remove user reference in tag (@j0k3r)
- [#1546](https://github.com/wallabag/wallabag/pull/1546) v2 Ability to reload an entry (@j0k3r)
- [#1547](https://github.com/wallabag/wallabag/pull/1547) v2 Fix wrong if when deleting an entry (@j0k3r)
- [#1544](https://github.com/wallabag/wallabag/pull/1544) v2 Add custom email for 2FA (@j0k3r)
- [#1540](https://github.com/wallabag/wallabag/pull/1540) v2 Don't redirect to the content page after deletion (@j0k3r)
- [#1542](https://github.com/wallabag/wallabag/pull/1542) v2 Avoid multiple tag creation (@j0k3r)
- [#1488](https://github.com/wallabag/wallabag/pull/1488) Slug for tags (@wallabag)
- [#1537](https://github.com/wallabag/wallabag/pull/1537) Updated composer.lock (@bdunogier)
- [#1529](https://github.com/wallabag/wallabag/pull/1529) changed table name for tagging rule (@nicosomb)
- [#1478](https://github.com/wallabag/wallabag/pull/1478) Rule based tags (@K-Phoen)
- [#1523](https://github.com/wallabag/wallabag/pull/1523) Typo (@tcitworld)
- [#1518](https://github.com/wallabag/wallabag/pull/1518) Set SMTP from environment variables (@mathbruyen)
- [#1422](https://github.com/wallabag/wallabag/pull/1422) V2 Export entries (@j0k3r, @tcitworld)
- [#1500](https://github.com/wallabag/wallabag/pull/1500) Fix quote strategy for reserved keyword in Postgres (@j0k3r)
- [#1510](https://github.com/wallabag/wallabag/pull/1510) v2 Fix some deprecated for Symfony3 (@j0k3r)
- [#1505](https://github.com/wallabag/wallabag/pull/1505) Add graby log (@j0k3r)
- [#1495](https://github.com/wallabag/wallabag/pull/1495) add docs (@wallabag)
- [#1496](https://github.com/wallabag/wallabag/pull/1496) fix #1005 V2 redirect after deletion (@wallabag)
- [#1491](https://github.com/wallabag/wallabag/pull/1491) Add german translation. (@jlnostr)
- [#1446](https://github.com/wallabag/wallabag/pull/1446) [WIP] language selection on config screen (@j0k3r, @nicosomb)
- [#1484](https://github.com/wallabag/wallabag/pull/1484) 2factor authentication via email (@wallabag)
- [#1475](https://github.com/wallabag/wallabag/pull/1475) V2 material (@modos189)
- [#1472](https://github.com/wallabag/wallabag/pull/1472) fix #1470: clean material theme (@wallabag)
- [#1471](https://github.com/wallabag/wallabag/pull/1471) implement bookmarklet (@wallabag)
- [#1468](https://github.com/wallabag/wallabag/pull/1468) fix bug on detect active theme (@wallabag)
- [#1464](https://github.com/wallabag/wallabag/pull/1464) fix type hint for User (@wallabag)
- [#1436](https://github.com/wallabag/wallabag/pull/1436) Public registration & oAuth2 \o/ (@j0k3r, @nicosomb)
- [#1461](https://github.com/wallabag/wallabag/pull/1461) fix #1433: add test for removeWww Twig Extension (@wallabag)
- [#1459](https://github.com/wallabag/wallabag/pull/1459) fix #1457 & update materialize (@tcitworld)
- [#1447](https://github.com/wallabag/wallabag/pull/1447) typo (@tcitworld)
- [#1441](https://github.com/wallabag/wallabag/pull/1441) Add french translation (@nicosomb)
- [#1437](https://github.com/wallabag/wallabag/pull/1437) some cleanup on material theme (@nicosomb)
- [#1439](https://github.com/wallabag/wallabag/pull/1439) fix Capistrano configuration (@nicosomb)
- [#1440](https://github.com/wallabag/wallabag/pull/1440) fix #1433: remove www. on entries view (@nicosomb)
- [#1434](https://github.com/wallabag/wallabag/pull/1434) Add multiple database tests on Travis (@j0k3r)
- [#1435](https://github.com/wallabag/wallabag/pull/1435) Enabled created user from Config (@j0k3r)
- [#1429](https://github.com/wallabag/wallabag/pull/1429) V2 Handle language in entry (@j0k3r)

14
COPYING
View File

@ -1,14 +0,0 @@
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.

19
COPYING.md Normal file
View File

@ -0,0 +1,19 @@
Copyright (c) 2013-2016 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.

16
CREDITS
View File

@ -1,16 +0,0 @@
poche is based on :
* ReadItYourself http://www.memiks.fr/readityourself/
* PHP Readability http://www.keyvan.net/2010/08/php-readability/
* 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
poche is developed by Nicolas Lœuillet under the Do What the Fuck You Want to Public License
Contributors :
Nicolas Lœuillet aka nico_somb
Tom.C. aka tmos
PeaceCopathe
Gregoire_M

3
CREDITS.md Normal file
View File

@ -0,0 +1,3 @@
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.
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 }

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

230
Gruntfile.js Normal file
View File

@ -0,0 +1,230 @@
module.exports = function (grunt) {
require('load-grunt-tasks')(grunt);
grunt.initConfig({
appDir: 'app/Resources/static',
buildDir: 'app/Resources/build',
modulesDir: 'node_modules',
releaseDir: 'web/bundles/wallabagcore',
postcss: {
material: {
options: {
processors: [
require('pixrem')(),
require('autoprefixer')({ browsers: 'last 2 versions' }),
require('cssnano')(),
],
},
src: '<%= buildDir %>/material.css',
dest: '<%= releaseDir %>/themes/material/css/style.min.css',
},
baggy: {
options: {
processors: [
require('pixrem')(),
require('autoprefixer')({ browsers: 'last 2 versions' }),
require('cssnano')(),
],
},
src: '<%= buildDir %>/baggy.css',
dest: '<%= releaseDir %>/themes/baggy/css/style.min.css',
},
},
concat: {
options: {
separator: ';',
},
cssMaterial: {
src: [
'node_modules/materialize-css/bin/materialize.css',
'<%= appDir %>/themes/material/css/*.css',
],
dest: '<%= buildDir %>/material.css',
},
cssBaggy: {
src: [
'<%= appDir %>/themes/baggy/css/*.css',
],
dest: '<%= buildDir %>/baggy.css',
},
},
browserify: {
dist: {
files: {
'<%= buildDir %>/material.browser.js': ['<%= appDir %>/themes/material/js/init.js'],
'<%= buildDir %>/baggy.browser.js': ['<%= appDir %>/themes/baggy/js/init.js']
}
},
options: {
sourceType: "module",
transform: [
["babelify", {
presets: ["es2015"]
}], ["browserify-shim", {
"jquery": {
"exports": "$"
},
"materialize": "materialize",
"jquery-ui": {
"depends": "jquery",
"exports": null
}
}]
],
browserifyOptions: {
browser: {
"jQuery": "./node_modules/jquery/dist/jquery.js",
"jquery.tinydot": "./node_modules/jquery.tinydot/src/jquery.tinydot.js",
"jquery.ui": "./node_modules/jquery-ui-browserify/dist/jquery-ui.js"
}
}
}
},
uglify: {
material: {
files: {
'<%= releaseDir %>/themes/material/js/material.min.js':
['<%= buildDir %>/material.browser.js'],
}
},
baggy: {
files: {
'<%= releaseDir %>/themes/baggy/js/baggy.min.js':
['<%= buildDir %>/baggy.browser.js'],
}
},
},
copy: {
pickerjs: {
expand: true,
cwd: '<%= modulesDir %>/pickadate/lib',
src: 'picker.js',
dest: '<%= buildDir %>',
},
annotator: {
expand: true,
cwd: '<%= modulesDir %>/annotator/pkg',
src: 'annotator.min.js',
dest: '<%= buildDir %>/themes/_global/js/',
},
baggyfonts: {
files: [
{
expand: true,
cwd: '<%= modulesDir %>/icomoon-free-npm/Font',
src: 'IcoMoon-Free.ttf',
dest: '<%= releaseDir %>/themes/baggy/fonts/',
},
{
expand: true,
cwd: '<%= modulesDir %>/ptsans-npm-webfont/fonts',
src: 'ptsansbold.woff',
dest: '<%= releaseDir %>/themes/baggy/fonts/',
},
{
expand: true,
cwd: '<%= modulesDir %>/material-design-icons-iconfont/dist/fonts/',
src: ['MaterialIcons-Regular.eot', 'MaterialIcons-Regular.woff2', 'MaterialIcons-Regular.woff', 'MaterialIcons-Regular.ttf'],
dest: '<%= releaseDir %>/themes/baggy/fonts/',
},
],
},
materialfonts: {
files: [
{
expand: true,
overwrite: true,
cwd: '<%= modulesDir %>/icomoon-free-npm/Font',
src: 'IcoMoon-Free.ttf',
dest: '<%= releaseDir %>/themes/material/fonts',
},
{
expand: true,
overwrite: true,
cwd: '<%= modulesDir %>/roboto-fontface/fonts/Roboto',
src: '*',
dest: '<%= releaseDir %>/themes/material/font/roboto',
},
{
expand: true,
overwrite: true,
cwd: '<%= modulesDir %>/material-design-icons-iconfont/dist/fonts/',
src: ['MaterialIcons-Regular.eot', 'MaterialIcons-Regular.woff2', 'MaterialIcons-Regular.woff', 'MaterialIcons-Regular.ttf'],
dest: '<%= releaseDir %>/themes/material/fonts/',
},
],
},
},
symlink: {
pics: {
files: [
{
expand: true,
overwrite: true,
cwd: '<%= appDir %>/themes/_global/',
src: 'img',
dest: '<%= releaseDir %>/themes/_global/',
},
],
},
},
clean: {
css: {
src: ['<%= buildDir %>/**/*.css'],
},
js: {
src: ['<%= buildDir %>/**/*.js', '<%= buildDir %>/**/*.map'],
},
all: {
src: ['./<%= buildDir %>'],
},
release: {
src: ['./<%= releaseDir %>/*'],
}
},
eslint: {
target: ['<%= appDir %>/themes/material/js/init.js', '<%= appDir %>/themes/baggy/js/init.js']
},
stylelint: {
target: ['<%= appDir %>/themes/material/css/*.css', '<%= appDir %>/themes/baggy/css/*.css']
},
watch: {
files: ['<%= appDir %>/**/*.css', '<%= appDir %>/**/*.js'],
tasks: ['css', 'js']
}
});
grunt.registerTask(
'fonts',
'Install fonts',
['copy:baggyfonts', 'copy:materialfonts']
);
grunt.registerTask(
'js',
'Build and install js files',
['clean:js', 'copy:pickerjs', 'browserify', 'uglify']
);
grunt.registerTask(
'default',
'Build and install everything',
['clean', 'copy:pickerjs', 'concat', 'browserify', 'uglify', 'postcss', 'copy', 'symlink']
);
grunt.registerTask(
'css',
'Compiles the stylesheets.',
['clean:css', 'concat:cssMaterial', 'concat:cssBaggy', 'postcss']
);
grunt.registerTask(
'tests',
'Test css and js style conformity',
['eslint', 'stylelint', 'default']
),
grunt.loadNpmTasks('grunt-contrib-watch');
};

46
Makefile Executable file
View File

@ -0,0 +1,46 @@
TMP_FOLDER=/tmp
RELEASE_FOLDER=wllbg-release
ifndef ENV
ENV=prod
endif
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
@sh scripts/install.sh $(ENV)
update: ## Update the wallabag installation to the latest version
@sh scripts/update.sh $(ENV)
dev: ## Install the latest dev version
@sh scripts/dev.sh
run: ## Run the wallabag built-in server
@php bin/console server:run --env=$(ENV)
build: ## Run grunt
@grunt
test: ## Launch wallabag testsuite
@if [ ! -d "vendor/phpunit" ]; then composer install; fi
@ant prepare && vendor/phpunit/phpunit/phpunit -v
release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`).
ifndef VERSION
$(error VERSION is not set)
endif
@sh scripts/release.sh $(VERSION) $(TMP_FOLDER) $(RELEASE_FOLDER) $(ENV)
travis: ## Make some stuff for Travis-CI
deploy: ## Deploy wallabag
@bundle exec cap staging deploy
.PHONY: help clean install update build test release travis deploy run dev
.DEFAULT_GOAL := install

View File

@ -1,57 +1,27 @@
# poche
Abandon Pocket, Instapaper and other Readability service : adopt poche. It is the same, but it is 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)
![poche](http://inthepoche.com/img/logo.png)
# What is wallabag?
wallabag is a self hostable 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.
The website of poche is [inthepoche.com](http://inthepoche.com).
More information on our website: [wallabag.org](https://wallabag.org).
To test poche, a demo website is online : [demo.inthepoche.com](http://demo.inthepoche.com) (login poche, password poche).
![wallabag logo](https://raw.githubusercontent.com/wallabag/logo/master/_default/typo-horizontal/png/sm/logo-typo-horizontal-black-no-bg-no-border-sm.png)
To get news from poche, [follow us on twitter](http://twitter.com/getpoche) or [read the poche blog](http://inthepoche.com/blog).
# Install wallabag
Please read [the documentation to see the wallabag requirements](http://doc.wallabag.org/en/master/user/installation.html#requirements).
[![flattr](http://api.flattr.com/button/flattr-badge-large.png)](http://flattr.com/thing/1265480/poche-a-read-it-later-open-source-system)
Then you can install wallabag by executing the following commands:
## Usage
You can easily add a "poched" page with the bookmarklet.
poche save the entire content of a poched links : text and pictures are stored on your server.
You can :
* read a page in a comfortable reading view
* archive a link
* put a link in favorite
* delete a link
## Requirements & installation
You have to install [sqlite for php](http://www.php.net/manual/en/book.sqlite.php) on your server.
Get the [latest version](https://github.com/nicosomb/poche) of poche on github. Unzip it and upload it on your server. poche must have write access on assets, cache and db directories.
That's all, **poche works** !
## Security
You **have** to protect your db/poche.sqlite file. Modify the virtual host of your website to add this condition :
```apache
<Files ~ "\.sqlite$">
Order allow,deny
Deny from all
</Files>
```
git clone https://github.com/wallabag/wallabag.git
cd wallabag && make install
make run
```
Nginx version:
```nginx
location ~ /(db) {
deny all;
return 404;
}
```
## Import from Pocket
If you want to import your Pocket datas, [export them here](https://getpocket.com/export). Put the HTML file in your poche directory, execute import.php file locally by following instructions. Be careful, the script can take a very long time.
## License
Copyright © 2010-2013 Nicolas Lœuillet <nicolas@loeuillet.org>
# License
Copyright © 2013-2016 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/config.yml` (`wallabag_core.version`)
- `CHANGELOG.md` (by using this command `github-changes -o wallabag -r wallabag -k YOURGITHUBTOKEN --only-pulls --use-commit-body --title Changelog --date-format YYYY/MM/DD --between-tags 2.0.0-alpha.0...master -n 2.1.3`. [github-changes is available here](https://github.com/lalitkapoor/github-changes))
#### 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 `http://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"
}
}
```

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
{
}

74
app/AppKernel.php Normal file
View File

@ -0,0 +1,74 @@
<?php
use Symfony\Component\HttpKernel\Kernel;
use Symfony\Component\Config\Loader\LoaderInterface;
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 Lexik\Bundle\MaintenanceBundle\LexikMaintenanceBundle(),
new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
// 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();
}
return $bundles;
}
public function getRootDir()
{
return __DIR__;
}
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->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');
}
}

View File

View File

@ -0,0 +1,51 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Migrations\AbstractMigration;
use Doctrine\DBAL\Schema\Schema;
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
class Version20160410190541 extends AbstractMigration implements ContainerAwareInterface
{
/**
* @var ContainerInterface
*/
private $container;
public function setContainer(ContainerInterface $container = null)
{
$this->container = $container;
}
private function getTable($tableName)
{
return $this->container->getParameter('database_table_prefix') . $tableName;
}
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
if ($this->connection->getDatabasePlatform()->getName() == 'postgresql') {
$this->addSql('ALTER TABLE "'.$this->getTable('entry').'" ADD uuid UUID DEFAULT NULL');
} else {
$this->addSql('ALTER TABLE "'.$this->getTable('entry').'" ADD uuid LONGTEXT DEFAULT NULL');
}
$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)
{
$this->abortIf($this->connection->getDatabasePlatform()->getName() != 'sqlite', 'This down migration can\'t be executed on SQLite databases, because SQLite don\'t support DROP COLUMN.');
$this->addSql('ALTER TABLE "'.$this->getTable('entry').'" DROP uuid');
$this->addSql("DELETE FROM \"".$this->getTable('craue_config_setting')."\" WHERE name = 'share_public'");
}
}

View File

@ -0,0 +1,53 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Migrations\AbstractMigration;
use Doctrine\DBAL\Schema\Schema;
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
class Version20160812120952 extends AbstractMigration implements ContainerAwareInterface
{
/**
* @var ContainerInterface
*/
private $container;
public function setContainer(ContainerInterface $container = null)
{
$this->container = $container;
}
private function getTable($tableName)
{
return $this->container->getParameter('database_table_prefix') . $tableName;
}
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
switch ($this->connection->getDatabasePlatform()->getName()) {
case 'sqlite':
$this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD name longtext DEFAULT NULL');
break;
case 'mysql':
$this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD name longtext COLLATE \'utf8_unicode_ci\' DEFAULT NULL');
break;
case 'postgresql':
$this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD name text DEFAULT NULL');
}
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->abortIf($this->connection->getDatabasePlatform()->getName() == 'sqlite', 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
$this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' DROP COLUMN name');
}
}

View File

@ -0,0 +1,42 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Migrations\AbstractMigration;
use Doctrine\DBAL\Schema\Schema;
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
class Version20160911214952 extends AbstractMigration implements ContainerAwareInterface
{
/**
* @var ContainerInterface
*/
private $container;
public function setContainer(ContainerInterface $container = null)
{
$this->container = $container;
}
private function getTable($tableName)
{
return $this->container->getParameter('database_table_prefix') . $tableName;
}
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$this->addSql('INSERT INTO "'.$this->getTable('craue_config_setting').'" (name, value, section) VALUES (\'import_with_redis\', \'0\', \'import\')');
$this->addSql('INSERT INTO "'.$this->getTable('craue_config_setting').'" (name, value, section) VALUES (\'import_with_rabbitmq\', \'0\', \'import\')');
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
}
}

View File

@ -0,0 +1,46 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Migrations\AbstractMigration;
use Doctrine\DBAL\Schema\Schema;
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
class Version20160916201049 extends AbstractMigration implements ContainerAwareInterface
{
/**
* @var ContainerInterface
*/
private $container;
public function setContainer(ContainerInterface $container = null)
{
$this->container = $container;
}
private function getTable($tableName)
{
return $this->container->getParameter('database_table_prefix') . $tableName;
}
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$this->addSql('ALTER TABLE "'.$this->getTable('config').'" ADD pocket_consumer_key VARCHAR(255) DEFAULT NULL');
$this->addSql("DELETE FROM \"".$this->getTable('craue_config_setting')."\" WHERE name = 'pocket_consumer_key';");
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->abortIf($this->connection->getDatabasePlatform()->getName() == 'sqlite', 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
$this->addSql('ALTER TABLE "'.$this->getTable('config').'" DROP 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,31 @@
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
share_diaspora: Aktiver deling til Diaspora
share_mail: Aktiver deling med email
share_shaarli: Aktiver deling gennem Shaarli
share_twitter: Aktiver deling gennem Twitter
show_printlink: Vis et link til print-indhold
wallabag_support_url: Support-URL for wallabag
wallabag_url: URL for *sin* wallabag-installation
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

View File

@ -0,0 +1,31 @@
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
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
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

View File

@ -0,0 +1,31 @@
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
share_diaspora: Enable share to Diaspora
share_mail: Enable share by email
share_shaarli: Enable share to Shaarli
share_twitter: Enable share to Twitter
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:// ou 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

View File

@ -0,0 +1,31 @@
download_pictures: Descargar imágenes
carrot: Activar compartir con Carrot
diaspora_url: Diaspora URL, 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: Enable RabbitMQ to import data asynchronously
# import_with_redis: Enable Redis to import data asynchronously
shaarli_url: Shaarli URL, si el servicio está activado
share_diaspora: Activar compartir con Diaspora
share_mail: Activar compartir con email
share_shaarli: Activar compartir con Shaarli
share_twitter: Activar compartir con Twitter
show_printlink: Mostrar un enlace para imprimir contenido
wallabag_support_url: URL de soporte de wallabag
wallabag_url: URL de *tu* instancia de wallabag
entry: "artículo"
export: "exportar"
import: "importar"
misc: "misc"
modify_settings: "modificar configuración"
piwik_host: Host de tu website de Piwik (sin http:// o https://)
piwik_site_id: ID de tu website de Piwik
piwik_enabled: Activar Piwik
demo_mode_enabled: "Activar modo demo (sólo usado para la demo de wallabag)"
demo_mode_username: "Nombre de usuario demo"
# share_public: Allow public url for entries

View File

@ -0,0 +1,31 @@
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، اگر فعال بود
share_diaspora: فعال‌سازی هم‌رسانی به Diaspora
share_mail: فعال‌سازی هم‌رسانی با ایمیل
share_shaarli: فعال‌سازی هم‌رسانی به Shaarli
share_twitter: فعال‌سازی هم‌رسانی به Twitter
show_printlink: نمایش پیوندی برای چاپ مطلب
wallabag_support_url: نشانی صفحهٔ پشتیبانی wallabag
wallabag_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

View File

@ -0,0 +1,31 @@
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é
share_diaspora: Activer le partage vers Diaspora
share_mail: Activer le partage par email
share_shaarli: Activer le partage vers Shaarli
share_twitter: Activer le partage vers Twitter
show_printlink: Afficher un lien pour imprimer
wallabag_support_url: URL de support de wallabag
wallabag_url: URL de *votre* instance 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

View File

@ -0,0 +1,31 @@
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
share_diaspora: Abilita la condivisione con Diaspora
share_mail: Abilita la condivisione per email
share_shaarli: Abilita la condivisione con Shaarli
share_twitter: Abilita la condivisione con Twitter
show_printlink: Mostra un collegamento per stampare il contenuto
wallabag_support_url: URL di supporto per wallabag
wallabag_url: URL della *tua* installazione di 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

View File

@ -0,0 +1,31 @@
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: Enable RabbitMQ to import data asynchronously
# import_with_redis: Enable Redis to import data asynchronously
shaarli_url: URL de Shaarli, se lo servici Shaarli 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_twitter: Activar lo partatge cap a Twitter
show_printlink: Afichar un ligam per imprimir
wallabag_support_url: URL d'assisténcia de wallabag
wallabag_url: URL de *vòstra* instà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: Allow public url for entries

View File

@ -0,0 +1,31 @@
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
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_twitter: Włącz udostępnianie dla Twitter
show_printlink: Pokaż link do wydrukowania zawartości
wallabag_support_url: Adres URL wsparcia dla wallabag
wallabag_url: Adres *twojej* instacji wallabag
entry: "artykuł"
export: "eksport"
import: "import"
misc: "różne"
modify_settings: "zatwierdz"
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

View File

@ -0,0 +1,29 @@
download_pictures: Download imagens no seu servidor
carrot: Habilitar compartilhamento para o Carrot
diaspora_url: URL Diaspora, se o serviço está 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
pocket_consumer_key: Chave de consumidor do Pocket para importar conteúdo (https://getpocket.com/developer/docs/authentication)
shaarli_url: URL Shaarli, se o serviço está habilitado
share_diaspora: Habilitar compartilhamento para o Diaspora
share_mail: Habilitar compartilhamento por e-mail
share_shaarli: Habilitar compartilhamento para o Shaarli
share_twitter: Habilitar compartilhamento para o Twitter
show_printlink: Mostrar um link para imprimir o conteúdo
wallabag_support_url: URL de Suporte do wallabag
wallabag_url: URL de *sua* instância 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"

View File

@ -0,0 +1,31 @@
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
share_diaspora: Permite share către Diaspora
share_mail: Permite share prin email
share_shaarli: Permite share către Shaarli
share_twitter: Permite share către Twitter
show_printlink: Afișează un link pentru a printa content-ul
wallabag_support_url: URL-ul de suport pentru wallabag
wallabag_url: URL-ul instanței tale 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

View File

@ -0,0 +1,31 @@
# 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
# share_diaspora: Enable share to Diaspora
# share_mail: Enable share by email
# share_shaarli: Enable share to Shaarli
# share_twitter: Enable share to Twitter
# 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

View File

@ -0,0 +1,43 @@
{% 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.section.vars.value == section %}
{{ form_row(setting.name) }}
{{ form_row(setting.section) }}
{{ form_row(setting.value, {
'label': setting.name.vars.value | trans({}, 'CraueConfigBundle'),
}) }}
{% endfor %}
</div>
{% endfor %}
</div>
<button class="btn waves-effect waves-light" type="submit" name="action">
{{ 'modify_settings' | trans({}, 'CraueConfigBundle') }}
</button>
{{ form_rest(form) }}
{{ form_end(form) }}
</div>
</div>
</div>
{% endblock %}

View File

@ -0,0 +1,2 @@
Login: "Log ind"
Enter your email address below and we'll send you password reset instructions.: "Indtast din emailadresse nedenfor, så sender vi dig instrukser til at nulstille din adgangskode."

View File

@ -0,0 +1,2 @@
Login: "Anmelden"
Enter your email address below and we'll send you password reset instructions.: "Tippe deine E-Mail-Adresse unten ein und wir senden dir die Anweisungen, wie du dein Kennwort zurücksetzen kannst."

View File

@ -0,0 +1,2 @@
Login: "Logearse"
Enter your email address below and we'll send you password reset instructions.: "Introduzca su dirección de email y le enviaremos las instrucciones para resetear su contraseña."

View File

@ -0,0 +1,2 @@
Login: "Se connecter"
Enter your email address below and we'll send you password reset instructions.: "Renseignez votre adresse courriel, nous vous enverrons les instructions pour réinitialiser votre mot de passe."

View File

@ -0,0 +1,2 @@
Login: "Se connectar"
Enter your email address below and we'll send you password reset instructions.: "Picatz vòstra adreça de corrièl çai-jos, vos mandarem las instruccions per reïnicializar vòstre senhal."

View File

@ -0,0 +1,2 @@
Login: "Logowanie"
Enter your email address below and we'll send you password reset instructions.: "Wpisz poniżej swój adres email, abyśmy mogli wysłać ci instrukcję resetowania hasła."

View File

@ -0,0 +1,2 @@
Login: "Login"
Enter your email address below and we'll send you password reset instructions.: "Digite seu endereço de e-mail para enviarmos as instruções de recupeção de sua senha."

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

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: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

View File

@ -0,0 +1,300 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="800px" height="800px" viewBox="0 0 800 800" overflow="visible" enable-background="new 0 0 800 800"
xml:space="preserve">
<defs>
</defs>
<image overflow="visible" width="800" height="800" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAMgCAYAAADbcAZoAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ
bWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdp
bj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6
eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEz
NDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJo
dHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlw
dGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAv
IiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RS
ZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpD
cmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBNYWNpbnRvc2giIHhtcE1NOkluc3RhbmNl
SUQ9InhtcC5paWQ6MkMyNzEzMDQ4QTgzMTFFM0JGNkJCRDhDMjI5OTRBNkIiIHhtcE1NOkRvY3Vt
ZW50SUQ9InhtcC5kaWQ6MkMyNzEzMDU4QTgzMTFFM0JGNkJCRDhDMjI5OTRBNkIiPiA8eG1wTU06
RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDoyQzI3MTMwMjhBODMxMUUzQkY2
QkJEOEMyMjk5NEE2QiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDoyQzI3MTMwMzhBODMxMUUz
QkY2QkJEOEMyMjk5NEE2QiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1w
bWV0YT4gPD94cGFja2V0IGVuZD0iciI/PtTNJDcAADxbSURBVHja7N37ddPK2gfgybf2/9ungm0q
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">
</image>
</svg>

After

Width:  |  Height:  |  Size: 22 KiB

View File

@ -0,0 +1,6 @@
top['bookmarklet-url@wallabag.org'] =
'<!DOCTYPE html><html><head><title>bag it!</title>' +
'<link rel="icon" href="tpl/img/favicon.ico" />' +
'</head><body><script>window.onload=function(){window.setTimeout' +
'(function(){history.back();},250);};</script></body></html>';

View File

@ -0,0 +1,50 @@
const $ = require('jquery');
function supportsLocalStorage() {
try {
return 'localStorage' in window && window.localStorage !== null;
} catch (e) {
return false;
}
}
function savePercent(id, percent) {
if (!supportsLocalStorage()) { return false; }
localStorage[`wallabag.article.${id}.percent`] = percent;
return true;
}
function retrievePercent(id) {
if (!supportsLocalStorage()) { return false; }
const bheight = $(document).height();
const percent = localStorage[`wallabag.article.${id}.percent`];
const scroll = bheight * percent;
$('html,body').animate({ scrollTop: scroll }, 'fast');
return true;
}
function initFilters() {
// no display if filters not available
if ($('div').is('#filters')) {
$('#button_filters').show();
$('.button-collapse-right').sideNav({ edge: 'right' });
$('#clear_form_filters').on('click', () => {
$('#filters input').val('');
$('#filters :checked').removeAttr('checked');
return false;
});
}
}
function initExport() {
// no display if export not available
if ($('div').is('#export')) {
$('#button_export').show();
$('.button-collapse-right').sideNav({ edge: 'right' });
}
}
export { savePercent, retrievePercent, initFilters, initExport };

View File

@ -0,0 +1,6 @@
@font-face {
font-family: "PT Sans";
font-style: normal;
font-weight: 700;
src: local("PT Sans Bold"), local("PTSans-Bold"), url("../fonts/ptsansbold.woff") format("woff");
}

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,19 @@
.messages.error.install {
border: 1px solid #c42608;
color: #c00 !important;
background: #fff0ef;
text-align: left;
}
.messages.notice.install {
border: 1px solid #ebcd41;
color: #000;
background: #fffcd3;
text-align: left;
}
.messages.success.install {
border: 1px solid #6dc70c;
background: #e0fbcc !important;
text-align: left;
}

View File

@ -0,0 +1,66 @@
@media print {
/* ### Layout ### */
body {
font-family: Serif;
background-color: #fff;
}
@page {
margin: 1cm;
}
img {
max-width: 100% !important;
}
/* ### Content ### */
/* Hide useless blocks */
body > header,
#article_toolbar,
#links,
#sort,
body > footer,
.top_link,
div.tools,
header div,
.messages,
.entrie + .results,
#article .mbm a,
#article-informations {
display: none !important;
}
article {
border: none !important;
}
/* Add URL after links */
.vieworiginal a::after {
content: " (" attr(href) ")";
}
/* Add explanation after abbr */
abbr[title]::after {
content: " (" attr(title) ")";
}
/* Change border on current pager item */
.pagination span.current {
border-style: dashed;
}
#main {
width: 100%;
padding: 0;
margin: 0;
margin-left: 0;
padding-right: 0;
padding-bottom: 0;
}
#article {
width: 100%;
}
}

View File

@ -0,0 +1,226 @@
/*
Ratatouille mini Framework css by Thomas LEBEAU
Base on KNACSS => www.KNACSS.com (2013-10) @author: Raphael Goetter, Alsacreations
and normalize.css
*/
* {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
html {
font-family: sans-serif; /* 1 */
-ms-text-size-adjust: 100%; /* 2 */
-webkit-text-size-adjust: 100%; /* 2 */
}
body {
font-size: 1em;
line-height: 1.5;
margin: 0;
}
/* ==========================================================================
Mise en forme
========================================================================== */
h1:first-child,
h2:first-child,
h3:first-child,
h4:first-child,
h5:first-child,
h6:first-child,
p:first-child,
ul:first-child,
ol:first-child,
dl:first-child {
margin-top: 0;
}
code,
kbd,
pre,
samp {
font-family: monospace, serif;
}
pre {
white-space: pre-wrap;
}
.upper {
text-transform: uppercase;
}
.bold {
font-weight: bold;
}
.inner {
margin: 0 auto;
max-width: 61.25em; /* 980px */
}
table,
img,
figure {
max-width: 100%;
height: auto;
}
iframe {
max-width: 100%;
}
.fl {
float: left;
}
.fr {
float: right;
}
table {
border-collapse: collapse;
}
figure {
margin: 0;
}
button,
input,
select,
textarea {
font-family: inherit;
font-size: 100%;
margin: 0;
}
input[type="search"] {
-webkit-appearance: textfield;
}
/* ==========================================================================
Mise en page
========================================================================== */
.dib {
display: inline-block;
vertical-align: middle;
}
.dnone {
display: none;
}
.dtable {
display: table;
}
.dtable > * {
display: table-row;
}
.dtable > * > * {
display: table-cell;
}
.element-invisible {
border: 0;
clip: rect(0 0 0 0);
height: 1px;
margin: -1px;
overflow: hidden;
padding: 0;
position: absolute;
width: 1px;
}
.small {
font-size: 0.8em;
}
.big {
font-size: 1.2em;
}
/* Width */
.w100 {
width: 100%;
}
.w90 {
width: 90%;
}
.w80 {
width: 80%;
}
.w70 {
width: 70%;
}
.w60 {
width: 60%;
}
.w50 {
width: 50%;
}
.w40 {
width: 40%;
}
.w30 {
width: 30%;
}
.w20 {
width: 20%;
}
.w10 {
width: 10%;
}
/* ==========================================================================
Internet Explorer
========================================================================== */
/* IE8 and IE9 */
article,
aside,
details,
figcaption,
figure,
footer,
header,
hgroup,
main,
nav,
section,
summary {
display: block;
}
/* IE8 and IE9 */
audio,
canvas,
video {
display: inline-block;
}
@media screen and (-webkit-min-device-pixel-ratio: 0) {
select {
-webkit-appearance: none;
border-radius: 0;
}
}

Binary file not shown.

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 307 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 141 B

View File

Before

Width:  |  Height:  |  Size: 216 B

After

Width:  |  Height:  |  Size: 216 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 201 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 229 B

View File

Before

Width:  |  Height:  |  Size: 212 B

After

Width:  |  Height:  |  Size: 212 B

View File

@ -0,0 +1,8 @@
function split(val) {
return val.split(/,\s*/);
}
function extractLast(term) {
return split(term).pop();
}
export { split, extractLast };

View File

@ -0,0 +1,314 @@
import { savePercent, retrievePercent } from '../../_global/js/tools';
import { toggleSaveLinkForm } from './uiTools';
const $ = global.jquery = require('jquery');
require('jquery.cookie');
require('jquery-ui-browserify');
const annotator = require('annotator');
$.fn.ready(() => {
const $listmode = $('#listmode');
const $listentries = $('#list-entries');
/* ==========================================================================
Menu
========================================================================== */
$('#menu').click(() => {
$('#links').toggleClass('menu--open');
const content = $('#content');
if (content.hasClass('opacity03')) {
content.removeClass('opacity03');
}
});
/* ==========================================================================
List mode or Table Mode
========================================================================== */
$listmode.click(() => {
if ($.cookie('listmode') === 1) {
// Cookie
$.removeCookie('listmode');
$listentries.removeClass('listmode');
$listmode.removeClass('tablemode');
$listmode.addClass('listmode');
} else {
// Cookie
$.cookie('listmode', 1, { expires: 365 });
$listentries.addClass('listmode');
$listmode.removeClass('listmode');
$listmode.addClass('tablemode');
}
});
/* ==========================================================================
Cookie listmode
========================================================================== */
if ($.cookie('listmode') === 1) {
$listentries.addClass('listmode');
$listmode.removeClass('listmode');
$listmode.addClass('tablemode');
}
/* ==========================================================================
Add tag panel
========================================================================== */
$('#nav-btn-add-tag').on('click', () => {
$('.nav-panel-add-tag').toggle(100);
$('.nav-panel-menu').addClass('hidden');
$('#tag_label').focus();
return false;
});
/**
* Filters & Export
*/
// no display if filters not available
if ($('div').is('#filters')) {
$('#button_filters').show();
$('#clear_form_filters').on('click', () => {
$('#filters input').val('');
$('#filters :checked').removeAttr('checked');
return false;
});
}
/* ==========================================================================
Annotations & Remember position
========================================================================== */
if ($('article').length) {
const app = new annotator.App();
app.include(annotator.ui.main, {
element: document.querySelector('article'),
});
const x = JSON.parse($('#annotationroutes').html());
app.include(annotator.storage.http, x);
app.start().then(() => {
app.annotations.load({ entry: x.entryId });
});
$(window).scroll(() => {
const scrollTop = $(window).scrollTop();
const docHeight = $(document).height();
const scrollPercent = (scrollTop) / (docHeight);
const scrollPercentRounded = Math.round(scrollPercent * 100) / 100;
savePercent(x.entryId, scrollPercentRounded);
});
retrievePercent(x.entryId);
$(window).resize(() => {
retrievePercent(x.entryId);
});
}
/**
* Close window after adding entry if popup
*/
const currentUrl = window.location.href;
if (currentUrl.match('&closewin=true')) {
window.close();
}
/**
* Tags autocomplete
*/
/**
* Not working on v2
*
$('#value').bind('keydown', (event) => {
if (event.keyCode === $.ui.keyCode.TAB && $(this).data('ui-autocomplete').menu.active) {
event.preventDefault();
}
}).autocomplete({
source: function source(request, response) {
$.getJSON('./?view=tags', {
term: extractLast(request.term),
//id: $(':hidden#entry_id').val()
}, response);
},
search: function search() {
// custom minLength
const term = extractLast(this.value);
return term.length >= 1;
},
focus: function focus() {
// prevent value inserted on focus
return false;
},
select: function select(event, ui) {
const terms = split(this.value);
// remove the current input
terms.pop();
// add the selected item
terms.push(ui.item.value);
// add placeholder to get the comma-and-space at the end
terms.push('');
this.value = terms.join(', ');
return false;
},
});
*/
//---------------------------------------------------------------------------
// Close the message box when the user clicks the close icon
//---------------------------------------------------------------------------
$('a.closeMessage').on('click', () => {
$(this).parents('div.messages').slideUp(300, () => { $(this).remove(); });
return false;
});
$('#search-form').hide();
$('#bagit-form').hide();
$('#filters').hide();
$('#download-form').hide();
//---------------------------------------------------------------------------
// Toggle the 'Search' popup in the sidebar
//---------------------------------------------------------------------------
function toggleSearch() {
$('#search-form').toggle();
$('#search').toggleClass('current');
$('#search').toggleClass('active-current');
$('#search-arrow').toggleClass('arrow-down');
if ($('#search').hasClass('current')) {
$('#content').addClass('opacity03');
} else {
$('#content').removeClass('opacity03');
}
}
//---------------------------------------------------------------------------
// Toggle the 'Filter' popup on entries list
//---------------------------------------------------------------------------
function toggleFilter() {
$('#filters').toggle();
}
//---------------------------------------------------------------------------
// Toggle the 'Download' popup on entries list
//---------------------------------------------------------------------------
function toggleDownload() {
$('#download-form').toggle();
}
//---------------------------------------------------------------------------
// Toggle the 'Save a Link' popup in the sidebar
//---------------------------------------------------------------------------
function toggleBagit() {
$('#bagit-form').toggle();
$('#bagit').toggleClass('current');
$('#bagit').toggleClass('active-current');
$('#bagit-arrow').toggleClass('arrow-down');
if ($('#bagit').hasClass('current')) {
$('#content').addClass('opacity03');
} else {
$('#content').removeClass('opacity03');
}
}
//---------------------------------------------------------------------------
// Close all #links popups in the sidebar
//---------------------------------------------------------------------------
function closePopups() {
$('#links .messages').hide();
$('#links > li > a').removeClass('active-current');
$('#links > li > a').removeClass('current');
$('[id$=-arrow]').removeClass('arrow-down');
$('#content').removeClass('opacity03');
}
$('#search').click(() => {
closePopups();
toggleSearch();
$('#searchfield').focus();
});
$('.filter-btn').click(() => {
closePopups();
toggleFilter();
});
$('.download-btn').click(() => {
closePopups();
toggleDownload();
});
$('#bagit').click(() => {
closePopups();
toggleBagit();
$('#plainurl').focus();
});
$('#search-form-close').click(() => {
toggleSearch();
});
$('#filter-form-close').click(() => {
toggleFilter();
});
$('#download-form-close').click(() => {
toggleDownload();
});
$('#bagit-form-close').click(() => {
toggleBagit();
});
const $bagitFormForm = $('#bagit-form-form');
/* ==========================================================================
bag it link and close button
========================================================================== */
// send 'bag it link' form request via ajax
$bagitFormForm.submit((event) => {
$('body').css('cursor', 'wait');
$('#add-link-result').empty();
$.ajax({
type: $bagitFormForm.attr('method'),
url: $bagitFormForm.attr('action'),
data: $bagitFormForm.serialize(),
success: function success() {
$('#add-link-result').html('Done!');
$('#plainurl').val('');
$('#plainurl').blur('');
$('body').css('cursor', 'auto');
},
error: function error() {
$('#add-link-result').html('Failed!');
$('body').css('cursor', 'auto');
},
});
event.preventDefault();
});
/* ==========================================================================
Process all links inside an article
========================================================================== */
$('article a[href^="http"]').after(
() => `<a href="${$(this).attr('href')}" class="add-to-wallabag-link-after" ` +
'alt="add to wallabag" title="add to wallabag"></a>'
);
$('.add-to-wallabag-link-after').click((event) => {
toggleSaveLinkForm($(this).attr('href'), event);
event.preventDefault();
});
});

View File

@ -0,0 +1,35 @@
const $ = require('jquery');
function toggleSaveLinkForm(url, event) {
$('#add-link-result').empty();
const $bagit = $('#bagit');
const $bagitForm = $('#bagit-form');
$bagit.toggleClass('active-current');
// only if bag-it link is not presented on page
if ($bagit.length === 0) {
if (event !== 'undefined' && event) {
$bagitForm.css({ position: 'absolute', top: event.pageY, left: event.pageX - 200 });
} else {
$bagitForm.css({ position: 'relative', top: 'auto', left: 'auto' });
}
}
const searchForm = $('#search-form');
const plainUrl = $('#plainurl');
if (searchForm.length !== 0) {
$('#search').removeClass('current');
$('#search-arrow').removeClass('arrow-down');
searchForm.hide();
}
$bagitForm.toggle();
$('#content').toggleClass('opacity03');
if (url !== 'undefined' && url) {
plainUrl.val(url);
}
plainUrl.focus();
}
export { toggleSaveLinkForm };

View File

@ -0,0 +1,880 @@
/* ==========================================================================
Sommaire
0 = Common
1 = Nav
2 = Side-nav
3 = Filters slider
4 = Cards
5 = Article
6 = Media queries
7 = Font
8 = Others
========================================================================== */
/* ==========================================================================
0 = Common
========================================================================== */
/**
*
* Material icons
*
*/
@font-face {
font-family: 'Material Icons';
font-style: normal;
font-weight: 400;
src: url(../fonts/MaterialIcons-Regular.eot);
/* For IE6-8 */
src: local("Material Icons"), local("MaterialIcons-Regular"), url(../fonts/MaterialIcons-Regular.woff2) format("woff2"), url(../fonts/MaterialIcons-Regular.woff) format("woff"), url(../fonts/MaterialIcons-Regular.ttf) format("truetype");
}
.material-icons {
font-family: 'Material Icons';
font-weight: normal;
font-style: normal;
font-size: 24px; /* Preferred icon size */
width: 1em;
height: 1em;
display: inline-block;
line-height: 1;
text-transform: none;
letter-spacing: normal;
word-wrap: normal;
white-space: nowrap;
direction: ltr;
/* Support for all WebKit browsers. */
-webkit-font-smoothing: antialiased;
/* Support for Safari and Chrome. */
text-rendering: optimizeLegibility;
/* Support for Firefox. */
-moz-osx-font-smoothing: grayscale;
/* Support for IE. */
font-feature-settings: 'liga';
}
/* 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); }
/**
*
* Icomoon icons
*
*/
@font-face {
font-family: icomoon;
src: url("../fonts/IcoMoon-Free.ttf");
font-weight: normal;
font-style: normal;
}
[class^="icon-"]::before,
[class*=" icon-"]::before {
font-family: icomoon;
speak: none;
font-style: normal;
font-weight: normal;
font-variant: normal;
text-transform: none;
line-height: 1;
background-size: 24px;
/* Enable Ligatures ================ */
letter-spacing: 0;
-webkit-font-feature-settings: "liga";
-moz-font-feature-settings: "liga=1";
-moz-font-feature-settings: "liga";
-ms-font-feature-settings: "liga" 1;
-o-font-feature-settings: "liga";
font-feature-settings: "liga";
/* Better Font Rendering =========== */
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.icon-image {
background-size: 16px;
background-repeat: no-repeat;
padding-right: 1em !important;
padding-left: 1em !important;
}
.icon-eye::before {
content: "\e9ce";
}
.icon-no-eye::before {
content: "\e9d1";
}
.icon-calendar::before {
content: "\e953";
}
.icon-mail::before {
content: "\ea86";
}
.icon-time::before {
content: "\e952";
}
/* Carrot (http://carrot.org) */
.icon-image--carrot {
background-image: url("../../_global/img/icons/carrot-icon--black.png");
}
/* Diaspora */
.icon-image--diaspora {
background-image: url("../../_global/img/icons/diaspora-icon--black.png");
}
/* Shaarli */
.icon-image--shaarli {
background-image: url("../../_global/img/icons/shaarli.png");
}
body {
display: flex;
min-height: 100vh;
flex-direction: column;
background: #f0f0f0;
}
body.login main {
padding: 0;
min-height: 100vh;
}
.border-bottom {
border-bottom: 1px solid #ddd;
}
nav,
main,
footer {
padding-left: 240px;
}
main,
#content,
.valign-wrapper {
height: 100%;
}
#main {
flex: 1 0 auto;
}
.results {
height: 1em;
line-height: 30px;
}
.results .nb-results,
.results .pagination {
margin: 15px;
margin-bottom: 0;
}
.pagination {
float: right;
}
.pagination ul {
margin: 0 !important;
}
.pagination li {
padding: 0;
}
.pagination a {
padding: 0 10px;
height: 30px;
display: block;
}
.pagination .disabled {
margin-right: 10px;
margin-left: 10px;
}
div.pagination ul .prev.disabled,
div.pagination ul .next.disabled {
display: none;
}
.pagination li.active span {
padding: 0 10px;
height: 30px;
display: block;
color: #fff;
}
.page-footer .footer-copyright {
min-width: 50px;
height: auto !important;
line-height: 1em !important;
}
.page-footer .footer-copyright p {
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
display: block;
}
.hidden {
display: none;
}
.picker__date-display {
display: none;
}
footer.page-footer {
margin-top: 10px;
padding-top: 0;
}
footer .row {
margin-bottom: 10px;
}
/* ==========================================================================
1 = Nav
========================================================================== */
nav input {
color: #aaa;
}
.nav-wrapper .button-collapse {
padding: 0 15px;
}
.nav-input {
display: none;
}
.nav-panels {
overflow: hidden;
}
.nav-panel-buttom li {
max-height: 64px;
}
.nav-panels {
transition: background 0.2s ease;
}
.nav-panel-add .add,
.nav-panel-search .search,
.nav-panels .close {
color: #444 !important;
}
.nav-panels .action {
padding-left: 0.75rem;
font-size: 2.1rem;
white-space: nowrap;
}
.nav-panels .input-field input {
display: block;
line-height: inherit;
padding-left: 4rem !important;
width: calc(100% - 8rem);
}
.nav-panels .input-field input:focus {
background-color: #fff;
border: 0;
box-shadow: none;
color: #444;
}
.input-field.nav-panel-add label {
left: 1rem;
}
.input-field.nav-panel-add .close {
position: absolute;
top: 0;
right: 1rem;
color: transparent;
cursor: pointer;
font-size: 2rem;
transition: 0.3s color;
}
#button_filters {
display: none;
}
#button_export {
display: none;
}
.input-field.nav-panel-add,
.input-field.nav-panel-add form {
height: 100%;
}
/* ==========================================================================
2 = Side-nav
========================================================================== */
.side-nav.fixed a {
font-size: 13px;
line-height: 44px;
height: 44px;
}
.side-nav .collapsible-header,
.side-nav.fixed .collapsible-header {
height: 45px;
line-height: 44px;
padding: 0 20px;
}
.bold > a {
font-weight: bold;
}
.side-nav > li.logo {
line-height: 0;
text-align: center;
}
#main .logo a {
height: 100pt;
}
#main .logo img {
height: 100pt;
width: 100pt;
}
#main .logo:hover {
background: transparent;
}
.side-nav li {
padding: 0;
}
.side-nav a {
margin: 0 1rem;
}
span.numberItems {
float: right;
}
nav ul a:hover {
background-color: initial;
}
/* ==========================================================================
* 3 = Filters slider
* ========================================================================== */
#filters button {
padding: 0;
width: 100%;
}
.side-nav.fixed.right-aligned {
right: -250px;
left: auto !important;
overflow-y: visible;
}
#filters div.with-checkbox {
height: 3rem;
margin-top: 0;
}
/* ==========================================================================
4 = Cards
========================================================================== */
main #content {
padding: 0 0.5rem;
}
main ul.row {
padding: 0 0.75rem;
}
.data .card .card-body {
height: 19em;
overflow: hidden;
}
.card .card-content .card-title,
.card .card-reveal .card-title {
line-height: 22.8px;
max-height: 80px;
font-size: 19px;
font-family: roberto, "Helvetica Neue", Helvetica, Arial, sans-serif;
color: #313131;
}
.card .card-content .activator,
.card .card-reveal .activator {
cursor: pointer;
font-family: "Material Icons";
}
.card .card-content i.right,
.card .card-reveal i.right {
margin-left: 0;
}
.card .card-content .original {
line-height: 24px;
font-size: 15px;
}
a.original {
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
display: block;
}
.card .card-entry-labels {
position: absolute;
top: 10px;
z-index: 90;
max-width: 50%;
}
.card .card-entry-labels li,
.card-tag-labels li {
margin: 10px 10px 10px auto;
padding: 5px 12px 5px 16px !important;
background-color: rgba(0, 151, 167, 0.85);
border-radius: 0 3px 3px 0;
color: #fff;
cursor: default;
max-height: 2em;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.card .card-entry-labels-hidden {
margin: 2.5px auto;
}
.card .card-entry-labels-hidden li {
display: inline-block;
background-color: rgba(0, 151, 167, 0.85);
margin: 0 5px;
padding: 5px 12px;
border-radius: 3px;
color: #fff;
max-height: 2em;
max-width: calc(100% - 15px);
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.card .card-entry-labels-hidden li:first-child {
margin-left: 0;
}
.card-entry-tags a,
.card-entry-labels a,
.card-tag-labels a,
.card-entry-labels-hidden a,
#list .chip a {
text-decoration: none;
font-weight: normal;
color: #fff;
}
.card .card-content .estimatedTime {
margin-bottom: 10px;
}
.card .card-action {
padding: 10px 5px 10px 15px;
}
.card .card-action ul.links {
margin: 0;
font-size: 24px;
line-height: 24px;
}
.card .card-action a {
color: #fff;
margin: 0;
}
.card .card-action a:hover {
color: #fff;
}
.card .card-action .reading-time {
display: inline-flex;
vertical-align: middle;
}
.quickstart .card .card-action a,
.quickstart .card .card-action a:hover {
color: #fff !important;
}
.settings .div_tabs {
padding-bottom: 15px;
}
.card.sw {
max-width: 370px;
margin-left: auto;
margin-right: auto;
}
.card .card-image {
height: 10em;
}
.card .card-fullimage {
height: 13.5em;
}
.card .card-image .preview,
.card .card-fullimage .preview {
height: 14em;
background-size: cover;
background-repeat: no-repeat;
background-position: 50%;
}
/* ==========================================================================
5 = Article
========================================================================== */
#article {
font-size: 20px;
margin: 0 auto;
max-width: 40em;
}
#article img,
#article figure {
max-width: 100%;
height: auto;
}
#article > header > h1 {
font-size: 2em;
margin: 2.1rem 0 0.68rem;
}
.reader-mode {
width: 95px !important;
transition: width 0.2s ease;
}
.reader-mode:hover {
width: 240px !important;
}
.reader-mode .collapsible-body {
height: 0;
overflow: hidden;
}
.reader-mode:hover .collapsible-body {
height: auto;
}
.reader-mode span {
opacity: 0;
transition: opacity 0.2s ease;
}
.reader-mode:hover span {
opacity: 1;
}
.progress {
position: fixed;
top: 0;
width: 100%;
height: 3px;
margin: 0;
z-index: 9999;
}
#article aside .tools {
font-size: 0.8em;
display: flex;
flex-flow: row wrap;
margin: 0 auto;
}
article aside .tools li {
display: inline-flex;
vertical-align: middle;
}
#article aside .tools a {
color: #000;
text-decoration: none;
}
#article aside #list {
float: right;
margin: 0 15px 10px;
}
#article aside .chip {
background-color: rgba(0, 151, 167, 0.85);
padding: 0 15px 0 10px;
margin: auto 2px;
}
#article aside .chip a,
#article aside .chip i {
color: #fff;
}
/* ==========================================================================
6 = Media queries
========================================================================== */
@media only screen and (max-width: 992px) {
header,
main,
footer {
padding-left: 0;
}
nav,
main,
footer {
padding-left: 0;
}
.pagination {
width: auto;
}
#article {
max-width: 35em;
margin-left: auto;
margin-right: auto;
font-size: 18px;
}
#article > header > h1 {
font-size: 1.33em;
}
.reader-mode {
width: 240px !important;
}
.reader-mode span {
opacity: 1;
}
.tabs {
display: inline-block;
height: auto;
}
.tab {
min-width: 100%;
}
.indicator {
display: none;
}
.pagination li.prev,
.pagination li.next {
width: auto;
}
}
@media only screen and (min-width: 400px) {
.nav-panel-buttom {
float: right;
}
}
@media only screen and (min-width: 1200px) and (max-width: 1650px) {
.row .col.l3 {
width: 33.33333%;
margin-left: 0;
}
}
@media only screen and (min-width: 993px) and (max-width: 1200px) {
.row .col.l1 {
width: 25%;
margin-left: 0;
}
.row .col.l2 {
width: 33.33333%;
margin-left: 0;
}
.row .col.l3 {
width: 41.66667%;
margin-left: 0;
}
.row .col.l4 {
width: 50%;
margin-left: 0;
}
.row .col.l5 {
width: 58.33333%;
margin-left: 0;
}
.row .col.l6 {
width: 66.66667%;
margin-left: 0;
}
.row .col.l7 {
width: 75%;
margin-left: 0;
}
.row .col.l8 {
width: 83.33333%;
margin-left: 0;
}
.row .col.l9 {
width: 91.66667%;
margin-left: 0;
}
.row .col.l10 {
width: 100%;
margin-left: 0;
}
}
@media only screen and (max-width: 350px) {
.nb-results {
display: none;
}
main ul.row {
padding: 0;
}
.row .col {
padding: 0;
}
}
/* ==========================================================================
7 = Font
========================================================================== */
.icon-google-plus2::before {
content: "\ea89";
}
.icon-facebook2::before {
content: "\ea8d";
}
.icon-twitter::before {
content: "\ea96";
}
.icon-apple::before {
content: "\eabf";
}
.icon-android::before {
content: "\eac1";
}
.icon-chrome::before {
content: "\eae5";
}
.icon-firefox::before {
content: "\eae6";
}
.icon-link::before {
content: "\e9cb";
}
footer [class^="icon-"],
footer [class*=" icon-"] {
font-size: 2em;
transition: text-shadow 0.2s ease;
padding-right: 10px;
}
footer [class^="icon-"]:hover,
footer [class*=" icon-"]:hover {
text-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
}
/* ==========================================================================
8 = Others
========================================================================== */
/* force height on non-input field in the settings page */
div.settings div.input-field div,
div.settings div.input-field ul {
margin-top: 40px;
}
/* but avoid to kill all file input */
div.settings div.file-field div {
margin-top: inherit;
}
.input-field label.active {
font-size: 1rem;
}
nav .input-field input {
margin: 0;
}

View File

@ -0,0 +1,77 @@
@media print {
/* ### Layout ### */
body {
font-family: Serif;
background-color: #fff;
}
@page {
margin: 1cm;
}
img {
max-width: 100% !important;
}
/* ### Content ### */
/* Hide useless blocks */
body > header,
#article_toolbar,
#links,
#sort,
body > footer,
.top_link,
div.tools,
header div,
.messages,
.entry + .results,
#slide-out,
.progress,
.hide-on-large-only,
#article > aside,
#article .mbm a {
display: none !important;
}
main {
padding-left: 0 !important;
}
#article {
margin: inherit !important;
}
article {
border: none !important;
}
/* Add URL after links */
.vieworiginal a::after {
content: " (" attr(href) ")";
}
/* Add explanation after abbr */
abbr[title]::after {
content: " (" attr(title) ")";
}
/* Change border on current pager item */
.pagination span.current {
border-style: dashed;
}
#main {
width: 100%;
padding: 0;
margin: 0;
margin-left: 0;
padding-right: 0;
padding-bottom: 0;
}
#article {
width: 100%;
}
}

View File

@ -0,0 +1,99 @@
import { savePercent, retrievePercent, initFilters, initExport } from '../../_global/js/tools';
const $ = require('jquery');
global.jQuery = $;
require('materialize'); // eslint-disable-line
const annotator = require('annotator');
$(document).ready(() => {
// sideNav
$('.button-collapse').sideNav();
$('select').material_select();
$('.collapsible').collapsible({
accordion: false,
});
$('.datepicker').pickadate({
selectMonths: true,
selectYears: 15,
formatSubmit: 'dd/mm/yyyy',
hiddenName: true,
format: 'dd/mm/yyyy',
});
initFilters();
initExport();
$('#nav-btn-add-tag').on('click', () => {
$('.nav-panel-add-tag').toggle(100);
$('.nav-panel-menu').addClass('hidden');
$('#tag_label').focus();
return false;
});
$('#nav-btn-add').on('click', () => {
$('.nav-panel-buttom').hide(100);
$('.nav-panel-add').show(100);
$('.nav-panels .action').hide(100);
$('.nav-panel-menu').addClass('hidden');
$('.nav-panels').css('background', 'white');
$('#entry_url').focus();
return false;
});
$('#nav-btn-search').on('click', () => {
$('.nav-panel-buttom').hide(100);
$('.nav-panel-search').show(100);
$('.nav-panels .action').hide(100);
$('.nav-panel-menu').addClass('hidden');
$('.nav-panels').css('background', 'white');
$('#searchfield').focus();
return false;
});
$('.close').on('click', () => {
$('.nav-panel-add').hide(100);
$('.nav-panel-search').hide(100);
$('.nav-panel-buttom').show(100);
$('.nav-panels .action').show(100);
$('.nav-panel-menu').removeClass('hidden');
$('.nav-panels').css('background', 'transparent');
return false;
});
$(window).scroll(() => {
const s = $(window).scrollTop();
const d = $(document).height();
const c = $(window).height();
const scrollPercent = (s / (d - c)) * 100;
$('.progress .determinate').css('width', `${scrollPercent}%`);
});
/* ==========================================================================
Annotations & Remember position
========================================================================== */
if ($('article').length) {
const app = new annotator.App();
const x = JSON.parse($('#annotationroutes').html());
app.include(annotator.ui.main, {
element: document.querySelector('article'),
});
app.include(annotator.storage.http, x);
app.start().then(() => {
app.annotations.load({ entry: x.entryId });
});
$(window).scroll(() => {
const scrollTop = $(window).scrollTop();
const docHeight = $(document).height();
const scrollPercent = (scrollTop) / (docHeight);
const scrollPercentRounded = Math.round(scrollPercent * 100) / 100;
savePercent(x.entryId, scrollPercentRounded);
});
retrievePercent(x.entryId);
$(window).resize(() => {
retrievePercent(x.entryId);
});
}
});

13
app/autoload.php Normal file
View File

@ -0,0 +1,13 @@
<?php
use Doctrine\Common\Annotations\AnnotationRegistry;
use Composer\Autoload\ClassLoader;
/**
* @var ClassLoader $loader
*/
$loader = require __DIR__.'/../vendor/autoload.php';
AnnotationRegistry::registerLoader([$loader, 'loadClass']);
return $loader;

View File

@ -0,0 +1,19 @@
# config valid only for current version of Capistrano
set :application, 'wallabag'
set :repo_url, 'git@github.com:wallabag/wallabag.git'
set :ssh_user, 'framasoft_bag'
server '78.46.248.87', user: fetch(:ssh_user), roles: %w{web app db}
set :format, :pretty
set :log_level, :info
# set :log_level, :debug
set :composer_install_flags, '--no-dev --prefer-dist --no-interaction --optimize-autoloader'
set :linked_files, %w{app/config/parameters.yml}
set :linked_dirs, [fetch(:log_path), "var/sessions", "web/uploads", "data"]
set :keep_releases, 3
after 'deploy:updated', 'symfony:cache:clear'

View File

@ -0,0 +1,2 @@
set :branch, 'master'
set :deploy_to, '/var/www/v2.wallabag.org/web/'

325
app/config/config.yml Normal file
View File

@ -0,0 +1,325 @@
imports:
- { resource: parameters.yml }
- { resource: security.yml }
- { resource: services.yml }
framework:
#esi: ~
translator:
enabled: true
fallback: "%locale%"
secret: "%secret%"
router:
resource: "%kernel.root_dir%/config/routing.yml"
strict_requirements: ~
form: ~
csrf_protection: ~
validation:
enable_annotations: true
templating:
engines: ['twig']
default_locale: "%locale%"
trusted_hosts: ~
trusted_proxies: ~
session:
# handler_id set to null will use default session handler from php.ini
handler_id: session.handler.native_file
save_path: "%kernel.root_dir%/../var/sessions/%kernel.environment%"
fragments: ~
http_method_override: true
assets: ~
wallabag_core:
version: 2.1.4
paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
languages:
en: 'English'
fr: 'Français'
de: 'Deutsch'
tr: 'Türkçe'
fa: 'فارسی'
ro: 'Română'
pl: 'Polish'
da: 'Dansk'
es: 'Español'
oc: 'Occitan'
it: 'Italiano'
pt: 'Português'
items_on_page: 12
theme: material
language: '%locale%'
rss_limit: 50
reading_speed: 1
cache_lifetime: 10
fetching_error_message: |
wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
wallabag_user:
registration_enabled: "%fosuser_registration%"
wallabag_import:
allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv']
resource_dir: "%kernel.root_dir%/../web/uploads/import"
# Twig Configuration
twig:
debug: "%kernel.debug%"
strict_variables: "%kernel.debug%"
form_themes:
- "LexikFormFilterBundle:Form:form_div_layout.html.twig"
exception_controller: wallabag_core.exception_controller:showAction
# Doctrine Configuration
doctrine:
dbal:
driver: "%database_driver%"
host: "%database_host%"
port: "%database_port%"
dbname: "%database_name%"
user: "%database_user%"
password: "%database_password%"
charset: UTF8
path: "%database_path%"
unix_socket: "%database_socket%"
server_version: 5.6
orm:
auto_generate_proxy_classes: "%kernel.debug%"
entity_managers:
default:
auto_mapping: true
stof_doctrine_extensions:
default_locale: "%locale%"
translation_fallback: true
orm:
default:
tree: true
sluggable: true
doctrine_migrations:
dir_name: "%kernel.root_dir%/DoctrineMigrations"
namespace: Application\Migrations
table_name: migration_versions
name: Application Migrations
# Swiftmailer Configuration
swiftmailer:
transport: "%mailer_transport%"
host: "%mailer_host%"
username: "%mailer_user%"
password: "%mailer_password%"
spool:
type: memory
fos_rest:
param_fetcher_listener: true
body_listener: true
format_listener: true
view:
view_response_listener: 'force'
formats:
xml: true
json : true
templating_formats:
html: true
force_redirects:
html: true
failed_validation: HTTP_BAD_REQUEST
default_engine: twig
routing_loader:
default_format: json
nelmio_api_doc:
sandbox:
enabled: false
name: wallabag API documentation
nelmio_cors:
defaults:
allow_credentials: false
allow_origin: []
allow_headers: []
allow_methods: []
expose_headers: []
max_age: 0
hosts: []
#origin_regex: false
paths:
'^/api/':
allow_origin: ['*']
allow_headers: ['X-Custom-Auth']
allow_methods: ['POST', 'PUT', 'PATCH','GET', 'DELETE']
max_age: 3600
'^/oauth/':
allow_origin: ['*']
allow_headers: ['X-Custom-Auth']
allow_methods: ['POST', 'PUT', 'GET', 'DELETE']
max_age: 3600
'^/':
#origin_regex: true
allow_origin: ['^http://localhost:[0-9]+']
allow_headers: ['X-Custom-Auth']
allow_methods: ['POST', 'PUT', 'GET', 'DELETE']
max_age: 3600
hosts: ['^api\.']
liip_theme:
load_controllers: false
themes:
- baggy
- material
autodetect_theme: wallabag_core.helper.detect_active_theme
path_patterns:
bundle_resource:
- "%%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%"
fos_user:
db_driver: orm
firewall_name: secured_area
user_class: Wallabag\UserBundle\Entity\User
registration:
confirmation:
enabled: "%fosuser_confirmation%"
from_email:
address: "%from_email%"
sender_name: wallabag
fos_oauth_server:
db_driver: orm
client_class: Wallabag\ApiBundle\Entity\Client
access_token_class: Wallabag\ApiBundle\Entity\AccessToken
refresh_token_class: Wallabag\ApiBundle\Entity\RefreshToken
auth_code_class: Wallabag\ApiBundle\Entity\AuthCode
service:
user_provider: fos_user.user_manager
scheb_two_factor:
trusted_computer:
enabled: true
cookie_name: wllbg_trusted_computer
cookie_lifetime: 2592000
email:
enabled: "%twofactor_auth%"
sender_email: "%twofactor_sender%"
digits: 6
template: WallabagUserBundle:Authentication:form.html.twig
mailer: wallabag_user.auth_code_mailer
kphoen_rulerz:
executors:
doctrine: true
lexik_maintenance:
authorized:
ips: ['127.0.0.1']
driver:
ttl: 3600
class: 'Lexik\Bundle\MaintenanceBundle\Drivers\DatabaseDriver'
response:
code: 503
status: "wallabag Service Temporarily Unavailable"
old_sound_rabbit_mq:
connections:
default:
host: "%rabbitmq_host%"
port: "%rabbitmq_port%"
user: "%rabbitmq_user%"
password: "%rabbitmq_password%"
vhost: /
lazy: true
producers:
import_pocket:
connection: default
exchange_options:
name: 'wallabag.import.pocket'
type: topic
import_readability:
connection: default
exchange_options:
name: 'wallabag.import.readability'
type: topic
import_instapaper:
connection: default
exchange_options:
name: 'wallabag.import.instapaper'
type: topic
import_wallabag_v1:
connection: default
exchange_options:
name: 'wallabag.import.wallabag_v1'
type: topic
import_wallabag_v2:
connection: default
exchange_options:
name: 'wallabag.import.wallabag_v2'
type: topic
import_firefox:
connection: default
exchange_options:
name: 'wallabag.import.firefox'
type: topic
import_chrome:
connection: default
exchange_options:
name: 'wallabag.import.chrome'
type: topic
consumers:
import_pocket:
connection: default
exchange_options:
name: 'wallabag.import.pocket'
type: topic
queue_options:
name: 'wallabag.import.pocket'
callback: wallabag_import.consumer.amqp.pocket
import_readability:
connection: default
exchange_options:
name: 'wallabag.import.readability'
type: topic
queue_options:
name: 'wallabag.import.readability'
callback: wallabag_import.consumer.amqp.readability
import_instapaper:
connection: default
exchange_options:
name: 'wallabag.import.instapaper'
type: topic
queue_options:
name: 'wallabag.import.instapaper'
callback: wallabag_import.consumer.amqp.instapaper
import_wallabag_v1:
connection: default
exchange_options:
name: 'wallabag.import.wallabag_v1'
type: topic
queue_options:
name: 'wallabag.import.wallabag_v1'
callback: wallabag_import.consumer.amqp.wallabag_v1
import_wallabag_v2:
connection: default
exchange_options:
name: 'wallabag.import.wallabag_v2'
type: topic
queue_options:
name: 'wallabag.import.wallabag_v2'
callback: wallabag_import.consumer.amqp.wallabag_v2
import_firefox:
connection: default
exchange_options:
name: 'wallabag.import.firefox'
type: topic
queue_options:
name: 'wallabag.import.firefox'
callback: wallabag_import.consumer.amqp.firefox
import_chrome:
connection: default
exchange_options:
name: 'wallabag.import.chrome'
type: topic
queue_options:
name: 'wallabag.import.chrome'
callback: wallabag_import.consumer.amqp.chrome

50
app/config/config_dev.yml Normal file
View File

@ -0,0 +1,50 @@
imports:
- { resource: config.yml }
framework:
router:
resource: "%kernel.root_dir%/config/routing_dev.yml"
strict_requirements: true
profiler:
only_exceptions: false
web_profiler:
toolbar: true
intercept_redirects: false
monolog:
handlers:
main:
type: stream
path: "%kernel.logs_dir%/%kernel.environment%.log"
level: debug
channels: ['!event']
console:
type: console
bubble: false
verbosity_levels:
VERBOSITY_VERBOSE: INFO
VERBOSITY_VERY_VERBOSE: DEBUG
channels: ['!event', '!doctrine']
console_very_verbose:
type: console
bubble: false
verbosity_levels:
VERBOSITY_VERBOSE: NOTICE
VERBOSITY_VERY_VERBOSE: NOTICE
VERBOSITY_DEBUG: DEBUG
channels: [doctrine]
swiftmailer:
# see http://mailcatcher.me/
transport: smtp
host: 'localhost'
port: 1025
# If you want to use cache for queries used in WallabagExtension
# Uncomment the following lines
#doctrine:
# orm:
# metadata_cache_driver: apcu
# result_cache_driver: apcu
# query_cache_driver: apcu

View File

@ -0,0 +1,25 @@
imports:
- { resource: config.yml }
#framework:
# cache:
# system: cache.adapter.apcu
#doctrine:
# orm:
# metadata_cache_driver: apc
# result_cache_driver: apc
# query_cache_driver: apc
monolog:
handlers:
main:
type: fingers_crossed
action_level: error
handler: nested
nested:
type: stream
path: "%kernel.logs_dir%/%kernel.environment%.log"
level: debug
console:
type: console

View File

@ -0,0 +1,39 @@
imports:
- { resource: config_dev.yml }
- { resource: parameters_test.yml }
framework:
test: ~
session:
storage_id: session.storage.mock_file
profiler:
collect: false
translator:
enabled: false
web_profiler:
toolbar: false
intercept_redirects: false
swiftmailer:
# to be able to read emails sent
spool:
type: file
doctrine:
dbal:
driver: "%test_database_driver%"
host: "%test_database_host%"
port: "%test_database_port%"
dbname: "%test_database_name%"
user: "%test_database_user%"
password: "%test_database_password%"
charset: UTF8
path: "%test_database_path%"
orm:
metadata_cache_driver:
type: service
id: filesystem_cache
query_cache_driver:
type: service
id: filesystem_cache

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