aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Add tinydot to material concatJeremy Benoist2016-09-021-0/+1
* Fixed last merge who caused CSS/JS bugsNicolas Lœuillet2016-08-305-108/+3
* Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-08-2813-6/+192
|\
| * Occitan versionQuent-in2016-08-271-0/+11
| * Merge pull request #2241 from modos189/v2-issue-1991Jeremy Benoist2016-08-261-0/+4
| |\
| | * Fix issue #1991: correction of the height field to add articlesAlexandr Danilov2016-08-261-0/+4
| |/
| * Merge pull request #2238 from modos189/v2-improve-viewThomas Citharel2016-08-255-18/+83
| |\
| | * A new version of the plugin tinydot with update on window resizeAlexandr Danilov2016-08-253-17/+81
| | * Changes in the login form:Alexandr Danilov2016-08-252-1/+2
| |/
| * Merge pull request #2236 from wallabag/allow-failure-php-7.1Jeremy Benoist2016-08-241-0/+1
| |\
| | * Allow failure for PHP 7.1Jeremy Benoist2016-08-241-0/+1
| |/
| * Merge pull request #2234 from cstuder/patch-1Nicolas Lœuillet2016-08-243-3/+3
| |\
| | * Fixes mailto link in german translationChristian Studer2016-08-241-1/+1
| | * Fixes mailto link in french translationChristian Studer2016-08-241-1/+1
| | * Fixes mailto linkChristian Studer2016-08-241-1/+1
| * | Merge pull request #2235 from wallabag/german-doc-configNicolas Lœuillet2016-08-242-0/+57
| |\ \ | | |/ | |/|
| | * Add configuration for german documentationNicolas Lœuillet2016-08-242-0/+57
| |/
| * Merge pull request #2230 from modos189/issue_2055Nicolas Lœuillet2016-08-235-1/+48
| |\
| | * Replacement plugin dotdotdot (6.7 KB) on my tinydot (315 bytes)Alexandr Danilov2016-08-235-773/+41
| | * Simplify the initialization of the plugin dotdotdotAlexandr Danilov2016-08-222-2/+1
| | * Added the jquery library dotdotdot ( http://dotdotdot.frebsite.nl/ ) that all...Alexandr Danilov2016-08-225-0/+780
| | * Don't cut entries title in card viewBaptiste Mille-Mathias2016-05-211-1/+1
| * | Update SymfonyRequirementsJeremy Benoist2016-08-231-3/+10
* | | Merge pull request #2243 from wallabag/feature-untagged-entriesJeremy Benoist2016-08-2818-1/+78
|\ \ \
| * | | Add missing translationsJeremy Benoist2016-08-2810-0/+11
| * | | Add tests for untagged entriesNicolas Lœuillet2016-08-281-0/+10
| * | | Add untagged entriesNicolas Lœuillet2016-08-2817-1/+57
|/ / /
* | | Merge pull request #2245 from wallabag/change-page-titleJeremy Benoist2016-08-283-26/+15
|\ \ \
| * | | Changed where page title is displayedNicolas Lœuillet2016-08-263-26/+15
|/ / /
* | | Merge pull request #2240 from wallabag/add-icon-public-shareJeremy Benoist2016-08-262-1/+5
|\ \ \
| * | | Add icon for public share linkNicolas Lœuillet2016-08-252-1/+5
|/ / /
* | | Merge pull request #2237 from wallabag/add-original-url-public-entryNicolas Lœuillet2016-08-251-0/+1
|\ \ \
| * | | Remove text about original URL in public viewNicolas Lœuillet2016-08-251-1/+1
| * | | Add original link in public view of the articleNicolas Lœuillet2016-08-251-0/+1
|/ / /
* | | Merge pull request #1904 from wallabag/feature-public-modeJeremy Benoist2016-08-2533-9/+346
|\ \ \
| * | | Update testJeremy Benoist2016-08-243-18/+41
| * | | Handle share_entryJeremy Benoist2016-08-2411-0/+27
| * | | Handle table prefix in migrationJeremy Benoist2016-08-242-7/+29
| * | | Change annotation for uuid fieldNicolas Lœuillet2016-08-241-3/+3
| * | | Change links on baggy themeNicolas Lœuillet2016-08-231-1/+1
| * | | Change share entry behaviorNicolas Lœuillet2016-08-2317-23/+81
| * | | Add translationsNicolas Lœuillet2016-08-2312-3/+13
| * | | Improve migrationNicolas Lœuillet2016-08-231-9/+7
| * | | Add test and fix migrationNicolas Lœuillet2016-08-233-5/+51
| * | | Add Cache on Share ActionNicolas Lœuillet2016-08-232-3/+3
| * | | Add migrationNicolas Lœuillet2016-08-236-4/+42
| * | | Share entry with a public URLNicolas Lœuillet2016-08-235-1/+116
* | | | Merge pull request #2186 from wallabag/addRegistrationJeremy Benoist2016-08-249-2/+71
|\ \ \ \ | |/ / / |/| | |
| * | | Add simple testNicolas Lœuillet2016-08-242-1/+16
| * | | CSJeremy Benoist2016-08-232-2/+2