Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1900 from wallabag/v2-remove-pt-empty-doc | Jeremy Benoist | 2016-04-10 | 3 | -93/+0 |
|\ | | | | | Remove empty portugese documentation | ||||
| * | Remove empty portugese documentation | Nicolas Lœuillet | 2016-04-10 | 3 | -93/+0 |
| | | |||||
* | | Fix typo in french documentation | Nicolas Lœuillet | 2016-04-10 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1899 from wallabag/v2-nginx-doc | Jeremy Benoist | 2016-04-10 | 2 | -1/+9 |
|\ | | | | | Add documentation about importing large file into nginx | ||||
| * | Add documentation about importing large file into nginx | Nicolas Lœuillet | 2016-04-10 | 2 | -1/+9 |
| | | | | | | | | Fix #1849: configuration to avoid 413 Request Entity Too Large. | ||||
* | | Merge pull request #1898 from wallabag/v2-fix-readingtime-display-material | Jeremy Benoist | 2016-04-10 | 1 | -2/+1 |
|\ \ | |/ |/| | Fix estimated reading time in material view | ||||
| * | Fix estimated reading time in material view | Nicolas Lœuillet | 2016-04-10 | 1 | -2/+1 |
| | | | | | | | | Fix #1893 | ||||
* | | Merge pull request #1896 from wallabag/v2-fix-internal-settings | Jeremy Benoist | 2016-04-10 | 5 | -12/+13 |
|\ \ | | | | | | | Fix internal settings | ||||
| * | | Fix internal settings | Nicolas Lœuillet | 2016-04-09 | 5 | -12/+13 |
| |/ | | | | | | | Fix #1867: remove download_picture setting and manage show_printlink in material theme | ||||
* | | Merge pull request #1894 from wallabag/v2-fix-doc-link | Jeremy Benoist | 2016-04-10 | 2 | -2/+2 |
|\ \ | | | | | | | Fix documentation link in developer page | ||||
| * | | Fix documentation link in developer page | Nicolas Lœuillet | 2016-04-09 | 2 | -2/+2 |
| |/ | |||||
* | | Merge pull request #1891 from wallabag/v2-fix-rules-typo | Jeremy Benoist | 2016-04-10 | 2 | -2/+2 |
|\ \ | |/ |/| | Fix typo on configuration page | ||||
| * | Fix typo on configuration page | Nicolas Lœuillet | 2016-04-09 | 2 | -2/+2 |
|/ | |||||
* | Merge pull request #1824 from wallabag/v2-alternative-env | Jeremy Benoist | 2016-04-08 | 3 | -11/+12 |
|\ | | | | | Remove SMTP configuration environment overrides | ||||
| * | Add documentation | Nicolas Lœuillet | 2016-04-08 | 2 | -0/+10 |
| | | |||||
| * | Remove SMTP configuration environment overrides | Mathieu Bruyen | 2016-03-29 | 1 | -11/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SMTP configuration has been added in #1518 to use ParameterHandle's env-map. But Symfony actually has a native way of allowing parameters to be overriden from environment so rather than having to define a mapping for each possible parameter, users can define any override in parameters.yml: > parameters: > database_host: %WALLABAG_DB_HOST% and define an environment variable SYMFONY__WALLABAG_DB_HOST. Links: env-map: https://github.com/Incenteev/ParameterHandler#using-environment-variables-to-set-the-parameters Symfony external parameters: http://symfony.com/doc/current/cookbook/configuration/external_parameters.html | ||||
* | | Merge pull request #1879 from wallabag/v2-tag-field-position | Jeremy Benoist | 2016-04-08 | 1 | -4/+4 |
|\ \ | | | | | | | Move tag form in Material theme | ||||
| * | | Move tag form in Material theme | Nicolas Lœuillet | 2016-04-07 | 1 | -4/+4 |
| | | | |||||
* | | | Merge pull request #1884 from wallabag/nicosomb-patch-1 | Jeremy Benoist | 2016-04-08 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Change the installation method in issue template | ||||
| * | | | Change the installation method in issue template | Nicolas Lœuillet | 2016-04-08 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #1804 from wallabag/j0k3r-patch-1 | Nicolas Lœuillet | 2016-04-08 | 1 | -1/+16 |
|\ \ \ | | | | | | | | | Force user-agent for iansommerville.com | ||||
| * | | | Force user-agent for iansommerville.com | Jeremy Benoist | 2016-03-18 | 1 | -1/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using the default User Agent, the website returns a 403. By forcing the User Agent for this domain, we got the proper behavior: a 200 Since we can't _append_ new user agent to the default graby configuration, we need to rewrite all the default config + the new one. Fix #1801 | ||||
* | | | | Merge pull request #1868 from wallabag/v2-tagrule-baggy | Jeremy Benoist | 2016-04-07 | 3 | -84/+156 |
|\ \ \ \ | |_|/ / |/| | | | Remove keyboard shortcut and add tagging rule panel in baggy | ||||
| * | | | Remove keybaord shortcut and add tagging rule panel in baggy | Nicolas Lœuillet | 2016-04-05 | 3 | -84/+156 |
| | | | | |||||
* | | | | Lock ocramius/proxy-manager | Jeremy Benoist | 2016-04-06 | 1 | -1/+2 |
| | | | | | | | | | | | | To avoid problem with PHP < 7.0 | ||||
* | | | | Documentation about wallabag API | Nicolas Lœuillet | 2016-04-06 | 16 | -3/+486 |
|/ / / | |||||
* | | | Merge pull request #1862 from wallabag/v2-doc-import-wllbg1-cli | Jeremy Benoist | 2016-04-05 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | Add production environment for CLI import | ||||
| * | | | Add production environment for CLI import | Nicolas Lœuillet | 2016-04-05 | 2 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #1861 from wallabag/v2-round-estimated-time | Jeremy Benoist | 2016-04-05 | 2 | -11/+9 |
|\ \ \ \ | |/ / / |/| | | | Round estimated time and add reading speed for Baggy | ||||
| * | | | Round estimated time and add reading speed for Baggy | Nicolas Lœuillet | 2016-04-05 | 2 | -11/+9 |
| | | | | |||||
* | | | | Merge pull request #1856 from wallabag/v2-doc-import-wllbg1-cli | Thomas Citharel | 2016-04-05 | 2 | -0/+44 |
|\ \ \ \ | |/ / / |/| | | | Documentation about wallabag v1 CLI import | ||||
| * | | | Documentation about wallabag v1 CLI import | Nicolas Lœuillet | 2016-04-05 | 2 | -0/+44 |
|/ / / | |||||
* | | | Add migrate link in french documentation | Nicolas Lœuillet | 2016-04-05 | 1 | -0/+1 |
| | | | |||||
* | | | Add migrate link in english documentation | Nicolas Lœuillet | 2016-04-05 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #1840 from wallabag/v2-fix-archive-page-title | Jeremy Benoist | 2016-04-04 | 10 | -10/+10 |
|\ \ \ | | | | | | | | | Fix Archive page title translation | ||||
| * | | | Fix Archive page title translation | Nicolas Lœuillet | 2016-04-04 | 10 | -10/+10 |
|/ / / | |||||
* | | | Merge pull request #1835 from wallabag/v2-prepare-v22.0.0 | Thomas Citharel | 2016-04-03 | 10 | -44/+23 |
|\ \ \ | | | | | | | | | :rocket: Prepare v2.0.0 :birthday: | ||||
| * | | | Remove useless CSS | Nicolas Lœuillet | 2016-04-03 | 1 | -14/+0 |
| | | | | |||||
| * | | | :rocket: Prepare v2.0.0 :birthday: | Nicolas Lœuillet | 2016-04-03 | 9 | -30/+23 |
| | | | | |||||
* | | | | Merge pull request #1838 from wallabag/v2-hide-search | Thomas Citharel | 2016-04-03 | 2 | -4/+4 |
|\ \ \ \ | |/ / / |/| | | | Hide search buttons | ||||
| * | | | Hide search buttons | Nicolas Lœuillet | 2016-04-03 | 2 | -4/+4 |
|/ / / | |||||
* | | | Merge pull request #1832 from wallabag/pdo-driver | Nicolas Lœuillet | 2016-04-02 | 1 | -3/+4 |
|\ \ \ | | | | | | | | | Check selected PDO driver on install | ||||
| * | | | Check selected PDO driver on install | Jeremy Benoist | 2016-04-01 | 1 | -3/+4 |
|/ / / | | | | | | | | | | Instead of checking that one of the DB driver is installed we retrieve the selected driver (in parameters) and see if the extension exists. | ||||
* | | | Merge branch 'Quent-in-v2' into v2 | Jeremy Benoist | 2016-04-01 | 4 | -0/+456 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Add Occitan to available language | Jeremy Benoist | 2016-04-01 | 1 | -0/+1 |
| | | | |||||
| * | | Fix quotes for OC | Jeremy Benoist | 2016-04-01 | 1 | -6/+6 |
| | | | |||||
| * | | Merge pull request #3 from j0k3r/patch-1 | Quent-in | 2016-04-01 | 1 | -3/+3 |
| |\ \ | | | | | | | | | Fix simple quote | ||||
| | * | | Fix simple quote | Jeremy Benoist | 2016-04-01 | 1 | -3/+3 |
| |/ / | |||||
| * | | Occitan version | Quent-in | 2016-04-01 | 1 | -0/+2 |
| | | | |||||
| * | | OC version | Quent-in | 2016-04-01 | 1 | -0/+29 |
| | | |