mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-06-30 02:50:34 +00:00
Code Issues Projects Releases Wiki Activity
2199 commits 13 branches 99 tags 148 MiB
Commit graph

642 commits

Author SHA1 Message Date
Jeremy Benoist 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
Nicolas Lœuillet 6c9bad13e1 Fixed 'mark as read' and 'mark as unread' links 2016-01-09 22:20:19 +01:00
Nicolas Lœuillet da82839bf8 add import link on baggy theme 2016-01-09 20:33:09 +01:00
Jeremy Benoist 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
Nicolas Lœuillet b88cf91fc8 updated tests 2016-01-07 21:00:04 +01:00
Nicolas Lœuillet 10b2411c10 Hide export button if we are not on entries list 2016-01-06 07:47:09 +01:00
Nicolas Lœuillet d1af8ad4db Added french translations 2016-01-05 22:38:09 +01:00
Jeremy Benoist 8eedc8cfac Few phpDoc fix 
And some little mistakes
 2016-01-03 11:15:44 +01:00
Jeremy Benoist c5c7f90a81 Fix tag related test for Pocket 2016-01-03 10:32:56 +01:00
Jeremy Benoist 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
Jeremy Benoist b1d05721cf Rewrote Wallabag v1 import 2016-01-02 23:27:41 +01:00
Jeremy Benoist 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
Jeremy Benoist 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
Jeremy Benoist 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
Jeremy Benoist 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
Jeremy Benoist 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
Jeremy Benoist 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
Nicolas Lœuillet 303768dfe9 - remove importers configuration 
- add check on userId for findOneByURL for entries
 2016-01-02 23:27:41 +01:00
Nicolas Lœuillet dda57bb944 fix #1502 avoid duplicate entry and store pocket url in config 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet 87f23b005c assign tags to entries and add lastPocketImport attribute to user 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet d51b38ed30 create ImportController to list importers 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet 557e549db7 service call 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet ff7b031d57 refactor pocket import 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet 1f4408de9e 1st draft for Pocket import via API 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet 10b40f85d6 add docs for Import feature 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet d275bdf4d3 form to upload file 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet 8c3c77c1bd create controller to launch import command 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet a1bb1b3c2a userId is now set in parameters 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet 56ea1de99b first draft for json import, needed for wallabag v1 migration 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet dad1c546a5 Merge pull request #1545 from wallabag/v2-user-tag 
v2 – Remove user reference in tag
 2016-01-02 12:46:52 +01:00
Nicolas Lœuillet 5432f61509 Merge pull request #1546 from wallabag/v2-reload-content 
v2 – Ability to reload an entry
 2016-01-02 12:46:09 +01:00
Jeremy Benoist 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
Jeremy Benoist 0cf434c00f Backport all icomoon from v1 
And add a reload icon
 2015-12-30 09:53:52 +01:00
Jeremy Benoist 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
Jeremy Benoist 6be9750155 Removed comment 
And move the SQL query inside the php doc
 2015-12-29 21:59:34 +01:00
Jeremy Benoist 4059a061c0 Fix the way to remove a tag from all user entries 2015-12-29 15:43:32 +01:00
Jeremy Benoist 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
Jeremy Benoist 01fddd0cb2 Fix parameters regarding documentation 
Parameters are `star` & `archived`, not `is_starred` & `is_archived`
 2015-12-29 14:54:55 +01:00
Jeremy Benoist fc73222723 Remove user reference in tag 
Fix #1543
 2015-12-29 14:50:52 +01:00
Jeremy Benoist 23ff8d3619 Add custom email for 2FA 
Related #1490
 2015-12-29 11:17:06 +01:00
Jeremy Benoist 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
Jeremy Benoist 71eff67f8b Entry data should have unique url 2015-12-28 13:42:50 +01:00
Jeremy Benoist e9fa8c40aa Add test on tagAllForUser 
And fix multiplication of entries returned by `tagAllForUser`.
 2015-12-28 13:20:48 +01:00
