]>
git.immae.eu Git - github/wallabag/wallabag.git/log
Mateusz Rumiński [Tue, 22 Nov 2016 18:24:38 +0000 (19:24 +0100)]
Update messages.pl.yml
translate shortcuts section to polish
Thomas Citharel [Tue, 22 Nov 2016 13:10:12 +0000 (14:10 +0100)]
Merge pull request #2612 from wallabag/add-shortcuts-help
Added help about shortcuts
Nicolas Lœuillet [Tue, 22 Nov 2016 12:33:06 +0000 (13:33 +0100)]
Translations for shortcuts help
Nicolas Lœuillet [Sun, 20 Nov 2016 09:11:57 +0000 (10:11 +0100)]
Added help about shortcuts
Jeremy Benoist [Tue, 22 Nov 2016 10:27:55 +0000 (11:27 +0100)]
Merge pull request #2635 from wallabag/304-reload
Return 304 when content isn't reloaded using the API
Jeremy Benoist [Tue, 22 Nov 2016 09:45:17 +0000 (10:45 +0100)]
Return 304 when content isn't reloaded using the API
Previously it was a 400 but this is more related to a real error.
Using the API user should only know the content got reloaded or not.
If reloaded: 200 otherwise: 304.
Thomas Citharel [Tue, 22 Nov 2016 09:27:14 +0000 (10:27 +0100)]
Merge pull request #2613 from wallabag/fix-overlap
Fix card action overlap
Nicolas Lœuillet [Tue, 22 Nov 2016 08:39:43 +0000 (09:39 +0100)]
Merge pull request #2614 from wallabag/api-reload
Add ability to reload entry from API
Nicolas Lœuillet [Mon, 21 Nov 2016 19:17:33 +0000 (20:17 +0100)]
Merge pull request #2632 from wallabag/mruminski-patch-1
Update messages.pl.yml
Mateusz Rumiński [Mon, 21 Nov 2016 17:18:52 +0000 (18:18 +0100)]
Update messages.pl.yml
missing polish translation added
Jeremy Benoist [Mon, 21 Nov 2016 16:06:55 +0000 (17:06 +0100)]
Merge pull request #2630 from ThibaudDauce/fix-black-headings
Add white-text class to card-title too
Thibaud Dauce [Mon, 21 Nov 2016 14:37:47 +0000 (15:37 +0100)]
Add white-text class to card-title too
Jeremy Benoist [Mon, 21 Nov 2016 14:15:30 +0000 (15:15 +0100)]
Merge remote-tracking branch 'origin/master' into 2.2
Jeremy Benoist [Mon, 21 Nov 2016 12:14:31 +0000 (13:14 +0100)]
Merge pull request #2624 from Rurik19/master
Fix #2056 update config.yml
Nicolas Lœuillet [Mon, 21 Nov 2016 08:49:34 +0000 (09:49 +0100)]
Merge pull request #2625 from wallabag/prepare-215
Prepare wallabag 2.1.5
Nicolas Lœuillet [Mon, 21 Nov 2016 08:20:27 +0000 (09:20 +0100)]
Prepare wallabag 2.1.5 :rocket:
Jeremy Benoist [Mon, 21 Nov 2016 08:01:35 +0000 (09:01 +0100)]
Merge pull request #2623 from wallabag/composer-php-5.5
Force composer to run as PHP 5.5.9
Jeremy Benoist [Mon, 21 Nov 2016 06:46:46 +0000 (07:46 +0100)]
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.
Yuriy Evdokimov [Mon, 21 Nov 2016 06:29:09 +0000 (11:29 +0500)]
wrong spaces
Yuriy Evdokimov [Mon, 21 Nov 2016 06:13:40 +0000 (11:13 +0500)]
Fix #2056 update config.yml
Resolves refresh token lifetime issue
Jeremy Benoist [Sun, 20 Nov 2016 21:30:37 +0000 (22:30 +0100)]
Force composer to run as PHP 5.5.9
Jeremy Benoist [Sun, 20 Nov 2016 21:27:05 +0000 (22:27 +0100)]
Merge pull request #2621 from wallabag/redis-password
Add ability to use Redis with password
Julian Oster [Sun, 20 Nov 2016 19:42:44 +0000 (20:42 +0100)]
Add german translation
Jeremy Benoist [Sun, 20 Nov 2016 19:23:30 +0000 (20:23 +0100)]
Add ability to use Redis with password
Jeremy Benoist [Sun, 20 Nov 2016 15:25:13 +0000 (16:25 +0100)]
Return an explicit error if reload fail
Jeremy Benoist [Sun, 20 Nov 2016 14:15:13 +0000 (15:15 +0100)]
Fixing tests
Jeremy Benoist [Sun, 20 Nov 2016 12:08:41 +0000 (13:08 +0100)]
Add ability to reload entry from API
Jeremy Benoist [Sun, 20 Nov 2016 09:17:37 +0000 (10:17 +0100)]
Merge pull request #2609 from wallabag/rss-paging
RSS paging
Jeremy Benoist [Sun, 20 Nov 2016 09:14:19 +0000 (10:14 +0100)]
Fix card action overlap
On smaller resolution
Jeremy Benoist [Sun, 20 Nov 2016 08:46:03 +0000 (09:46 +0100)]
Add documentation about RSS paging
Jeremy Benoist [Sat, 19 Nov 2016 14:58:10 +0000 (15:58 +0100)]
Fix tests
Jeremy Benoist [Sat, 19 Nov 2016 13:53:28 +0000 (14:53 +0100)]
Add RSS pagination
Following https://tools.ietf.org/html/rfc5005#page-4
Jeremy Benoist [Sat, 19 Nov 2016 13:28:19 +0000 (14:28 +0100)]
Add missing translations
Nicolas Lœuillet [Sat, 19 Nov 2016 19:42:27 +0000 (20:42 +0100)]
Merge pull request #2543 from wallabag/search-engine
Added a simple search engine
Nicolas Lœuillet [Fri, 18 Nov 2016 18:21:31 +0000 (19:21 +0100)]
Added shortcut
Nicolas Lœuillet [Fri, 18 Nov 2016 16:36:19 +0000 (17:36 +0100)]
Added tests
Nicolas Lœuillet [Thu, 10 Nov 2016 14:23:53 +0000 (15:23 +0100)]
Added translations and currentRoute parameter
Nicolas Lœuillet [Sat, 5 Nov 2016 14:24:42 +0000 (15:24 +0100)]
Added search engine in baggy theme
Nicolas Lœuillet [Fri, 4 Nov 2016 22:24:43 +0000 (23:24 +0100)]
Added a simple search engine
Fix #18
Jeremy Benoist [Sat, 19 Nov 2016 14:34:20 +0000 (15:34 +0100)]
Messed up DE import translation
Jeremy Benoist [Sat, 19 Nov 2016 14:30:49 +0000 (15:30 +0100)]
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
Jeremy Benoist [Sat, 19 Nov 2016 13:56:47 +0000 (14:56 +0100)]
Merge pull request #2608 from wallabag/change-dev-version
Change version to 2.2.0-dev
Nicolas Lœuillet [Sat, 19 Nov 2016 13:28:25 +0000 (14:28 +0100)]
Change version to 2.2.0-dev
Nicolas Lœuillet [Sat, 19 Nov 2016 13:03:18 +0000 (14:03 +0100)]
Merge pull request #2607 from wallabag/update-changelog
Updated changelog for 2.1.4
Nicolas Lœuillet [Sat, 19 Nov 2016 13:02:32 +0000 (14:02 +0100)]
Updated changelog for 2.1.4
Jeremy Benoist [Sat, 19 Nov 2016 11:23:16 +0000 (12:23 +0100)]
Merge pull request #2600 from wallabag/install-assets
Install assets for shortcuts
Nicolas Lœuillet [Sat, 19 Nov 2016 11:00:18 +0000 (12:00 +0100)]
Merge pull request #2604 from wallabag/postgresql-version
wallabag can’t work on PostgreSQL <= 9.1
Nicolas Lœuillet [Sat, 19 Nov 2016 10:57:26 +0000 (11:57 +0100)]
Merge pull request #2605 from wallabag/update-release-process
Add .travis.yml change to RELEASE_PROCESS
Nicolas Lœuillet [Sat, 19 Nov 2016 10:53:41 +0000 (11:53 +0100)]
Merge pull request #2601 from wallabag/store-http-status
Added http_status in Entry entity
Jeremy Benoist [Sat, 19 Nov 2016 10:43:47 +0000 (11:43 +0100)]
Add .travis.yml change to RELEASE_PROCESS
Jeremy Benoist [Sat, 19 Nov 2016 10:33:35 +0000 (11:33 +0100)]
Merge pull request #2603 from wallabag/fix-composer-no-dev
Fix clear-cache problem using —no-dev
Jeremy Benoist [Sat, 19 Nov 2016 10:30:55 +0000 (11:30 +0100)]
Wallabag can’t work on PostgreSQL <= 9.1
Jeremy Benoist [Sat, 19 Nov 2016 09:45:21 +0000 (10:45 +0100)]
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
Nicolas Lœuillet [Fri, 18 Nov 2016 22:05:02 +0000 (23:05 +0100)]
Check if status code is OK
Nicolas Lœuillet [Fri, 18 Nov 2016 14:55:16 +0000 (15:55 +0100)]
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
Nicolas Lœuillet [Fri, 18 Nov 2016 14:09:21 +0000 (15:09 +0100)]
Added http_status in Entry entity
Jeremy Benoist [Fri, 18 Nov 2016 13:12:26 +0000 (14:12 +0100)]
Install assets for shortcuts
Nicolas Lœuillet [Fri, 18 Nov 2016 09:24:55 +0000 (10:24 +0100)]
Merge pull request #2596 from wallabag/prepare-214
Prepare wallabag 2.1.4 :rocket:
Nicolas Lœuillet [Fri, 18 Nov 2016 09:00:29 +0000 (10:00 +0100)]
Prepare wallabag 2.1.4 :rocket:
Nicolas Lœuillet [Fri, 18 Nov 2016 08:28:20 +0000 (09:28 +0100)]
Merge pull request #2550 from wallabag/reorder-documentation
Reordered documentation
Jeremy Benoist [Fri, 18 Nov 2016 08:21:27 +0000 (09:21 +0100)]
Merge pull request #2593 from wallabag/test-clarify
Put log in the most common failure tests
Julian Oster [Fri, 18 Nov 2016 08:08:16 +0000 (09:08 +0100)]
Undo translation of 'in english'.
Jeremy Benoist [Thu, 17 Nov 2016 19:03:40 +0000 (20:03 +0100)]
Merge pull request #2592 from wallabag/mruminski-patch-1
Update messages.pl.yml
Jeremy Benoist [Thu, 17 Nov 2016 18:58:10 +0000 (19:58 +0100)]
Fix tests
Jeremy Benoist [Thu, 17 Nov 2016 18:30:50 +0000 (19:30 +0100)]
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
Julian Oster [Thu, 17 Nov 2016 18:21:10 +0000 (19:21 +0100)]
Reordered documentation for German.
Julian Oster [Thu, 17 Nov 2016 12:03:12 +0000 (13:03 +0100)]
Update translation of link to german translation.
Nicolas Lœuillet [Thu, 10 Nov 2016 12:51:33 +0000 (13:51 +0100)]
Reordered :fr: documentation
Nicolas Lœuillet [Sun, 6 Nov 2016 14:15:48 +0000 (15:15 +0100)]
Reordered documentation
Mateusz Rumiński [Thu, 17 Nov 2016 17:52:42 +0000 (18:52 +0100)]
Update messages.pl.yml
translate action_mark_as_read section to polish
Nicolas Lœuillet [Thu, 17 Nov 2016 08:53:14 +0000 (09:53 +0100)]
Merge pull request #2578 from wallabag/questionmark-icon
Added help on config screen
Jeremy Benoist [Thu, 17 Nov 2016 08:40:46 +0000 (09:40 +0100)]
Merge pull request #2547 from wallabag/add-option-markasread
Added a configuration to define the redirection after archiving an entry
Nicolas Lœuillet [Wed, 16 Nov 2016 20:28:14 +0000 (21:28 +0100)]
Added tooltips for baggy theme
Nicolas Lœuillet [Sat, 12 Nov 2016 12:18:39 +0000 (13:18 +0100)]
Added help on config screen
Jeremy Benoist [Thu, 17 Nov 2016 07:05:15 +0000 (08:05 +0100)]
Fix migration
Jeremy Benoist [Wed, 16 Nov 2016 22:10:01 +0000 (23:10 +0100)]
CS
Jeremy Benoist [Wed, 16 Nov 2016 22:07:00 +0000 (23:07 +0100)]
Update unit test for Redirect
Nicolas Lœuillet [Thu, 10 Nov 2016 14:50:10 +0000 (15:50 +0100)]
Tried to fix tests
Nicolas Lœuillet [Mon, 7 Nov 2016 09:26:05 +0000 (10:26 +0100)]
Added tests
Nicolas Lœuillet [Mon, 7 Nov 2016 08:30:37 +0000 (09:30 +0100)]
Added constants for redirection values
Strubbl [Sun, 6 Nov 2016 20:12:25 +0000 (21:12 +0100)]
Update messages.en.yml
Strubbl [Sun, 6 Nov 2016 20:10:20 +0000 (21:10 +0100)]
Update messages.de.yml
Strubbl [Sun, 6 Nov 2016 19:40:19 +0000 (20:40 +0100)]
update German configuration.rst
Nicolas Lœuillet [Sun, 6 Nov 2016 11:02:39 +0000 (12:02 +0100)]
Added a configuration to define the redirection after archiving an entry
Fix #496
Nicolas Lœuillet [Wed, 16 Nov 2016 08:35:59 +0000 (09:35 +0100)]
Merge pull request #2495 from wallabag/add-shortcuts
Added shortcuts
Nicolas Lœuillet [Wed, 16 Nov 2016 08:17:12 +0000 (09:17 +0100)]
Added CSS class on links
Thomas Citharel [Tue, 15 Nov 2016 21:23:50 +0000 (22:23 +0100)]
Fix keyboard navigation on quickstart view
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Thomas Citharel [Sat, 5 Nov 2016 15:06:13 +0000 (16:06 +0100)]
fix next/prev page
Thomas Citharel [Thu, 3 Nov 2016 09:02:16 +0000 (10:02 +0100)]
Bring navigation (with right, left and enter) on material entries page. Supports going to next and previous page !
Also better indentation for js files (changed editorconfig for them).
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Nicolas Lœuillet [Wed, 2 Nov 2016 15:44:20 +0000 (16:44 +0100)]
Reorganized JS folders for shortcuts
Thomas Citharel [Wed, 26 Oct 2016 23:57:27 +0000 (01:57 +0200)]
es6 imports
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Nicolas Lœuillet [Mon, 24 Oct 2016 18:37:49 +0000 (20:37 +0200)]
Added new shortcuts
Nicolas Lœuillet [Mon, 24 Oct 2016 10:58:19 +0000 (12:58 +0200)]
Changed FOSJSRouting format in config
Nicolas Lœuillet [Mon, 24 Oct 2016 09:20:11 +0000 (11:20 +0200)]
Added shortcuts
Jeremy Benoist [Tue, 15 Nov 2016 08:23:44 +0000 (09:23 +0100)]
Merge pull request #2570 from wallabag/add-creation-date
Added creation date on entries view
Jeremy Benoist [Tue, 15 Nov 2016 08:23:26 +0000 (09:23 +0100)]
Merge pull request #2587 from wallabag/user-agents
User-agents have moved to site-config
Jeremy Benoist [Mon, 14 Nov 2016 13:29:13 +0000 (14:29 +0100)]
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
Nicolas Lœuillet [Mon, 14 Nov 2016 13:28:42 +0000 (14:28 +0100)]
Hide creation date in mobile view
Jeremy Benoist [Mon, 14 Nov 2016 13:00:24 +0000 (14:00 +0100)]
Merge pull request #2584 from blankoworld/master
fix #2582 - Documentation, Nginx config: disable all other PHP file from symphony
Nicolas Lœuillet [Fri, 11 Nov 2016 19:41:41 +0000 (20:41 +0100)]
Changed display for material theme