aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Minor typo fixllune2016-12-301-4/+4
|
* Merge pull request #2624 from Rurik19/masterJeremy Benoist2016-11-211-1/+3
|\ | | | | Fix #2056 update config.yml
| * wrong spacesYuriy Evdokimov2016-11-211-2/+2
| |
| * Fix #2056 update config.ymlYuriy Evdokimov2016-11-211-1/+3
| | | | | | Resolves refresh token lifetime issue
* | Merge pull request #2625 from wallabag/prepare-215Nicolas Lœuillet2016-11-212-1/+6
|\ \ | | | | | | Prepare wallabag 2.1.5
| * | Prepare wallabag 2.1.5 :rocket:Nicolas Lœuillet2016-11-212-1/+6
|/ /
* | Merge pull request #2623 from wallabag/composer-php-5.5Jeremy Benoist2016-11-211-2/+5
|\ \ | |/ |/| Force composer to run as PHP 5.5.9
| * Lock down PHPUnit for PHP 5.5Jeremy Benoist2016-11-211-1/+1
| | | | | | | | | | Since Composer defined lowest version is now PHP 5.5.9. PHPUnit 5.0 require PHP 5.6.
| * Force composer to run as PHP 5.5.9Jeremy Benoist2016-11-201-1/+4
|/
* Merge pull request #2608 from wallabag/change-dev-versionJeremy Benoist2016-11-191-1/+1
|\ | | | | Change version to 2.2.0-dev
| * Change version to 2.2.0-devNicolas Lœuillet2016-11-191-1/+1
|/
* Merge pull request #2607 from wallabag/update-changelogNicolas Lœuillet2016-11-191-1/+5
|\ | | | | Updated changelog for 2.1.4
| * Updated changelog for 2.1.4Nicolas Lœuillet2016-11-191-1/+5
|/
* Merge pull request #2604 from wallabag/postgresql-versionNicolas Lœuillet2016-11-191-1/+22
|\ | | | | wallabag can’t work on PostgreSQL <= 9.1
| * Wallabag can’t work on PostgreSQL <= 9.1Jeremy Benoist2016-11-191-1/+22
| |
* | Merge pull request #2605 from wallabag/update-release-processNicolas Lœuillet2016-11-191-1/+14
|\ \ | | | | | | Add .travis.yml change to RELEASE_PROCESS
| * | Add .travis.yml change to RELEASE_PROCESSJeremy Benoist2016-11-191-1/+14
| |/
* | Merge pull request #2603 from wallabag/fix-composer-no-devJeremy Benoist2016-11-191-2/+2
|\ \ | |/ |/| Fix clear-cache problem using —no-dev
| * Fix clear-cache problem using —no-devJeremy Benoist2016-11-191-2/+2
|/ | | | | | Related to : > PHP Fatal error: Class 'FOS\RestBundle\Serializer\JMSSerializerAdapter' not found in /Users/j0k/Sites/github/wallabag/var/cache/prod/appProdProjectContainer.php on line 9139
* Merge pull request #2596 from wallabag/prepare-214Nicolas Lœuillet2016-11-182-1/+20
|\ | | | | Prepare wallabag 2.1.4 :rocket:
| * Prepare wallabag 2.1.4 :rocket:Nicolas Lœuillet2016-11-182-1/+20
|/
* Merge pull request #2550 from wallabag/reorder-documentationNicolas Lœuillet2016-11-1860-1418/+1681
|\ | | | | Reordered documentation
| * Undo translation of 'in english'.Julian Oster2016-11-181-1/+1
| |
| * Reordered documentation for German.Julian Oster2016-11-1719-485/+545
| |
| * Update translation of link to german translation.Julian Oster2016-11-172-2/+2
| |
| * Reordered :fr: documentationNicolas Lœuillet2016-11-1727-547/+654
| |
| * Reordered documentationNicolas Lœuillet2016-11-1718-389/+485
|/
* Merge pull request #2578 from wallabag/questionmark-iconNicolas Lœuillet2016-11-1733-34/+170
|\ | | | | Added help on config screen
| * Added tooltips for baggy themeNicolas Lœuillet2016-11-171-0/+18
| |
| * Added help on config screenNicolas Lœuillet2016-11-1733-34/+152
|/
* Merge pull request #2570 from wallabag/add-creation-dateJeremy Benoist2016-11-1510-33/+43
|\ | | | | Added creation date on entries view
| * Hide creation date in mobile viewNicolas Lœuillet2016-11-141-2/+2
| |
| * Changed display for material themeNicolas Lœuillet2016-11-144-5/+6
| |
| * Added creation date on entries viewNicolas Lœuillet2016-11-148-30/+39
| |
* | Merge pull request #2587 from wallabag/user-agentsJeremy Benoist2016-11-151-15/+0
|\ \ | | | | | | User-agents have moved to site-config
| * | User-agents have moved to site-configJeremy Benoist2016-11-141-15/+0
|/ / | | | | Since graby@1.5.0, user-agent can be defined in site-config, which the now recommended way
* | Merge pull request #2584 from blankoworld/masterJeremy Benoist2016-11-143-0/+18
|\ \ | |/ |/| fix #2582 - Documentation, Nginx config: disable all other PHP file from symphony
| * fix #2582 - Nginx config: disable all other PHP file from symphonyOlivier DOSSMANN2016-11-143-0/+18
|/ | | | | | | Regarding https://www.nginx.com/resources/wiki/start/topics/recipes/symfony/ we need to limit access to config.php and make_dev.php files from Nginx. That's why we return 404 error page for these files.
* Merge pull request #2577 from wallabag/add-tooltip-materialJeremy Benoist2016-11-141-3/+3
|\ | | | | Added tooltips in header bar
| * Added tooltips in header barNicolas Lœuillet2016-11-121-3/+3
| |
* | Merge pull request #2562 from wallabag/image-biggerThomas Citharel2016-11-1412-99/+176
|\ \ | | | | | | Bigger image preview in case of only image content
| * | Display a bigger image in case of image contentJeremy Benoist2016-11-0810-97/+164
| | | | | | | | | | | | | | | | | | If the content is only an image, we can display a bigger preview image because we won’t have text to display. Also, split different card view to avoid too much complexity in the entries.html.twig
| * | Add `grunt watch` taskJeremy Benoist2016-11-082-2/+8
| | |
| * | Remove the left margin of tagJeremy Benoist2016-11-081-0/+4
| | | | | | | | | | | | In the entries list, the first tag below the link isn’t stick to the left. Now it is.
* | | Merge pull request #2571 from wallabag/change-language-without-logoutNicolas Lœuillet2016-11-1113-12/+14
|\ \ \ | |_|/ |/| | Changed behavior when we change language
| * | Changed behavior when we change languageNicolas Lœuillet2016-11-1013-12/+14
|/ / | | | | | | No need to disconnect to apply the language substitution
* | Merge pull request #2565 from wallabag/remove-support-websiteNicolas Lœuillet2016-11-0912-12/+12
|\ \ | | | | | | Removed support website on about page
| * | Removed support website on about pageNicolas Lœuillet2016-11-0912-12/+12
|/ /
* | Merge pull request #2563 from wallabag/pr-templateNicolas Lœuillet2016-11-091-8/+13
|\ \ | |/ |/| Improve PR template
| * Improve PR templateJeremy Benoist2016-11-081-8/+13
|/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 10:36:22 +0000