Jeremy Benoist 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
Nicolas Lœuillet 3c65dfb735 add slug for tags 2015-12-28 12:49:45 +01:00
Nicolas Lœuillet 347fa6beb0 php cs 2015-12-08 09:20:03 +01:00
Nicolas Lœuillet c5d0db8b71 changed table name for tagging rule 2015-12-08 09:05:56 +01:00
Jeremy Benoist a7f1921f7d Merge pull request #1478 from K-Phoen/rule-based-tags 
Rule based tags
 2015-12-06 14:31:26 +01:00
Thomas Citharel a24c1ee30a Typo 2015-12-04 00:17:07 +01:00
Kévin Gomez 752b90d1f2 Fix tagging rules ordering 2015-11-29 16:19:02 +01:00
Kévin Gomez c13eda461f Clean the tagging rule creation form 2015-11-16 14:01:43 +01:00
Kévin Gomez 69edb774eb Assert that the tag has is the good one 2015-11-16 13:34:00 +01:00
Kévin Gomez 958671a7ae Add a quick test 2015-11-13 22:53:28 +01:00
Kévin Gomez aeff8aa765 Document the matches operator in the FAQ 2015-11-13 20:57:46 +01:00
Kévin Gomez f27aca26f6 Add phpdoc for all Matches implementations 2015-11-13 20:50:09 +01:00
Kévin Gomez a6e27f7466 Add matches operator 2015-11-13 14:37:58 +01:00
Kévin Gomez 5c514b0be3 Improve the tagging rules documentation 2015-11-11 17:06:36 +01:00
Kévin Gomez b7b2005494 Fix the creation of the repository services 2015-11-11 16:44:57 +01:00
Kévin Gomez 0c5bcd82ba Use Psr\Log\NullLogger instead of creating a mock 2015-11-11 16:27:53 +01:00
Kévin Gomez 7b1648961d Fix incorrect comment. 2015-11-11 16:27:19 +01:00
Kévin Gomez 8a99c7a86b Add a few functional tests for the tagging rules creation form 2015-11-11 16:27:19 +01:00
Kévin Gomez 9b88658c04 Update baggy theme 2015-11-11 16:27:19 +01:00
Kévin Gomez 52e423f307 Provide a way to delete tagging rules 2015-11-11 16:27:19 +01:00
Kévin Gomez 625acf3352 Add a command to automatically tag all entries for a user 2015-11-11 16:27:19 +01:00
Kévin Gomez c23fc05df8 Validate used operators when creating tagging rules 2015-11-11 16:23:49 +01:00
Kévin Gomez 5a166c5c1a Add tests for the RuleBasedTagger class 2015-11-11 16:23:49 +01:00
Kévin Gomez 1c9cd2a7f0 Errors in the automatic tagging do not prevent the entry from being added 2015-11-11 16:23:49 +01:00
Kévin Gomez 1dc4e5da2e Also validate used variables when creating tagging rules 2015-11-11 16:23:49 +01:00
Kévin Gomez 3447d1ee07 Add naïve validation for tagging rules (only checks the syntax) 2015-11-11 16:23:49 +01:00
Kévin Gomez 71ef0ed254 Rename the « Tags » tab to « Tagging rules » 2015-11-11 16:23:49 +01:00
Kévin Gomez 003fa77438 Add tests for the StringToListTransformer class 2015-11-11 16:23:49 +01:00
Kévin Gomez f530f7f5e1 Fix ContentProxyTest 2015-11-11 16:23:49 +01:00
Kévin Gomez 1d7b350b25 Add missing use statement 2015-11-11 16:23:49 +01:00
Kévin Gomez e9fbd2d12e Add a table explaining the available variables 2015-11-11 16:23:49 +01:00
Kévin Gomez 981cacf7b9 Display the tagging rules in the config 2015-11-11 16:23:49 +01:00
Kévin Gomez 9cbb404b4a Add missing tagging rule repository 2015-11-11 16:23:49 +01:00
Kévin Gomez f19f9f62d1 Add a form to create tagging rules 2015-11-11 16:23:49 +01:00
Kévin Gomez ac9fec610a Add TaggingRule entity 2015-11-11 16:23:49 +01:00
Kévin Gomez c3510620ad PoC of rule-based tagging 2015-11-11 16:23:49 +01:00
Jeremy Benoist fba3f536a5 Fix tests 2015-11-09 16:32:48 +01:00
Jeremy Benoist cceca9ea1d Fix route parameters 
Improve export tests
Improve CSV export
 2015-11-09 16:32:48 +01:00
