aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Update testJeremy Benoist2016-09-032-4/+12
| | | | | | | If the database isn't found when checking for the connection it means, we can connect to the server. The InstallCommand will create the database later. Also, when checking for the SQLite connection, Doctrine creates the file (so the database). That's why the test is skipped for SQLite.
* Add a check for the database connectionJeremy Benoist2016-09-031-2/+18
| | | | | | Checking for the driver isn't enough. We are now checking if we can etablish a connection to the database before trying to do anything. By displaying the error from the Exception (in case of error) we hope to reduce issues overload about people getting error with the database
* Occitan versionQuent-in2016-08-271-0/+11
| | | | Occitan translation, I hope I properly put it where it has to be. If there reminds other textes to translate, please let me know!
* Merge pull request #2241 from modos189/v2-issue-1991Jeremy Benoist2016-08-261-0/+4
|\ | | | | Fix issue #1991: correction of the height field to add articles
| * 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
|\ | | | | V2 improve view
| * 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
|/ | | | | * The alignment of the login form centered in WebKit * Indent after the reference password recovery
* Merge pull request #2236 from wallabag/allow-failure-php-7.1Jeremy Benoist2016-08-241-0/+1
|\ | | | | Allow failure for PHP 7.1
| * Allow failure for PHP 7.1Jeremy Benoist2016-08-241-0/+1
|/ | | Got tired of `EE/home/travis/build.sh: line 45: 4445 Segmentation fault (core dumped) phpunit -v` using PHP 7.1.0beta3
* Merge pull request #2234 from cstuder/patch-1Nicolas Lœuillet2016-08-243-3/+3
|\ | | | | Fixes mailto link in documentation
| * 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 documentation
| * 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
|\ | | | | Cut entries title in card view: continued
| * 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 ↵Alexandr Danilov2016-08-225-0/+780
| | | | | | | | allows you to clip a text on the second line and fixed cut entries title in card view
| * Don't cut entries title in card viewBaptiste Mille-Mathias2016-05-211-1/+1
| | | | | | | | Stop cutting titles arbitrary at caracter 42.
* | Update SymfonyRequirementsJeremy Benoist2016-08-231-3/+10
| |
* | Merge pull request #2226 from wallabag/prepare-207Nicolas Lœuillet2016-08-226-5/+22
|\ \ | | | | | | Prepare wallabag 2.0.7
| * | Prepare wallabag 2.0.7Nicolas Lœuillet2016-08-226-5/+22
|/ /
* | Merge pull request #2222 from wallabag/add-date-on-article-viewNicolas Lœuillet2016-08-2213-0/+55
|\ \ | | | | | | Added creation date and reading time on article view
| * | Display text on baggyJeremy Benoist2016-08-2113-5/+20
| | | | | | | | | | | | Instead of using icons (which aren't available) display real text for reading time & creation date
| * | Changed code indentationNicolas Lœuillet2016-08-182-6/+14
| | |
| * | Added creation date and reading time on article viewNicolas Lœuillet2016-08-1813-0/+32
| | | | | | | | | | | | Fix #2034
* | | Merge pull request #2221 from wallabag/replace-favorite-starJeremy Benoist2016-08-2116-22/+22
|\ \ \ | | | | | | | | Replaced favorite word/icon with star one
| * | | Fixed some translationsNicolas Lœuillet2016-08-183-4/+4
| | | |
| * | | Replaced favorite word/icon with star oneNicolas Lœuillet2016-08-1816-22/+22
| |/ / | | | | | | | | | Fix #2041
* | | Merge pull request #2224 from wallabag/avoid-exception-importThomas Citharel2016-08-206-32/+154
|\ \ \ | |/ / |/| | Avoid breaking import when fetching fail
| * | Avoid breaking import when fetching failJeremy Benoist2016-08-206-32/+154
|/ / | | | | | | | | | | | | | | | | graby will throw an Exception in some case (like a bad url, a restricted url or a secured pdf). Import doesn't handle that case and break the whole import. With that commit the import isn't stopped but the entry is just skipped. Also, as a bonus, I've added extra test on WallabagImportV2 when the json is empty.
* | Merge pull request #2220 from Rurik19/masterJeremy Benoist2016-08-181-1/+1
|\ \ | | | | | | Enable PATCH method for CORS in API part
| * | Enable PATCH method for CORS in API partRurik192016-08-181-1/+1
| | |
* | | Merge pull request #2134 from wallabag/hhvmJeremy Benoist2016-08-171-7/+23
|\ \ \ | | | | | | | | Run tests on an uptodate HHVM
| * | | Run tests on an uptodate HHVMJeremy Benoist2016-08-171-7/+23
|/ / / | | | | | | | | | Using some tricks from symfony/symfony
* | | Merge pull request #2095 from wallabag/fix-2auth-formJeremy Benoist2016-08-177-10/+32
|\ \ \ | | | | | | | | Fix form user display when 2FA is disabled
| * | | CSJeremy Benoist2016-08-173-5/+7
| | | |
| * | | Fix testsJeremy Benoist2016-08-172-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure tests after the InstallCommand test will have a clean database. Previous attempt failed because of a foreign key Also, nightly on Travis seems to target PHP 7.2-dev, so I put 7.1 in requirement and moved nightly in allowed failures. And it seems xdebug isn't shipped with PHP 7.1, so I added a workaround to avoid build to fail when trying to remove xdebug.ini file.
| * | | Fix form user display for baggy themeNicolas Lœuillet2016-08-171-1/+2
| | | |
| * | | Fix form user display when 2FA is disabledNicolas Lœuillet2016-08-171-1/+1
| | | |
* | | | Disable autobranch & commitJeremy Benoist2016-08-171-0/+2
| | | |
* | | | Enable ZapprJeremy Benoist2016-08-171-0/+24
|/ / /
* | | Merge pull request #2216 from Rurik19/masterNicolas Lœuillet2016-08-161-0/+5
|\| | | | | | | | Enable CORS headers for OAUTH part
| * | Enable CORS headers for OAUTH partRurik192016-08-121-0/+5
| | |
* | | Changed URL for scrutinizer in READMENicolas Lœuillet2016-08-111-1/+1
| | |
* | | Merge pull request #2212 from wallabag/prepare-206Nicolas Lœuillet2016-08-106-6/+22
|\ \ \ | | | | | | | | Prepare release 2.0.6
| * | | Prepare release 2.0.6Nicolas Lœuillet2016-08-106-6/+22
|/ / /
* | | Merge pull request #2200 from charno6/patch-1Thomas Citharel2016-07-231-1/+1
|\ \ \ | | | | | | | | Fixed typo in entry:notice:entry_saved