Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2680 from wallabag/taggingrule-255 | Nicolas Lœuillet | 2016-12-06 | 2 | -0/+24 |
|\ | | | | | Limit rule to 255 | ||||
| * | Limit rule to 255 | Jeremy Benoist | 2016-12-03 | 2 | -0/+24 |
| | | | | | | | | To avoid database error | ||||
* | | Merge pull request #2679 from jcharaoui/fix-2658 | Nicolas Lœuillet | 2016-12-04 | 10 | -35/+40 |
|\ \ | |/ |/| | Fix content from imported entried being discarded when URL goes bad | ||||
| * | Add some comments | Jeremy Benoist | 2016-12-04 | 1 | -0/+3 |
| | | |||||
| * | Revert switch to KernelTestCase for ContentProxyTest | Jerome Charaoui | 2016-12-03 | 2 | -20/+4 |
| | | | | | | | | | | Define the error string manually inside the test class instead of fetching it from app config. | ||||
| * | Add missing CoreKernelTestCase class | Jerome Charaoui | 2016-12-03 | 1 | -0/+17 |
| | | |||||
| * | Fix WallabagV1Controller test | Jerome Charaoui | 2016-12-03 | 1 | -4/+4 |
| | | | | | | | | Account for URL redirection in refreshed entry. | ||||
| * | Fix ContentProxy tests | Jerome Charaoui | 2016-12-03 | 1 | -17/+18 |
| | | |||||
| * | Allow fetching content on all import types | Jerome Charaoui | 2016-12-03 | 4 | -8/+0 |
| | | | | | | | | | | For better consistency, allow all types of imported entries to update, which was already the case for Firefox and Chrome. | ||||
| * | Prevent undefined index when import fetching fails | Jerome Charaoui | 2016-12-02 | 1 | -3/+3 |
| | | |||||
| * | Imported entries which fail to fetch get standard error body | Jerome Charaoui | 2016-12-02 | 5 | -3/+5 |
| | | |||||
| * | Retain imported content if fetching fails, fixes #2658 | Jerome Charaoui | 2016-12-02 | 2 | -2/+8 |
|/ | |||||
* | Merge pull request #2677 from wallabag/add-wallabag_user.de.yml | Nicolas Lœuillet | 2016-12-01 | 1 | -0/+11 |
|\ | | | | | add translations/wallabag_user.de.yml (fixes #2673) | ||||
| * | Update wallabag_user.de.yml | Strubbl | 2016-12-01 | 1 | -1/+1 |
| | | | | | | Wallabag->wallabag | ||||
| * | add translations/wallabag_user.de.yml (fixes #2673) | Sven Fischer | 2016-12-01 | 1 | -0/+11 |
| | | |||||
* | | 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> |