Thomas Citharel 268e9e7277 use JMS Serializer 2015-11-09 16:32:48 +01:00
Thomas Citharel 5b7da07620 use the groups annotation instead of setIgnoredAttributes 2015-11-09 16:32:48 +01:00
Thomas Citharel 8ac95cbfcc improved function 2015-11-09 16:32:48 +01:00
Thomas Citharel b3cc1a14e7 add json & xml 2015-11-09 16:32:48 +01:00
Jeremy Benoist 33c36f6b48 Fix tests on pgsql 2015-11-09 16:32:48 +01:00
Jeremy Benoist 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
Thomas Citharel 03690d1387 Start work on export 
For now:
 - ebook
 - mobi
 - pdf
 - csv
 2015-11-09 16:32:48 +01:00
Jeremy Benoist 970e0e994f Remove duplicate comments 2015-11-07 14:18:38 +01:00
Jeremy Benoist 75c48e3ae0 CS 2015-11-07 14:16:13 +01:00
Jeremy Benoist 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
Jeremy Benoist 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
Jeremy Benoist 735068d181 Add tests on TablePrefixSubscriber 2015-11-07 14:15:33 +01:00
Jeremy Benoist bd0f3d32c9 Quoted entity to avoid reserved keyword 
Should fix #1498
 2015-11-07 14:15:33 +01:00
Jeremy Benoist 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
Jeremy Benoist 164d260c49 CS 
Also force SYMFONY_DEPRECATIONS_HELPER for travis
 2015-11-07 00:27:41 +01:00
Jeremy Benoist 33fe61f92f Fix form_enctype deprecation 
Use form_start instead
 2015-11-07 00:18:06 +01:00
Jeremy Benoist 18f8f32f70 Fix security.context deprecation 2015-11-07 00:17:37 +01:00
Jeremy Benoist 78507d2835 Fix deprecated helper in command 2015-11-06 23:39:19 +01:00
Jeremy Benoist c929c88faf Enable graby log 2015-10-24 10:53:55 +02:00
Nicolas Lœuillet 18d5f4541e redirect on last page after deletion 2015-10-21 15:26:37 +02:00
Julian Oster 37a564a868 Add german translation. 2015-10-18 21:26:09 +02:00
Jeremy Benoist 2aac2f278f Add tests on listeners 2015-10-16 07:40:09 +02:00
Nicolas Lœuillet c89d35e851 Language selection on config screen 2015-10-15 21:42:29 +02:00
Jeremy Benoist 3d3ed955f1 Merge pull request #1484 from wallabag/v2-2factor-auth 
2factor authentication via email
 2015-10-15 13:52:52 +02:00
Nicolas Lœuillet 18cf594f8a move 2factor activation in parameters 2015-10-15 13:17:21 +02:00
Nicolas Lœuillet 0d6a7929e1 add tests for 2factor authentication 2015-10-14 17:10:12 +02:00
Nicolas Lœuillet 2db616b586 2factor authentication via email 2015-10-13 22:43:15 +02:00
Alexandr Danilov c26a3edc0a Other improvements 2015-10-09 13:00:15 +03:00
Alexandr Danilov ba873ae667 Icons in footer 2015-10-09 12:43:42 +03:00
Jeremy Benoist cf0ea8f113 Merge pull request #1472 from wallabag/v2-clean-views 
fix #1470: clean material theme
 2015-10-08 13:44:04 +02:00
