Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2676 from wallabag/update-addons | Nicolas Lœuillet | 2016-12-01 | 14 | -5/+19 |
|\ | | | | | Updated addons links | ||||
| * | Updated addons links | Nicolas Lœuillet | 2016-12-01 | 14 | -5/+19 |
| | | |||||
* | | Merge pull request #2674 from wallabag/fix-404img-2FA | Nicolas Lœuillet | 2016-12-01 | 2 | -2/+2 |
|\ \ | |/ |/| | Fixed 404 for wallabag logo in 2FA | ||||
| * | Fixed 404 for wallabag logo in 2FA | Nicolas Lœuillet | 2016-12-01 | 2 | -2/+2 |
|/ | |||||
* | Merge pull request #2672 from wallabag/fix-typo | Jeremy Benoist | 2016-12-01 | 3 | -4/+4 |
|\ | | | | | Fixed typo in asynchronous documentation | ||||
| * | Fixed typo in asynchronous documentation | Nicolas Lœuillet | 2016-11-30 | 3 | -4/+4 |
|/ | |||||
* | Merge pull request #2670 from wallabag/add-floating-button | Nicolas Lœuillet | 2016-11-30 | 1 | -0/+11 |
|\ | | | | | Added floating button on entry view for mobile | ||||
| * | Added floating button on entry view for mobile | Nicolas Lœuillet | 2016-11-30 | 1 | -0/+11 |
|/ | |||||
* | Merge pull request #2650 from wallabag/add-hascolumn | Jeremy Benoist | 2016-11-30 | 14 | -89/+101 |
|\ | | | | | Added hasColumn() in migration to check column existence | ||||
| * | Named index | Nicolas Lœuillet | 2016-11-30 | 1 | -1/+9 |
| | | |||||
| * | Code review | Nicolas Lœuillet | 2016-11-30 | 2 | -7/+4 |
| | | |||||
| * | Fixed typo | Nicolas Lœuillet | 2016-11-28 | 1 | -2/+2 |
| | | |||||
| * | Cleaned old migrations | Nicolas Lœuillet | 2016-11-28 | 4 | -35/+26 |
| | | |||||
| * | Added dropColumn for SQLite and some enhancements | Nicolas Lœuillet | 2016-11-28 | 6 | -35/+37 |
| | | |||||
| * | Replaced abortIf with skipIf | Nicolas Lœuillet | 2016-11-28 | 12 | -24/+22 |
| | | |||||
| * | Added checks on migrations | Nicolas Lœuillet | 2016-11-28 | 6 | -11/+25 |
| | | |||||
| * | Removed my hasColumn and used the existing one in Doctrine | Nicolas Lœuillet | 2016-11-28 | 1 | -35/+1 |
| | | |||||
| * | Added hasColumn() in migration to check column existence | Nicolas Lœuillet | 2016-11-28 | 1 | -4/+40 |
| | | |||||
* | | Merge pull request #2662 from wallabag/add-list-view | Nicolas Lœuillet | 2016-11-28 | 13 | -19/+175 |
|\ \ | |/ |/| | Add list view | ||||
| * | Renamed view_mode by list_mode and hide excerpt | Nicolas Lœuillet | 2016-11-28 | 10 | -32/+43 |
| | | |||||
| * | Hide article text on mobile with list mode | Nicolas Lœuillet | 2016-11-28 | 5 | -3/+9 |
| | | |||||
| * | Added test for list view | Nicolas Lœuillet | 2016-11-28 | 1 | -1/+18 |
| | | |||||
| * | Added list view | Nicolas Lœuillet | 2016-11-28 | 12 | -17/+139 |
|/ | |||||
* | Merge pull request #2663 from wallabag/remove-fosuser-attributes | Nicolas Lœuillet | 2016-11-28 | 17 | -28/+62 |
|\ | | | | | Removed FOSUser attributes removed in alpha4 | ||||
| * | Added migration to remove useless fields | Nicolas Lœuillet | 2016-11-28 | 1 | -0/+61 |
| | | |||||
| * | Removed FOSUser attributes removed in alpha4 | Nicolas Lœuillet | 2016-11-28 | 16 | -28/+1 |
| | | | | | | | | See https://github.com/FriendsOfSymfony/FOSUserBundle/blob/master/Upgrade.md\#200-alpha3-to-200-alpha4 | ||||
* | | Merge pull request #2659 from ↵ | Nicolas Lœuillet | 2016-11-28 | 5 | -1/+54 |
|\ \ | |/ |/| | | | | | akovalyov/bugfix/non-latin-characters-in-reading-time-calculation Fix incorrect reading time calculation for entries in non-latin languages. | ||||
| * | Fix incorrect reading time calculation for entries in languages with | Andrew Kovalyov | 2016-11-28 | 5 | -1/+54 |
| | | | | | | | | non-latin chars subset. | ||||
* | | Merge pull request #2654 from Kdecherf/domain-filter | Jeremy Benoist | 2016-11-27 | 2 | -1/+10 |
|\ \ | | | | | | | Enforce lowercase on domain name filter | ||||
| * | | Enforce lowercase on domain name filter | Kevin Decherf | 2016-11-26 | 2 | -1/+10 |
|/ / | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | | Merge pull request #2622 from Kdecherf/ui-changes | Nicolas Lœuillet | 2016-11-25 | 2 | -4/+92 |
|\ \ | | | | | | | Material UI Changes | ||||
| * | | Minified CSS | Nicolas Lœuillet | 2016-11-25 | 1 | -2/+2 |
| | | | |||||
| * | | Material: update size of text in article | Kevin Decherf | 2016-11-25 | 1 | -0/+2 |
| | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | Material: render blockquote in italic and strong in bold in article | Kevin Decherf | 2016-11-25 | 1 | -0/+8 |
| | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | Material: update style of pre in article | Kevin Decherf | 2016-11-25 | 1 | -0/+14 |
| | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | Material: update style of ul in article | Kevin Decherf | 2016-11-25 | 1 | -0/+9 |
| | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | Material: update style of article links | Kevin Decherf | 2016-11-25 | 1 | -0/+9 |
| | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | Material: increase max width of article on large screens | Kevin Decherf | 2016-11-25 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | Material: prevent bold in title, update title font size | Kevin Decherf | 2016-11-25 | 1 | -0/+33 |
| | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | Material: change color of background, article content and titles | Kevin Decherf | 2016-11-25 | 1 | -1/+14 |
|/ / | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | | Merge pull request #2642 from wallabag/fix-logout-shortcut | Nicolas Lœuillet | 2016-11-23 | 4 | -4/+4 |
|\ \ | | | | | | | Fixed logout shortcut | ||||
| * | | Fixed logout shortcut | Nicolas Lœuillet | 2016-11-23 | 4 | -4/+4 |
|/ / | |||||
* | | Merge pull request #2620 from wallabag/fix-password-layout | Jeremy Benoist | 2016-11-23 | 17 | -28/+72 |
|\ \ | | | | | | | Fix password layout | ||||
| * | | Remove empty line | Jeremy Benoist | 2016-11-23 | 1 | -1/+0 |
| | | | |||||
| * | | Add migration for new FOSUser version | Jeremy Benoist | 2016-11-22 | 1 | -0/+57 |
| | | | |||||
| * | | Fix MonologBundle deprecation | Jeremy Benoist | 2016-11-22 | 1 | -1/+1 |
| | | | | | | | | | | | | 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. | ||||
| * | | Re-use FOSUser master branch | Jeremy Benoist | 2016-11-22 | 4 | -8/+9 |
| | | | |||||
| * | | Fix Travis | Jeremy Benoist | 2016-11-22 | 1 | -1/+1 |
| | | | |||||
| * | | Use the correct template | Jeremy Benoist | 2016-11-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | These files aren’t used anymore | Jeremy Benoist | 2016-11-22 | 10 | -17/+4 |
| | | | | | | | | | | | | Translation were moved to the global one |