aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | Fixed typo in entry:notice:entry_savedcharno62016-07-231-1/+1
|/ / | | | | "Eintag" to "Eintrag"
* | Merge pull request #2199 from Simounet/facto/social-linksJeremy Benoist2016-07-218-52/+95
|\ \ | | | | | | Handling socials links into a config file
| * | php-cs-fixer passSimounet2016-07-202-2/+4
| | |
| * | Chrome extension URL updatedSimounet2016-07-201-1/+1
| | |
| * | Handling socials links into a config fileSimounet2016-07-208-52/+93
| | |
* | | Merge pull request #2198 from Simounet/fix/image-inside-figureThomas Citharel2016-07-202-2/+3
|\ \ \ | |/ / |/| | FIX image inside a figure element max-width
| * | FIX image inside a figure element max-width (baggy theme)Simounet2016-07-201-1/+1
| | |
| * | FIX image inside a figure element max-widthSimounet2016-07-201-1/+2
|/ /
* | Merge pull request #2195 from wallabag/remove-binNicolas Lœuillet2016-07-2010-9/+6
|\ \ | | | | | | Remove binary from repo
| * | Remove binary from repoJeremy Benoist2016-07-2010-9/+6
|/ / | | | | | | | | | | | | Since Composer 1.2, binaries are re-installed from vendors if there aren't found. This avoid us to commit binaries vendors into the repo. :warning: You have to update your Composer to the 1.2 (`composer selfupdate`)
* | Merge pull request #2048 from wallabag/travis-php-7.1Nicolas Lœuillet2016-07-193-2/+3
|\ \ | | | | | | Run PHP 7.1 on Travis
| * | Run PHP 7.1 on TravisJeremy Benoist2016-07-183-2/+3
| | | | | | | | | | | | | | | - Using nightly (as of now it's PHP 7.1 alpha) - Force guzzle to be at least 5.3.1 (which fix some bugs in PHP 7)
* | | Merge pull request #2194 from benages/patch-2Jeremy Benoist2016-07-181-1/+1
|\ \ \ | |/ / |/| | Fixed spelling Artúclos --> Artículos
| * | Fixed spelling Artúclos --> Artículosbenages2016-07-181-1/+1
|/ /
* | Merge pull request #2185 from wallabag/fix-3rd-party-linksThomas Citharel2016-07-021-2/+2
|\ \ | | | | | | Fix 3rd-Party Apps links (Chrome & Firefox)
| * | Remove fr partThomas Citharel2016-07-021-1/+1
| | |
| * | Fix 3rd-Party Apps links (Chrome & Firefox)Thomas Citharel2016-07-021-2/+2
|/ /
* | Merge pull request #2172 from wallabag/more-testsNicolas Lœuillet2016-06-2411-51/+138
|\ \ | | | | | | Change the way to login user in tests
| * | Change the way to login user in testsJeremy Benoist2016-06-246-9/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using a HTTP request we just login user like FOSUser does. It allows us to mock service in container for functional tests. Also, fix a bad config name in fos_user for firewall And finally, add functional test to PocketImport
| * | Remove useless spacesJeremy Benoist2016-06-246-42/+48
|/ /
* | Merge pull request #2157 from wallabag/lower-upper-readingtimeJeremy Benoist2016-06-232-7/+52
|\ \ | | | | | | Handle only upper or only lower reading filter
| * | Add some tests about readingTimeJeremy Benoist2016-06-231-0/+36
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 10:10:39 +0000