Nicolas Lœuillet fa853bb603 fix #1470: clean material theme 2015-10-08 13:32:34 +02:00
Nicolas Lœuillet 880a0e1c0b implement bookmarklet 2015-10-08 13:29:41 +02:00
Nicolas Lœuillet ce782c84b8 fix bug on detect active theme 2015-10-06 20:51:40 +02:00
Nicolas Lœuillet 1ce8f30342 fix type hint for User 2015-10-06 12:16:08 +02:00
Jeremy Benoist 16dabc3263 Merge pull request #1436 from wallabag/v2-register 
Public registration & oAuth2 \o/
 2015-10-06 09:19:06 +02:00
Jeremy Benoist 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
Nicolas Lœuillet 784bb4c38d add test for removeWww Twig Extension 2015-10-06 09:09:26 +02:00
Nicolas Lœuillet 8263e71192 use form widget for registration 2015-10-06 07:44:10 +02:00
Nicolas Lœuillet 68e9dcf615 restore blue color 2015-10-06 06:16:17 +02:00
Nicolas Lœuillet e0d188809c move css 2015-10-05 22:49:46 +02:00
Nicolas Lœuillet d30262154a last changes for baggy theme 2015-10-05 22:45:44 +02:00
Nicolas Lœuillet ec3ce598f6 material design for register/login/recover pages 2015-10-05 22:16:18 +02:00
Thomas Citharel 9c8f7af196 fix #1457 2015-10-05 21:37:17 +02:00
Jeremy Benoist 4c5e544183 Cleanup 
- remove unecessary routing for UserBundle
- remove unused form type
 2015-10-03 13:37:21 +02:00
Nicolas Lœuillet 0a878469d4 move some files to UserBundle 2015-10-03 13:31:48 +02:00
Nicolas Lœuillet 1210dae105 remove old implementation for login/register/recover 2015-10-03 13:31:48 +02:00
Jeremy Benoist 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
Nicolas Lœuillet 2c13918acc add test for confirmed registration 2015-10-03 13:30:43 +02:00
Nicolas Lœuillet 359b3f43cc * rename AuthenticationListener 
* add tests
 2015-10-03 13:30:43 +02:00
Nicolas Lœuillet 772732531e check authentication on each API route 2015-10-03 13:30:43 +02:00
Nicolas Lœuillet fcb1fba5c2 * public registration 
* remove WSSE implementation
* add oAuth2 implementation
 2015-10-03 13:30:43 +02:00
Thomas Citharel 4b55e704ab typo 2015-10-01 18:48:38 +02:00
Nicolas Lœuillet 4e9f656ecb restore footer 2015-10-01 11:38:59 +02:00
Nicolas Lœuillet cfb28c9da0 french translation 2015-10-01 09:26:52 +02:00
Nicolas Lœuillet 8e417206d5 flash messages translation 2015-09-30 18:17:40 +02:00
Nicolas Lœuillet 4aafa7f0df french translation 2015-09-30 18:09:18 +02:00
Nicolas Lœuillet 4f0dfac6a6 add french translation 2015-09-30 17:06:41 +02:00
Jeremy Benoist 7c99da0c95 Merge pull request #1437 from wallabag/v2-clean-material 
some cleanup on material theme
 2015-09-30 09:05:03 +02:00
Nicolas Lœuillet 72fcaf8a6c remove www. on entries view 2015-09-29 22:59:44 +02:00
Nicolas Lœuillet b0b352fc8e some cleanup on material theme 2015-09-29 20:26:32 +02:00
Nicolas Lœuillet 917040d4a0 Merge pull request #1434 from wallabag/travis-db 
Add multiple database tests on Travis
 2015-09-28 22:57:11 +02:00
Jeremy Benoist 02d17813a1 Fix tests for all 2015-09-28 20:26:37 +02:00
Jeremy Benoist 159986c4fb Fix Postgres tests 2015-09-28 19:35:55 +02:00
Jeremy Benoist 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
Jeremy Benoist 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
Jeremy Benoist d4ebe5c5dc Entries filter on language 
+ updated deps
 2015-09-23 07:55:55 +02:00
Jeremy Benoist 0d3bafdfdf Remove tab from baggy css 
And add a border left on the filter slider
 2015-09-23 07:51:17 +02:00
