Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add a check for the database connection | Jeremy Benoist | 2016-09-03 | 1 | -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 version | Quent-in | 2016-08-27 | 1 | -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-1991 | Jeremy Benoist | 2016-08-26 | 1 | -0/+4 |
|\ | | | | | Fix issue #1991: correction of the height field to add articles | ||||
| * | Fix issue #1991: correction of the height field to add articles | Alexandr Danilov | 2016-08-26 | 1 | -0/+4 |
|/ | |||||
* | Merge pull request #2238 from modos189/v2-improve-view | Thomas Citharel | 2016-08-25 | 5 | -18/+83 |
|\ | | | | | V2 improve view | ||||
| * | A new version of the plugin tinydot with update on window resize | Alexandr Danilov | 2016-08-25 | 3 | -17/+81 |
| | | |||||
| * | Changes in the login form: | Alexandr Danilov | 2016-08-25 | 2 | -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.1 | Jeremy Benoist | 2016-08-24 | 1 | -0/+1 |
|\ | | | | | Allow failure for PHP 7.1 | ||||
| * | Allow failure for PHP 7.1 | Jeremy Benoist | 2016-08-24 | 1 | -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-1 | Nicolas Lœuillet | 2016-08-24 | 3 | -3/+3 |
|\ | | | | | Fixes mailto link in documentation | ||||
| * | Fixes mailto link in german translation | Christian Studer | 2016-08-24 | 1 | -1/+1 |
| | | |||||
| * | Fixes mailto link in french translation | Christian Studer | 2016-08-24 | 1 | -1/+1 |
| | | |||||
| * | Fixes mailto link | Christian Studer | 2016-08-24 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #2235 from wallabag/german-doc-config | Nicolas Lœuillet | 2016-08-24 | 2 | -0/+57 |
|\ \ | |/ |/| | Add configuration for german documentation | ||||
| * | Add configuration for german documentation | Nicolas Lœuillet | 2016-08-24 | 2 | -0/+57 |
|/ | |||||
* | Merge pull request #2230 from modos189/issue_2055 | Nicolas Lœuillet | 2016-08-23 | 5 | -1/+48 |
|\ | | | | | Cut entries title in card view: continued | ||||
| * | Replacement plugin dotdotdot (6.7 KB) on my tinydot (315 bytes) | Alexandr Danilov | 2016-08-23 | 5 | -773/+41 |
| | | |||||
| * | Simplify the initialization of the plugin dotdotdot | Alexandr Danilov | 2016-08-22 | 2 | -2/+1 |
| | | |||||
| * | Added the jquery library dotdotdot ( http://dotdotdot.frebsite.nl/ ) that ↵ | Alexandr Danilov | 2016-08-22 | 5 | -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 view | Baptiste Mille-Mathias | 2016-05-21 | 1 | -1/+1 |
| | | | | | | | | Stop cutting titles arbitrary at caracter 42. | ||||
* | | Update SymfonyRequirements | Jeremy Benoist | 2016-08-23 | 1 | -3/+10 |
| | | |||||
* | | Merge pull request #2226 from wallabag/prepare-207 | Nicolas Lœuillet | 2016-08-22 | 6 | -5/+22 |
|\ \ | | | | | | | Prepare wallabag 2.0.7 | ||||
| * | | Prepare wallabag 2.0.7 | Nicolas Lœuillet | 2016-08-22 | 6 | -5/+22 |
|/ / | |||||
* | | Merge pull request #2222 from wallabag/add-date-on-article-view | Nicolas Lœuillet | 2016-08-22 | 13 | -0/+55 |
|\ \ | | | | | | | Added creation date and reading time on article view | ||||
| * | | Display text on baggy | Jeremy Benoist | 2016-08-21 | 13 | -5/+20 |
| | | | | | | | | | | | | Instead of using icons (which aren't available) display real text for reading time & creation date | ||||
| * | | Changed code indentation | Nicolas Lœuillet | 2016-08-18 | 2 | -6/+14 |
| | | | |||||
| * | | Added creation date and reading time on article view | Nicolas Lœuillet | 2016-08-18 | 13 | -0/+32 |
| | | | | | | | | | | | | Fix #2034 | ||||
* | | | Merge pull request #2221 from wallabag/replace-favorite-star | Jeremy Benoist | 2016-08-21 | 16 | -22/+22 |
|\ \ \ | | | | | | | | | Replaced favorite word/icon with star one | ||||
| * | | | Fixed some translations | Nicolas Lœuillet | 2016-08-18 | 3 | -4/+4 |
| | | | | |||||
| * | | | Replaced favorite word/icon with star one | Nicolas Lœuillet | 2016-08-18 | 16 | -22/+22 |
| |/ / | | | | | | | | | | Fix #2041 | ||||
* | | | Merge pull request #2224 from wallabag/avoid-exception-import | Thomas Citharel | 2016-08-20 | 6 | -32/+154 |
|\ \ \ | |/ / |/| | | Avoid breaking import when fetching fail | ||||
| * | | Avoid breaking import when fetching fail | Jeremy Benoist | 2016-08-20 | 6 | -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/master | Jeremy Benoist | 2016-08-18 | 1 | -1/+1 |
|\ \ | | | | | | | Enable PATCH method for CORS in API part | ||||
| * | | Enable PATCH method for CORS in API part | Rurik19 | 2016-08-18 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #2134 from wallabag/hhvm | Jeremy Benoist | 2016-08-17 | 1 | -7/+23 |
|\ \ \ | | | | | | | | | Run tests on an uptodate HHVM | ||||
| * | | | Run tests on an uptodate HHVM | Jeremy Benoist | 2016-08-17 | 1 | -7/+23 |
|/ / / | | | | | | | | | | Using some tricks from symfony/symfony | ||||
* | | | Merge pull request #2095 from wallabag/fix-2auth-form | Jeremy Benoist | 2016-08-17 | 7 | -10/+32 |
|\ \ \ | | | | | | | | | Fix form user display when 2FA is disabled | ||||
| * | | | CS | Jeremy Benoist | 2016-08-17 | 3 | -5/+7 |
| | | | | |||||
| * | | | Fix tests | Jeremy Benoist | 2016-08-17 | 2 | -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 theme | Nicolas Lœuillet | 2016-08-17 | 1 | -1/+2 |
| | | | | |||||
| * | | | Fix form user display when 2FA is disabled | Nicolas Lœuillet | 2016-08-17 | 1 | -1/+1 |
| | | | | |||||
* | | | | Disable autobranch & commit | Jeremy Benoist | 2016-08-17 | 1 | -0/+2 |
| | | | | |||||
* | | | | Enable Zappr | Jeremy Benoist | 2016-08-17 | 1 | -0/+24 |
|/ / / | |||||
* | | | Merge pull request #2216 from Rurik19/master | Nicolas Lœuillet | 2016-08-16 | 1 | -0/+5 |
|\| | | | | | | | | Enable CORS headers for OAUTH part | ||||
| * | | Enable CORS headers for OAUTH part | Rurik19 | 2016-08-12 | 1 | -0/+5 |
| | | | |||||
* | | | Changed URL for scrutinizer in README | Nicolas Lœuillet | 2016-08-11 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #2212 from wallabag/prepare-206 | Nicolas Lœuillet | 2016-08-10 | 6 | -6/+22 |
|\ \ \ | | | | | | | | | Prepare release 2.0.6 | ||||
| * | | | Prepare release 2.0.6 | Nicolas Lœuillet | 2016-08-10 | 6 | -6/+22 |
|/ / / | |||||
* | | | Merge pull request #2200 from charno6/patch-1 | Thomas Citharel | 2016-07-23 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fixed typo in entry:notice:entry_saved | ||||
| * | | | Fixed typo in entry:notice:entry_saved | charno6 | 2016-07-23 | 1 | -1/+1 |
|/ / / | | | | | | | "Eintag" to "Eintrag" |