mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-15 21:41:06 +00:00
Code Issues Projects Releases Wiki Activity
4578 commits 12 branches 100 tags 168 MiB
Commit graph

154 commits

Author SHA1 Message Date
Jeremy Benoist
dfd0a7bc5f
Add backup codes 2019-01-23 13:28:03 +01:00
Jeremy Benoist
a6b242a1fd
Enable OTP 2FA 
- Update SchebTwoFactorBundle to version 3
- Enable Google 2fa on the bundle
- Disallow ability to use both email and google as 2fa
- Update Ocramius Proxy Manager to handle typed function & attributes (from PHP 7)
- use `$this->addFlash` shortcut instead of `$this->get('session')->getFlashBag()->add`
- update admin to be able to create/reset the 2fa
 2019-01-23 13:28:02 +01:00
Jérémy Benoist
c73025ad8b
Merge pull request #3858 from wallabag/bump-ocramius 
Bump ocramius/proxy-manager
 2019-01-18 16:50:24 +01:00
Jeremy Benoist
1e0d8ad7b7
Enable PHPStan 
- Fix error for level 0 & 1 (level 7 has 699 errors...)
- Add `updated_at` to site_credential (so the `timestamps()` method applies correctly)
 2019-01-18 15:25:50 +01:00
Thomas Citharel
9666fb70fc
Bump ocramius/proxy-manager 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-01-17 12:47:24 +01:00
Jeremy Benoist
5419a8368e
Merge remote-tracking branch 'origin/master' into 2.4 2019-01-15 09:41:18 +01:00
Jeremy Benoist
a5e9a98aa3
Come back to stable version 
Previous one was used because some PHPUnit version where deleted and tests can't be run anymore.
 2019-01-14 17:00:32 +01:00
Jeremy Benoist
8bb381e78c
No more dev for guzzle-site-authenticator 2018-12-13 22:12:21 +01:00
Jeremy Benoist
9a8a1bdfdb
Use our own fork for CraueConfigBundle 
Mostly to fix utf8mb4 issue
 2018-11-28 22:04:55 +01:00
Jeremy Benoist
8f2038e5b1
Fix tests 2018-11-28 22:04:55 +01:00
Jeremy Benoist
9394e8098a
Jump to unrelease predis 
To fix deprecated message regarding `each()`
 2018-11-28 22:04:54 +01:00
Jeremy Benoist
6fc95673df
Cleanup 2018-11-28 22:04:54 +01:00
Jeremy Benoist
3c7900d0cd
Jump to PHP 7.1+ 2018-11-25 10:08:45 +01:00
Jeremy Benoist
b878be4cc9
Merge remote-tracking branch 'origin/master' into 2.4 
# Conflicts:
#	web/wallassets/baggy.js
#	web/wallassets/manifest.json
#	web/wallassets/material.css
#	web/wallassets/material.js
 2018-11-25 09:58:18 +01:00
Jeremy Benoist
ea60d76e60
Use latest bridge to avoid PHPUnit break 
Because branch 4.8 & 5.7 have been removed
 2018-11-23 22:11:10 +01:00
Jeremy Benoist
115de64e5b
Jump to Symfony 3.4 
Thanks to the BC compatibility, almost nothing have to be changed.
All changes are related to new bundle version of:
- SensioFrameworkExtraBundle
- DoctrineFixturesBundle
 2018-10-04 14:11:57 +02:00
Jeremy Benoist
ad77c3451f
Looked UserBundle again. 
See https://github.com/FriendsOfSymfony/FOSUserBundle/compare/v2.0.2...v2.1.0#diff-8a79d0e62995dd549be4e463c35a8cc3

It generate an error about a variable called `registration_enabled` which can not be found.
So I guess we are in the case of “such usage” about BC in UserBundle. Don’t want to loose time finding how to fix it. Rollback to the working version.
 2018-02-24 22:12:48 +01:00
Jeremy Benoist
7185fbff62
Update dama/doctrine-test-bundle 
Because:

PHP Fatal error:  Class 'PHPUnit_Framework_BaseTestListener' not found in /home/travis/build/wallabag/wallabag/vendor/dama/doctrine-test-bundle/src/DAMA/DoctrineTestBundle/PHPUnit/LegacyPHPUnitListener.php on line 7
 2017-12-18 13:29:34 +01:00
Kevin Decherf
b495929c0d composer: update dependency versions to reduce memory footprint 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-11-19 21:00:27 +01:00
Jeremy Benoist
c8ac32cf17
Jump to Simpleue 2.0 
The 1.3.0 tag is introducing BC so we jump to the 2.0
 2017-11-18 16:28:54 +01:00