Jeremy Benoist 98f0929f16 Handle entry in language 
Fix #1333
 2015-09-22 20:52:13 +02:00
Jeremy Benoist db96045a0a Adjust preview picture 2015-09-20 22:36:51 +02:00
Nicolas Lœuillet 1db9d411c5 Merge pull request #1420 from modos189/v2_display_picture 
improved display pictures
 2015-09-14 17:15:40 +02:00
Alexandr Danilov 451bad02f0 improved display pictures 2015-09-14 02:12:39 +03:00
Thomas Citharel 1a5f7e2d88 A little more width for filter view 2015-09-13 19:53:09 +02:00
Jeremy Benoist 5e98404dfb Re-add preview picture on baggy 
Which should has been removed on merge
 2015-09-13 15:17:58 +02:00
Jeremy Benoist 5def3f5862 Filters view on side for baggy 2015-09-13 14:56:34 +02:00
Jeremy Benoist 71e51207ce Fix tests 2015-09-13 14:56:34 +02:00
Jeremy Benoist 1137fae94d Lower domain search length 
When searching for "bbc" I got no result .. sigh.
 2015-09-13 13:35:12 +02:00
Jeremy Benoist d2fcbf5d84 Handle filter form using some JS 
Instead of displaying an ugly form
 2015-09-13 13:35:12 +02:00
Jeremy Benoist 19c283140e Cleanup base layout 2015-09-13 13:35:12 +02:00
Jeremy Benoist 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
Jeremy Benoist a78d6afeaa Move baggy theme in its folder 2015-09-13 13:35:12 +02:00
Jeremy Benoist 4d5fd9be81 Merge pull request #1417 from wallabag/v2-display-picture 
fix #972: add preview pictures
 2015-09-13 11:41:23 +02:00
Jeremy Benoist 40f59b219b Merge pull request #1418 from wallabag/v2-previewpicture-filter 
filter for entries with previewPicture
 2015-09-13 10:14:42 +02:00
Nicolas Lœuillet 497e0cad7c add test for previewPicture filter 2015-09-13 10:11:22 +02:00
Nicolas Lœuillet b026d3b115 add previewPicture on baggy theme 2015-09-13 10:03:53 +02:00
Nicolas Lœuillet 616f9fea26 forgot case for previewPicture filter 2015-09-13 08:43:15 +02:00
Nicolas Lœuillet a3bcd60a37 filter for entries with previewPicture 2015-09-12 17:08:12 +02:00
Nicolas Lœuillet e610143f51 add preview pictures 2015-09-12 13:39:01 +02:00
Jeremy Benoist 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
Nicolas Lœuillet 3f7a62908c fix tests for FosUser 2015-09-11 20:32:37 +02:00
Nicolas Lœuillet a1691859ca implement FosUser 2015-09-11 20:32:37 +02:00
Nicolas Lœuillet 9c08a891f9 Merge pull request #1397 from wallabag/v2-graby 
Integrate graby
 2015-09-11 20:17:42 +02:00
Jeremy Benoist f1e29e69cb CS 2015-09-10 22:00:53 +02:00
Jeremy Benoist 558d9aabab Move fetching content in a separate class 2015-09-10 21:57:25 +02:00
Thomas Citharel e643992350 typo 2015-08-26 00:24:33 +02:00
Thomas Citharel b125ed0394 Use full size of the panel for domain-filtering 
For longer domains
 2015-08-26 00:19:17 +02:00
Nicolas Lœuillet 50243f0e34 fix #1357, truncate domain name if it's too loooong 2015-08-24 22:09:57 +02:00
Jeremy Benoist d13de40db6 Update url from graby 2015-08-24 19:52:31 +02:00
Jeremy Benoist a1413a3da9 CS 2015-08-24 12:35:02 +02:00
Jeremy Benoist fad316151c Integrate graby 2015-08-24 12:27:17 +02:00
Jeremy Benoist 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
Jeremy Benoist dc1c2debfb Apply margin only on settings page 2015-08-24 12:03:00 +02:00
Nicolas Lœuillet a754db33c9 fix #1378: nice display for tags list 2015-08-24 11:59:53 +02:00
Nicolas Lœuillet 7083d183b9 Merge pull request #1392 from wallabag/v2-fix-redirect 
Fix redirect after deletion
 2015-08-24 10:44:14 +02:00
