Nicolas Lœuillet
c72c6f43f2
Merge pull request #2632 from wallabag/mruminski-patch-1
...
Update messages.pl.yml
2016-11-21 20:17:33 +01:00
Mateusz Rumiński
4bf5172585
Update messages.pl.yml
...
missing polish translation added
2016-11-21 18:18:52 +01:00
Jeremy Benoist
1f00547836
Merge pull request #2630 from ThibaudDauce/fix-black-headings
...
Add white-text class to card-title too
2016-11-21 17:06:55 +01:00
Thibaud Dauce
4f2755a61d
Add white-text class to card-title too
2016-11-21 15:37:47 +01:00
Jeremy Benoist
eb2d613c3e
Merge remote-tracking branch 'origin/master' into 2.2
2016-11-21 15:15:30 +01:00
Jeremy Benoist
625bb56181
Merge pull request #2624 from Rurik19/master
...
Fix #2056 update config.yml
2016-11-21 13:14:31 +01:00
Nicolas Lœuillet
83fed2648b
Merge pull request #2625 from wallabag/prepare-215
...
Prepare wallabag 2.1.5
2016-11-21 09:49:34 +01:00
Nicolas Lœuillet
98253436e9
Prepare wallabag 2.1.5 🚀
2016-11-21 09:20:27 +01:00
Jeremy Benoist
e839f87a1c
Merge pull request #2623 from wallabag/composer-php-5.5
...
Force composer to run as PHP 5.5.9
2016-11-21 09:01:35 +01:00
Jeremy Benoist
f32ff37534
Lock down PHPUnit for PHP 5.5
...
Since Composer defined lowest version is now PHP 5.5.9.
PHPUnit 5.0 require PHP 5.6.
2016-11-21 07:46:46 +01:00
Yuriy Evdokimov
05cdd393d8
wrong spaces
2016-11-21 11:29:09 +05:00
Yuriy Evdokimov
5e7fdfc8dd
Fix #2056 update config.yml
...
Resolves refresh token lifetime issue
2016-11-21 11:13:40 +05:00
Jeremy Benoist
c396a50509
Force composer to run as PHP 5.5.9
2016-11-20 23:07:38 +01:00
Jeremy Benoist
a38d50e1e8
Merge pull request #2621 from wallabag/redis-password
...
Add ability to use Redis with password
2016-11-20 22:27:05 +01:00
Julian Oster
59c42a4aad
Add german translation
2016-11-20 20:43:05 +01:00
Jeremy Benoist
c1683778ab
Add ability to use Redis with password
2016-11-20 20:43:04 +01:00
Jeremy Benoist
5ae8788583
Merge pull request #2609 from wallabag/rss-paging
...
RSS paging
2016-11-20 10:17:37 +01:00
Jeremy Benoist
16eb124e4a
Add documentation about RSS paging
2016-11-20 09:50:52 +01:00
Jeremy Benoist
edd2472faa
Fix tests
2016-11-20 09:39:26 +01:00
Jeremy Benoist
8670250a26
Add RSS pagination
...
Following https://tools.ietf.org/html/rfc5005#page-4
2016-11-20 09:39:26 +01:00
Jeremy Benoist
3c969d3990
Add missing translations
2016-11-20 09:39:25 +01:00
Nicolas Lœuillet
6f85bed294
Merge pull request #2543 from wallabag/search-engine
...
Added a simple search engine
2016-11-19 20:42:27 +01:00
Nicolas Lœuillet
995c204428
Added shortcut
2016-11-19 20:05:16 +01:00
Nicolas Lœuillet
32f455c131
Added tests
2016-11-19 20:05:16 +01:00
Nicolas Lœuillet
49b042dfdf
Added translations and currentRoute parameter
2016-11-19 19:17:30 +01:00
Nicolas Lœuillet
398de40517
Added search engine in baggy theme
2016-11-19 19:17:30 +01:00
Nicolas Lœuillet
ee122a7528
Added a simple search engine
...
Fix #18
2016-11-19 19:17:30 +01:00
Jeremy Benoist
27dce581ca
Messed up DE import translation
2016-11-19 15:39:02 +01:00
Jeremy Benoist
68003139e1
Merge remote-tracking branch 'origin/master' into 2.2
...
# Conflicts:
# .editorconfig
# docs/de/index.rst
# docs/de/user/import.rst
# docs/en/index.rst
# docs/en/user/configuration.rst
# docs/en/user/import.rst
# docs/fr/index.rst
# docs/fr/user/import.rst
# src/Wallabag/CoreBundle/Command/InstallCommand.php
# src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
# src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
# web/bundles/wallabagcore/themes/baggy/css/style.min.css
# web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
# web/bundles/wallabagcore/themes/material/css/style.min.css
# web/bundles/wallabagcore/themes/material/js/material.min.js
2016-11-19 15:30:49 +01:00
Jeremy Benoist
cb1a6590c0
Merge pull request #2608 from wallabag/change-dev-version
...
Change version to 2.2.0-dev
2016-11-19 14:56:47 +01:00
Nicolas Lœuillet
8fdadee3a5
Change version to 2.2.0-dev
2016-11-19 14:28:25 +01:00
Nicolas Lœuillet
00b1dc0eb0
Merge pull request #2607 from wallabag/update-changelog
...
Updated changelog for 2.1.4
2016-11-19 14:03:18 +01:00
Nicolas Lœuillet
442dcb8ec1
Updated changelog for 2.1.4
2016-11-19 14:02:32 +01:00
Jeremy Benoist
bbd4ae7b56
Merge pull request #2600 from wallabag/install-assets
...
Install assets for shortcuts
2016-11-19 12:23:16 +01:00
Nicolas Lœuillet
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
Nicolas Lœuillet
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
Nicolas Lœuillet
8add306204
Merge pull request #2601 from wallabag/store-http-status
...
Added http_status in Entry entity
2016-11-19 11:53:41 +01:00
Jeremy Benoist
45277ad2bd
Add .travis.yml change to RELEASE_PROCESS
2016-11-19 11:43:47 +01:00
Jeremy Benoist
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
Jeremy Benoist
cffcce0c92
Wallabag can’t work on PostgreSQL <= 9.1
2016-11-19 11:32:56 +01:00
Jeremy Benoist
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
Nicolas Lœuillet
d215273c65
Check if status code is OK
2016-11-18 23:05:02 +01:00
Nicolas Lœuillet
e10e6ab34e
Replace http status with a string
...
I don't want to have 0 if we don't fetch status code, I think it's better to have an empty string, mainly for filters
2016-11-18 15:55:16 +01:00
Nicolas Lœuillet
10b3509757
Added http_status in Entry entity
2016-11-18 15:09:21 +01:00
Jeremy Benoist
74216c7c74
Install assets for shortcuts
2016-11-18 14:12:26 +01:00
Nicolas Lœuillet
8853914ba4
Merge pull request #2596 from wallabag/prepare-214
...
Prepare wallabag 2.1.4 🚀
2016-11-18 10:24:55 +01:00
Nicolas Lœuillet
5d2971cadd
Prepare wallabag 2.1.4 🚀
2016-11-18 10:00:29 +01:00
Nicolas Lœuillet
19d401b15c
Merge pull request #2550 from wallabag/reorder-documentation
...
Reordered documentation
2016-11-18 09:28:20 +01:00
Jeremy Benoist
b060fbdfe7
Merge pull request #2593 from wallabag/test-clarify
...
Put log in the most common failure tests
2016-11-18 09:21:27 +01:00
Julian Oster
50540682ff
Undo translation of 'in english'.
2016-11-18 09:08:16 +01:00
