aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2680 from wallabag/taggingrule-255Nicolas Lœuillet2016-12-062-0/+24
|\ | | | | Limit rule to 255
| * Limit rule to 255Jeremy Benoist2016-12-032-0/+24
| | | | | | | | To avoid database error
* | Merge pull request #2679 from jcharaoui/fix-2658Nicolas Lœuillet2016-12-0410-35/+40
|\ \ | |/ |/| Fix content from imported entried being discarded when URL goes bad
| * Add some commentsJeremy Benoist2016-12-041-0/+3
| |
| * Revert switch to KernelTestCase for ContentProxyTestJerome Charaoui2016-12-032-20/+4
| | | | | | | | | | Define the error string manually inside the test class instead of fetching it from app config.
| * Add missing CoreKernelTestCase classJerome Charaoui2016-12-031-0/+17
| |
| * Fix WallabagV1Controller testJerome Charaoui2016-12-031-4/+4
| | | | | | | | Account for URL redirection in refreshed entry.
| * Fix ContentProxy testsJerome Charaoui2016-12-031-17/+18
| |
| * Allow fetching content on all import typesJerome Charaoui2016-12-034-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 failsJerome Charaoui2016-12-021-3/+3
| |
| * Imported entries which fail to fetch get standard error bodyJerome Charaoui2016-12-025-3/+5
| |
| * Retain imported content if fetching fails, fixes #2658Jerome Charaoui2016-12-022-2/+8
|/
* Merge pull request #2677 from wallabag/add-wallabag_user.de.ymlNicolas Lœuillet2016-12-011-0/+11
|\ | | | | add translations/wallabag_user.de.yml (fixes #2673)
| * Update wallabag_user.de.ymlStrubbl2016-12-011-1/+1
| | | | | | Wallabag->wallabag
| * add translations/wallabag_user.de.yml (fixes #2673)Sven Fischer2016-12-011-0/+11
| |
* | Merge pull request #2676 from wallabag/update-addonsNicolas Lœuillet2016-12-0114-5/+19
|\ \ | | | | | | Updated addons links
| * | Updated addons linksNicolas Lœuillet2016-12-0114-5/+19
| | |
* | | Merge pull request #2674 from wallabag/fix-404img-2FANicolas Lœuillet2016-12-012-2/+2
|\ \ \ | |/ / |/| | Fixed 404 for wallabag logo in 2FA
| * | Fixed 404 for wallabag logo in 2FANicolas Lœuillet2016-12-012-2/+2
|/ /
* | Merge pull request #2672 from wallabag/fix-typoJeremy Benoist2016-12-013-4/+4
|\ \ | | | | | | Fixed typo in asynchronous documentation
| * | Fixed typo in asynchronous documentationNicolas Lœuillet2016-11-303-4/+4
|/ /
* | Merge pull request #2670 from wallabag/add-floating-buttonNicolas Lœuillet2016-11-301-0/+11
|\ \ | | | | | | Added floating button on entry view for mobile
| * | Added floating button on entry view for mobileNicolas Lœuillet2016-11-301-0/+11
|/ /
* | Merge pull request #2650 from wallabag/add-hascolumnJeremy Benoist2016-11-3014-89/+101
|\ \ | | | | | | Added hasColumn() in migration to check column existence
| * | Named indexNicolas Lœuillet2016-11-301-1/+9
| | |
| * | Code reviewNicolas Lœuillet2016-11-302-7/+4
| | |
| * | Fixed typoNicolas Lœuillet2016-11-281-2/+2
| | |
| * | Cleaned old migrationsNicolas Lœuillet2016-11-284-35/+26
| | |
| * | Added dropColumn for SQLite and some enhancementsNicolas Lœuillet2016-11-286-35/+37
| | |
| * | Replaced abortIf with skipIfNicolas Lœuillet2016-11-2812-24/+22
| | |
| * | Added checks on migrationsNicolas Lœuillet2016-11-286-11/+25
| | |
| * | Removed my hasColumn and used the existing one in DoctrineNicolas Lœuillet2016-11-281-35/+1
| | |
| * | Added hasColumn() in migration to check column existenceNicolas Lœuillet2016-11-281-4/+40
| | |
* | | Merge pull request #2662 from wallabag/add-list-viewNicolas Lœuillet2016-11-2813-19/+175
|\ \ \ | |/ / |/| | Add list view
| * | Renamed view_mode by list_mode and hide excerptNicolas Lœuillet2016-11-2810-32/+43
| | |
| * | Hide article text on mobile with list modeNicolas Lœuillet2016-11-285-3/+9
| | |
| * | Added test for list viewNicolas Lœuillet2016-11-281-1/+18
| | |
| * | Added list viewNicolas Lœuillet2016-11-2812-17/+139
|/ /
* | Merge pull request #2663 from wallabag/remove-fosuser-attributesNicolas Lœuillet2016-11-2817-28/+62
|\ \ | | | | | | Removed FOSUser attributes removed in alpha4
| * | Added migration to remove useless fieldsNicolas Lœuillet2016-11-281-0/+61
| | |
| * | Removed FOSUser attributes removed in alpha4Nicolas Lœuillet2016-11-2816-28/+1
| | | | | | | | | | | | See https://github.com/FriendsOfSymfony/FOSUserBundle/blob/master/Upgrade.md\#200-alpha3-to-200-alpha4
* | | Merge pull request #2659 from ↵Nicolas Lœuillet2016-11-285-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 withAndrew Kovalyov2016-11-285-1/+54
| |/ | | | | | | non-latin chars subset.
* | Merge pull request #2654 from Kdecherf/domain-filterJeremy Benoist2016-11-272-1/+10
|\ \ | | | | | | Enforce lowercase on domain name filter
| * | Enforce lowercase on domain name filterKevin Decherf2016-11-262-1/+10
|/ / | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #2622 from Kdecherf/ui-changesNicolas Lœuillet2016-11-252-4/+92
|\ \ | | | | | | Material UI Changes
| * | Minified CSSNicolas Lœuillet2016-11-251-2/+2
| | |
| * | Material: update size of text in articleKevin Decherf2016-11-251-0/+2
| | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | Material: render blockquote in italic and strong in bold in articleKevin Decherf2016-11-251-0/+8
| | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | Material: update style of pre in articleKevin Decherf2016-11-251-0/+14
| | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>