Nicolas Lœuillet 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
Jeremy Benoist f90af145ca Add test for same day filter 2015-08-23 22:06:27 +02:00
Nicolas Lœuillet 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
Jeremy Benoist 7d6c3edcdd Fix date filter on same day 
Fix #1379
 2015-08-22 15:36:07 +02:00
Jeremy Benoist ec00964de2 Merge pull request #1372 from wallabag/v2-assign-tags 
assign tags to an entry
 2015-08-22 12:56:42 +02:00
Nicolas Lœuillet 7244d6cb61 assign tags to an entry 2015-08-22 12:40:48 +02:00
Jeremy Benoist 83aaf84195 Fix display issue in config rss tab 2015-08-22 12:30:06 +02:00
Jeremy Benoist 16a3d04cbd Fix redirect after deletion 
Fix #1391
 2015-08-22 12:09:27 +02:00
Jeremy Benoist 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
Nicolas Lœuillet c937de3443 remove dead code 2015-08-21 08:36:57 +02:00
Nicolas Lœuillet 2b7a488917 filters: adapt queryBuilder for 'all' view 2015-08-21 07:38:18 +02:00
Nicolas Lœuillet e177976099 filters: add test for status filter and adapt other tests results 2015-08-21 07:30:48 +02:00
Nicolas Lœuillet 89659c9eae filters: implement status filter and a new view (to display all entries) 2015-08-21 07:30:48 +02:00
Jeremy Benoist 6682139ec5 CS 2015-08-20 20:39:52 +02:00
Jeremy Benoist e6f55346fd Add test on getting starred entries using the API 2015-08-20 20:39:26 +02:00
Jeremy Benoist 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
Jeremy Benoist 1dbcd63b59 Update baggy about page 
According to what have been done on the material theme
 2015-08-20 20:39:26 +02:00
Jeremy Benoist 4793ee6509 Fixed my name & website 👌 2015-08-20 20:39:26 +02:00
Jeremy Benoist 6eebd8c909 Remove unsed things 2015-08-20 20:39:26 +02:00
Jeremy Benoist 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
Jeremy Benoist 8ce32af612 CS 
We shouldn't forget to run `php-cs-fixer` time to time
 2015-08-20 07:53:55 +02:00
Jeremy Benoist 34437f408c Merge pull request #1369 from wallabag/v2-bottombar 
fix #1332: bottom bar to display message
 2015-08-19 21:27:49 +02:00
Jeremy Benoist 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
Nicolas Lœuillet fdab81e910 warning bar: add parameter to dis/enable it 2015-08-19 16:00:15 +02:00
Nicolas Lœuillet e62d27ff9b bottom bar to display message 2015-08-19 15:14:08 +02:00
Nicolas Lœuillet 8b8cdabc89 config: redirect on correct tab in material theme 2015-08-19 15:10:11 +02:00
Nicolas Lœuillet bdd23b076a filters: enhance view for domain name 2015-08-19 14:55:39 +02:00
Nicolas Lœuillet 443cecd2d8 add filter on domain name 2015-08-19 14:27:00 +02:00
Jeremy Benoist b71ebd9af9 Merge pull request #1366 from wallabag/fix-tags-view 
fix tag view in material theme
 2015-08-19 12:02:24 +02:00
Jeremy Benoist 22ed64522a Merge pull request #1365 from wallabag/v2-typo-pagination 
change </div> into </ul>
 2015-08-19 11:21:31 +02:00
Jeremy Benoist 2e02b50409 Merge pull request #1367 from wallabag/v2-fix-actions-label 
action labels depend on status
 2015-08-19 11:20:22 +02:00
