Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1909 from wallabag/prepare-release-2.0.1 | Nicolas Lœuillet | 2016-04-11 | 5 | -6/+6 |
|\ | | | | | Prepare release 2.0.1 | ||||
| * | Prepare release 2.0.1 | Nicolas Lœuillet | 2016-04-11 | 5 | -6/+6 |
|/ | |||||
* | Merge pull request #1902 from wallabag/v2-changelog | Jeremy Benoist | 2016-04-10 | 1 | -0/+64 |
|\ | | | | | Add changelog | ||||
| * | Update changelog | Nicolas Lœuillet | 2016-04-10 | 1 | -17/+22 |
| | | |||||
| * | Add changelog | Nicolas Lœuillet | 2016-04-10 | 1 | -0/+59 |
| | | |||||
* | | Merge pull request #1823 from wallabag/translation-fa | Nicolas Lœuillet | 2016-04-10 | 1 | -149/+149 |
|\ \ | | | | | | | Translation fa | ||||
| * | | Fix FA translations indentation | Jeremy Benoist | 2016-04-10 | 1 | -43/+43 |
| | | | |||||
| * | | Update messages.fa.yml | Masoud Abkenar | 2016-04-10 | 1 | -149/+149 |
| | | | |||||
* | | | Merge pull request #1903 from wallabag/force-server-version | Nicolas Lœuillet | 2016-04-10 | 2 | -1/+8 |
|\ \ \ | | | | | | | | | Force server version to avoid connexion error | ||||
| * | | | Force server version to avoid connexion error | Jeremy Benoist | 2016-04-10 | 2 | -1/+8 |
| |/ / | | | | | | | | | | | | | When installing a new project with MySQL, if the database doesn't exist before installation will fail because DBAL will try to get the server version by querying it. And since this query is done using the default database connexion and since the database doesn't exist, DBAL can't connect to the server. | ||||
* | | | Merge pull request #1901 from wallabag/spanish | Nicolas Lœuillet | 2016-04-10 | 2 | -18/+18 |
|\ \ \ | | | | | | | | | Update Spanish translation | ||||
| * | | | Uncommented translated ES lines | Jeremy Benoist | 2016-04-10 | 2 | -10/+10 |
| | | | | | | | | | | | | | | | | Also, turn yaml lint into a more versbose check | ||||
| * | | | Update messages.es.yml | jami7 | 2016-04-10 | 1 | -6/+6 |
| | | | | | | | | | | | | On line 103, I'm not sure what symbol that is that looks like this (<<) but it looks smaller? Where is that? Should I just copy and paste it? And just to clarity, please look at line 101 too cause I'm not too sure if/how I change the stuff within <...> I stopped mid line in 103 just until I get clarification on this. Thanks. | ||||
| * | | | Update messages.es.yml | jami7 | 2016-04-10 | 1 | -9/+9 |
| | | | | |||||
* | | | | Merge pull request #1887 from wallabag/v2-duplicate-bookmarklet | Jeremy Benoist | 2016-04-10 | 1 | -3/+17 |
|\ \ \ \ | | | | | | | | | | | Fix duplicate article when added via the bookmarklet | ||||
| * | | | | Change visibility of checkIfEntryAlreadyExists method to private | Nicolas Lœuillet | 2016-04-10 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Refactor EntryController | Nicolas Lœuillet | 2016-04-09 | 1 | -6/+14 |
| | | | | | |||||
| * | | | | Fix duplicate article when added via the bookmarklet | Nicolas Lœuillet | 2016-04-08 | 1 | -1/+7 |
| | | | | | |||||
* | | | | | Merge pull request #1895 from wallabag/v2-fix-entries-api | Jeremy Benoist | 2016-04-10 | 1 | -3/+3 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | All the entries are fetched via GET /api/entries | ||||
| * | | | | Remove int cast | Nicolas Lœuillet | 2016-04-10 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | All the entries are fetched via GET /api/entries | Nicolas Lœuillet | 2016-04-09 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | Fix #1863: only the unread entries were fetched with GET /api/entries entrypoint. Now, all the entries are fetched | ||||
* | | | | | 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 |