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
Jeremy Benoist
c15d5a3af8
Merge pull request #2592 from wallabag/mruminski-patch-1
...
Update messages.pl.yml
2016-11-17 20:03:40 +01:00
Jeremy Benoist
5cc367b83a
Fix tests
2016-11-17 19:58:10 +01:00
Jeremy Benoist
d8a35aba49
Put log in the most common failure tests
...
So we’ll quickly be able to see what kind of test is failing when viewing Travis
2016-11-17 19:30:50 +01:00
Julian Oster
2bc5b74c73
Reordered documentation for German.
2016-11-17 19:22:21 +01:00
Julian Oster
887303889b
Update translation of link to german translation.
2016-11-17 19:22:19 +01:00
Nicolas Lœuillet
bb624c0269
Reordered 🇫🇷 documentation
2016-11-17 19:22:16 +01:00
Nicolas Lœuillet
2e389b0b90
Reordered documentation
2016-11-17 19:22:15 +01:00
Mateusz Rumiński
52e01d3483
Update messages.pl.yml
...
translate action_mark_as_read section to polish
2016-11-17 18:52:42 +01:00
Nicolas Lœuillet
9e0a49e6ac
Merge pull request #2578 from wallabag/questionmark-icon
...
Added help on config screen
2016-11-17 09:53:14 +01:00
Jeremy Benoist
66336f6571
Merge pull request #2547 from wallabag/add-option-markasread
...
Added a configuration to define the redirection after archiving an entry
2016-11-17 09:40:46 +01:00
Nicolas Lœuillet
c894d76e57
Added tooltips for baggy theme
2016-11-17 09:22:39 +01:00
Nicolas Lœuillet
540a9bc4a2
Added help on config screen
2016-11-17 09:22:39 +01:00
Jeremy Benoist
9e2440fe15
Fix migration
2016-11-17 08:05:15 +01:00
Jeremy Benoist
e6b133c60c
CS
2016-11-16 23:10:01 +01:00
Jeremy Benoist
00bf45b6f2
Update unit test for Redirect
2016-11-16 23:07:34 +01:00
Nicolas Lœuillet
54fd55fda1
Tried to fix tests
2016-11-16 23:07:34 +01:00
Nicolas Lœuillet
65cd8a4a9a
Added tests
2016-11-16 23:07:34 +01:00
Nicolas Lœuillet
f052f1fd57
Added constants for redirection values
2016-11-16 23:07:34 +01:00
Strubbl
287204cda7
Update messages.en.yml
2016-11-16 23:07:34 +01:00
Strubbl
f0ba37fbd5
Update messages.de.yml
2016-11-16 23:07:34 +01:00
Strubbl
5d52cc411b
update German configuration.rst
2016-11-16 23:07:34 +01:00
Nicolas Lœuillet
a42f38d9fb
Added a configuration to define the redirection after archiving an entry
...
Fix #496
2016-11-16 23:07:34 +01:00
Nicolas Lœuillet
e042a5d78f
Merge pull request #2495 from wallabag/add-shortcuts
...
Added shortcuts
2016-11-16 09:35:59 +01:00