Nicolas Lœuillet 02947111c0 change </div> into </ul> 2015-08-18 18:20:07 +02:00
Nicolas Lœuillet e68d9179a1 fix tag view in material theme 2015-08-18 18:18:35 +02:00
Nicolas Lœuillet c713273619 action labels depend on status 2015-08-18 18:13:30 +02:00
Nicolas Lœuillet 3f357ee241 add test 2015-08-18 16:33:32 +02:00
Nicolas Lœuillet 72ea6dd1a7 add creation date filter view 2015-08-18 15:26:45 +02:00
Jeremy Benoist 54f2b4a254 Merge pull request #1353 from wallabag/v2-pluriel 
check if one entry or not
 2015-08-18 14:29:10 +02:00
Jeremy Benoist 3162601c59 Merge pull request #1343 from wallabag/v2-filter-date 
[WIP] filter by creation date
 2015-08-18 14:28:43 +02:00
Nicolas Lœuillet 428af5a8c3 usage of transchoice 2015-08-18 08:32:50 +02:00
Nicolas Lœuillet 5f246a5543 clean -> clear 2015-08-17 20:12:11 +02:00
Nicolas Lœuillet 2ba06b1ee2 check if one entry or not 2015-08-17 18:02:54 +02:00
Nicolas Lœuillet 3c5b025ac3 filter by creation date 2015-08-17 15:54:49 +02:00
Nicolas Lœuillet 925d8ab316 Merge pull request #1337 from modos189/v2_material 
fixes material
 2015-08-17 15:32:59 +02:00
Alexandr Danilov d5b28518e9 fix 2015-08-17 16:30:30 +03:00
Jeremy Benoist 0a3a5f6cd7 Merge pull request #1352 from wallabag/v2-fix-pagination 
fix #1350: fix pagination with filters
 2015-08-17 15:19:35 +02:00
Nicolas Lœuillet ab2c93c7eb add test 2015-08-17 15:15:51 +02:00
Alexandr Danilov 727b39a90e Fix calendar in chromium and reducing the size of the calendar 2015-08-17 15:43:44 +03:00
Nicolas Lœuillet c14a7c4251 fix #1350: fix pagination with filters 2015-08-17 12:13:37 +02:00
Alexandr Danilov 790d18a319 GUI for filter by creation date #1343 2015-08-17 03:12:14 +03:00
Alexandr Danilov 6fd3d82c01 Hide open menu on page reading articles 2015-08-17 02:02:55 +03:00
Alexandr Danilov fcb3faf109 My implementation progress bar at the top of the page #1348 2015-08-17 01:50:46 +03:00
Alexandr Danilov 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
Alexandr Danilov 0e7cf1fc50 Merge remote-tracking branch 'origin/v2' into v2_material 2015-08-17 00:33:03 +03:00
Nicolas Lœuillet 9cc6bd87fe add link to original article in material theme 2015-08-16 21:05:37 +02:00
Nicolas Lœuillet 4ca0c9139c fix diaspora url 2015-08-13 09:18:41 +02:00
Nicolas Lœuillet a64f1d9f2d change title for material pages / about page 2015-08-13 09:16:22 +02:00
Alexandr Danilov bac5a34552 Fix form rendere 2015-08-12 23:52:40 +03:00
Alexandr Danilov a737d2a0ee Merge remote-tracking branch 'origin/v2' into v2_material 2015-08-12 23:02:19 +03:00
Jeremy Benoist 545b852f46 Merge pull request #1331 from wallabag/v2-disable-download 
disable download links on entry view
 2015-08-12 21:58:46 +02:00
Alexandr Danilov 392f4a2681 #1320 Design for filters 2015-08-12 22:55:44 +03:00
Nicolas Lœuillet 120544cccd disable download links on entry view 2015-08-12 21:52:39 +02:00
Nicolas Lœuillet c2257428b2 store domainName in database 2015-08-12 21:16:00 +02:00
Alexandr Danilov 8ba913d87a improved view 2015-08-12 20:27:30 +03:00
Alexandr Danilov 06fdfd025e fix #1321 2015-08-12 19:18:31 +03:00
Jeremy Benoist 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
Nicolas Lœuillet bdf39ff10d remove pagination if page == 1 with baggy theme 2015-08-12 14:06:56 +02:00