mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-07-02 12:05:47 +00:00
Code Issues Projects Releases Wiki Activity
2459 commits 13 branches 99 tags 148 MiB
Commit graph

260 commits

Author SHA1 Message Date
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 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
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
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 23ff8d3619 Add custom email for 2FA 
Related #1490
 2015-12-29 11:17:06 +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 c13eda461f Clean the tagging rule creation form 2015-11-16 14:01:43 +01:00
Kévin Gomez aeff8aa765 Document the matches operator in the FAQ 2015-11-13 20:57:46 +01:00
Kévin Gomez 5c514b0be3 Improve the tagging rules documentation 2015-11-11 17:06:36 +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 71ef0ed254 Rename the « Tags » tab to « Tagging rules » 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 f19f9f62d1 Add a form to create tagging rules 2015-11-11 16:23:49 +01:00
Thomas Citharel b3cc1a14e7 add json & xml 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 33fe61f92f Fix form_enctype deprecation 
Use form_start instead
 2015-11-07 00:18:06 +01: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 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
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 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 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
Nicolas Lœuillet 1210dae105 remove old implementation for login/register/recover 2015-10-03 13:31:48 +02:00
Nicolas Lœuillet 359b3f43cc * rename AuthenticationListener 
* add tests
 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
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 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 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 b026d3b115 add previewPicture on baggy theme 2015-09-13 10:03:53 +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
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
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 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 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 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
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 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 4793ee6509 Fixed my name & website 👌 2015-08-20 20:39:26 +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
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 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
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 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 2ac2e0bc2b fix #1324: do not display pagination when only 1 page 2015-08-12 14:05:53 +02:00
Nicolas Lœuillet 43e6f47d5b fix #1299: change send buttons on config page 2015-08-12 13:35:48 +02:00
Jeremy Benoist 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
Nicolas Lœuillet b69fc0628a fix #1314: change max-width in material theme 2015-08-12 13:26:49 +02:00
Jeremy Benoist a8596c35c8 Merge pull request #1323 from wallabag/v2-1302-checkbox 
fix #1302: add 'stay connected' checkbox
 2015-08-12 13:23:52 +02:00
Nicolas Lœuillet 6622cf9968 add translation 2015-08-12 13:21:07 +02:00
Nicolas Lœuillet 579764b264 fix indentation 2015-08-12 13:03:26 +02:00
Nicolas Lœuillet 5a58461491 add 'stay connected' checkbox 2015-08-12 12:27:12 +02:00
Nicolas Lœuillet 773ed2e7a6 fix #1303, add link to homepage on forgot password page 2015-08-12 12:16:50 +02:00
Jeremy Benoist 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
Nicolas Lœuillet 053b9568b2 add new post form in material header 2015-08-12 09:52:36 +02:00
Nicolas Lœuillet 2686457448 store estimated reading time / filters on reading time 2015-08-12 09:01:29 +02:00
Nicolas Lœuillet ea8da8c6d5 fix link in howto page 2015-08-11 21:12:08 +02:00
Nicolas Lœuillet d85454fbf8 add focus to search form 2015-08-11 18:07:02 +02:00
Alexandr Danilov 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
Jeremy Benoist f48a018929 Merge pull request #1295 from wallabag/v2-howto 
add howto page
 2015-08-10 14:15:11 +02:00
Jeremy Benoist 47cadf36c8 Merge pull request #1292 from wallabag/v2-tags-route 
Add tags list display
 2015-08-09 22:47:28 +02:00
Nicolas Lœuillet 009696d0a8 rename favorite in starred 2015-08-09 20:31:53 +02:00
Alexandr Danilov 946d6a5124 Preparation for adding links 2015-08-08 01:30:52 +03:00
Alexandr Danilov a6523cfe86 fix #1281 2015-08-08 00:16:14 +03:00
Alexandr Danilov c54ea989a3 fix #1281 (notifications when we star articles are buggy) 
All notification corrected
 2015-08-08 00:08:29 +03:00
Alexandr Danilov 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
Alexandr Danilov 0e7650683d Title in navigation bar 2015-08-07 23:59:11 +03:00
Alexandr Danilov 768303a573 fix #1282 2015-08-07 23:29:21 +03:00
Nicolas Lœuillet b7dd5f824c add howto page 2015-08-07 21:22:43 +02:00
Nicolas Lœuillet 44a16e82d8 fix #1282: add title on wallabag logo 2015-08-07 20:47:19 +02:00
Nicolas Lœuillet 3f3fbef11f Add tags list display 2015-08-07 18:17:23 +02:00
Danilow Alexandr 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