Jeremy Benoist
f40c88eb1f
Jump to Symfony 3.3 & update others deps 
Also update tests urls
 2017-10-09 16:45:12 +02:00
Nicolas Hart
c660878388 better entry txt export using html2text 2017-08-27 00:04:21 +02:00
Jeremy Benoist
f808b01692
Add a real configuration for CS-Fixer 2017-07-01 09:52:38 +02:00
Jeremy Benoist
906424c1b6
Crypt site credential password 2017-06-20 16:03:35 +02:00
Jérémy Benoist
2a0eec07a5 Merge pull request #3137 from aaa2000/isolated-tests 
Isolated tests
 2017-06-01 07:58:17 +02:00
adev
7ab5eb9508 Isolated tests 
Use https://github.com/dmaicher/doctrine-test-bundle to have test isolation.
 2017-05-31 16:03:54 +02:00
Jérémy Benoist
4368a27152
PR has been merged in graby 2017-05-31 14:00:15 +02:00
Jeremy Benoist
0d6cfb884c
Remove htmlawed and use graby instead 
Instead of using htmlawed (which is already used in graby) use graby directly (which require some refacto on graby side).
Still needs some tests.
 2017-05-31 14:00:15 +02:00
Jeremy Benoist
74a75f7d43
Use graby ContentExtractor to clean html 
It might be better to re-use some graby functionalities to clean html instead of building a new system.
 2017-05-31 14:00:15 +02:00
Jeremy Benoist
e869ee7d7f
Switch back to latest guzzle-site-authenticator 2017-05-24 07:29:46 +02:00
Jeremy Benoist
4ab0d25f65
Merge remote-tracking branch 'origin/master' into 2.3 2017-05-19 11:25:19 +02:00
Jeremy Benoist
8581fcae90
Lock guzzle-site-authenticator to avoid error 2017-05-16 23:34:42 +02:00
Nicolas Lœuillet
3b792787d7 Upgraded CraueConfigBundle to 2.0 2017-05-12 16:39:47 +02:00
Jeremy Benoist
e1d64050ad
Merge remote-tracking branch 'origin/master' into 2.3 2017-05-01 22:15:46 +02:00
Olivier Mehani
f972af3f5b Make symfony-assets-install use relative symlinks 
This facilitates packaging, when installing in a different work PREFIX
than the final install location.

Signed-off-by: Olivier Mehani <shtrom@ssji.net>
 2017-04-22 21:45:30 +10:00
Jeremy Benoist
177ef14c15
Remove dev FOSUserBundle 2017-04-18 08:08:26 +02:00
Jérémy Benoist
6ae579e43f Merge pull request #2861 from wallabag/2.3-droping-5.5 
Dropping PHP 5.5
 2017-03-28 13:18:17 +02:00
Jeremy Benoist
5a73f94590
Use wallabag/tcpdf 
It should restore the PHP 7.1 compatibility
 2017-02-24 15:05:45 +01:00
Jeremy Benoist
4cb9e0aad1
Dropping PHP 5.5 2017-02-11 12:02:35 +01:00
Kévin Gomez
177c5510ff Update RulerZ 2017-02-05 18:02:09 +01:00
Nicolas Lœuillet
7db1bdf1e4 Restored correct version for framework-extra-bundle 
The bundle was fixed in latest version.
 2017-02-04 18:26:16 +01:00
Nicolas Lœuillet
d3ef28c092
Freezed sensio/framework-extra-bundle version 2017-02-02 14:39:17 +01:00
Jeremy Benoist
363e2a9ce9 Lock kphoen/rulerz to avoid breaking changes 2017-01-26 11:01:25 +01:00
Jeremy Benoist
1ff2e71c1c
Use latest bdunogier/guzzle-site-authenticator 2017-01-10 18:50:55 +01:00
Jeremy Benoist
202a66ce02
Use simple-phpunit instead of phpunit 
To avoid problem with the Yaml constant
http://symfony.com/blog/how-to-solve-phpunit-issues-in-symfony-3-2-applications
 2016-12-13 09:33:06 +01:00
Nicolas Lœuillet
d68e045d86
Upgrade to Symfony 3.2 2016-11-30 11:08:38 +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
Bertrand Dunogier
7aab0ecf2f Added authentication for restricted access articles 
Fix #438. Thank you so much @bdunogier
 2016-11-22 14:01:46 +01:00
Jeremy Benoist
eb2d613c3e
Merge remote-tracking branch 'origin/master' into 2.2 2016-11-21 15:15:30 +01:00