mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-12 10:46:29 +00:00
Code Issues Projects Releases Wiki Activity
4151 commits 12 branches 100 tags 172 MiB
Commit graph

4151 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nicolas Lœuillet
cda0662311
Removed FOSUser attributes removed in alpha4 
See https://github.com/FriendsOfSymfony/FOSUserBundle/blob/master/Upgrade.md\#200-alpha3-to-200-alpha4
 2016-11-28 12:44:17 +01:00
Nicolas Lœuillet
6bb0866cf5 Merge pull request #2659 from akovalyov/bugfix/non-latin-characters-in-reading-time-calculation 
Fix incorrect reading time calculation for entries in non-latin languages.
 2016-11-28 09:23:04 +01:00
Andrew Kovalyov
5b6888b13f Fix incorrect reading time calculation for entries in languages with 
non-latin chars subset.
 2016-11-28 01:15:06 +02:00
Jeremy Benoist
5b644798a0 Merge pull request #2654 from Kdecherf/domain-filter 
Enforce lowercase on domain name filter
 2016-11-27 18:35:38 +01:00
Kevin Decherf
00fc2b44f4 Enforce lowercase on domain name filter 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2016-11-26 19:52:50 +01:00
Nicolas Lœuillet
ebe50a85fb Merge pull request #2622 from Kdecherf/ui-changes 
Material UI Changes
 2016-11-25 17:11:07 +01:00
Nicolas Lœuillet
60abe8c274
Minified CSS 2016-11-25 16:45:03 +01:00
Kevin Decherf
56026217c5 Material: update size of text in article 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2016-11-25 13:49:45 +01:00
Kevin Decherf
819c8f5bd4 Material: render blockquote in italic and strong in bold in article 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2016-11-25 13:39:53 +01:00
Kevin Decherf
fdaa044314 Material: update style of pre in article 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2016-11-25 13:39:53 +01:00
Kevin Decherf
59cfd63c23 Material: update style of ul in article 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2016-11-25 13:39:53 +01:00
Kevin Decherf
858430c0d0 Material: update style of article links 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2016-11-25 13:39:53 +01:00
Kevin Decherf
5ea90fa8b9 Material: increase max width of article on large screens 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2016-11-25 13:39:49 +01:00
Kevin Decherf
7470a2f36a Material: prevent bold in title, update title font size 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2016-11-25 13:37:42 +01:00
Kevin Decherf
5b69e03eb4 Material: change color of background, article content and titles 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2016-11-25 13:37:42 +01:00
Nicolas Lœuillet
b5e0bbeb85 Merge pull request #2642 from wallabag/fix-logout-shortcut 
Fixed logout shortcut
 2016-11-23 15:14:05 +01:00
Nicolas Lœuillet
66e9dde0dc
Fixed logout shortcut 2016-11-23 14:40:00 +01:00
Jeremy Benoist
f4a9833490 Merge pull request #2620 from wallabag/fix-password-layout 
Fix password layout
 2016-11-23 09:53:18 +01:00
Jeremy Benoist
fcbf253b6b Remove empty line 2016-11-23 09:20:00 +01:00
Nicolas Lœuillet
75a4b3b23f Merge pull request #2640 from wallabag/fix-openoriginal 
Fixed entry shortcuts available in list view
 2016-11-23 09:06:45 +01:00
Nicolas Lœuillet
0df2a4b021
Fixed entry shortcuts available in list view 2016-11-22 21:31:21 +01:00
Jeremy Benoist
be2725db40
Add migration for new FOSUser version 2016-11-22 21:25:05 +01:00
Jeremy Benoist
ae741f998e
Fix MonologBundle deprecation 
The Symfony\Bundle\MonologBundle\DependencyInjection\Compiler\DebugHandlerPass class is deprecated since version 2.12 and will be removed in 3.0. Use AddDebugLogProcessorPass in FrameworkBundle instead.
 2016-11-22 21:25:05 +01:00
Jeremy Benoist
5066c3e066
Re-use FOSUser master branch 2016-11-22 21:25:05 +01:00
Jeremy Benoist
4da598c5df
Fix Travis 2016-11-22 21:23:58 +01:00
Jeremy Benoist
d7acde5cc3
Use the correct template 
When resetting the password, the overriden template we used wasn’t well spelled.

And since we are using a locked version of FOSUser (on a custom commit), the translation of `resetting.check_email` is wrong in any language but english.
 2016-11-22 21:23:58 +01:00
Jeremy Benoist
9624b3adfa
These files aren’t used anymore 
Translation were moved to the global one
 2016-11-22 21:23:58 +01:00
Jeremy Benoist
7c6b7a40d1 Merge pull request #2637 from wallabag/mruminski-patch-1 
Update messages.pl.yml
 2016-11-22 20:02:00 +01:00
Mateusz Rumiński
24d4b243a7 Update messages.pl.yml 
translate shortcuts section to polish
 2016-11-22 19:24:38 +01:00
Jeremy Benoist
176e0ea3ca Merge pull request #2317 from wallabag/restricted-access 
Added authentication for restricted access articles
 2016-11-22 19:12:53 +01:00
Nicolas Lœuillet
d51093a7d9
Added documentation and missing translations 2016-11-22 17:32:24 +01:00
Nicolas Lœuillet
d64bf7953b
Added internal setting to enable/disable articles with paywall 2016-11-22 14:56:53 +01:00
Nicolas Lœuillet
40f3ea57fb
Cleared CookieJar to avoid websites who use cookies for analytics 2016-11-22 14:25:51 +01:00
Thomas Citharel
1d5dd2c241 Merge pull request #2612 from wallabag/add-shortcuts-help 
Added help about shortcuts
 2016-11-22 14:10:12 +01:00
Bertrand Dunogier
7aab0ecf2f Added authentication for restricted access articles 
Fix #438. Thank you so much @bdunogier
 2016-11-22 14:01:46 +01:00
Nicolas Lœuillet
893ccad31f
Translations for shortcuts help 2016-11-22 13:33:06 +01:00
Nicolas Lœuillet
c526f9e474 Added help about shortcuts 2016-11-22 13:07:42 +01:00
Jeremy Benoist
bb28368f69 Merge pull request #2635 from wallabag/304-reload 
Return 304 when content isn't reloaded using the API
 2016-11-22 11:27:55 +01:00
Jeremy Benoist
5cd0857e3c
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.
 2016-11-22 10:45:19 +01:00
Thomas Citharel
944b8d6175 Merge pull request #2613 from wallabag/fix-overlap 
Fix card action overlap
 2016-11-22 10:27:14 +01:00
Nicolas Lœuillet
ba838dae5a Merge pull request #2614 from wallabag/api-reload 
Add ability to reload entry from API
 2016-11-22 09:39:43 +01:00
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