Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-06-10 | 7 | -7/+7 |
|\ | |||||
| * | Merge pull request #3202 from pVesian/master | Jérémy Benoist | 2017-06-10 | 7 | -7/+7 |
| |\ | | | | | | | Config label improvement #3199 | ||||
| | * | Update translations | Jeremy Benoist | 2017-06-10 | 2 | -2/+2 |
| | | | |||||
| | * | Config label improvement #3199 | Pierre de Vésian | 2017-06-09 | 7 | -7/+7 |
| |/ | |||||
* | | Merge pull request #3206 from wallabag/mruminski-patch-1 | Jérémy Benoist | 2017-06-10 | 1 | -1/+1 |
|\ \ | | | | | | | Update validators.pl.yml | ||||
| * | | Update validators.pl.yml | Mateusz Rumiński | 2017-06-10 | 1 | -1/+1 |
| | | | | | | | | | add "quote_length_too_high" translation | ||||
* | | | Merge pull request #3203 from wallabag/fix-tag-count-baggy | Jérémy Benoist | 2017-06-10 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Fix tags count in tags list on baggy | ||||
| * | | Fix tags count in tags list on baggy | Jeremy Benoist | 2017-06-10 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #3173 from wallabag/domain-name-param | Jérémy Benoist | 2017-06-10 | 18 | -20/+60 |
|\ \ \ | |/ / |/| | | remove craueconfig domain name setting and add a proper one in parame… | ||||
| * | | Promote https | Jeremy Benoist | 2017-06-09 | 2 | -2/+2 |
| | | | |||||
| * | | Review | Jeremy Benoist | 2017-06-08 | 8 | -9/+5 |
| | | | |||||
| * | | fix tests | Thomas Citharel | 2017-06-06 | 2 | -1/+2 |
| | | | |||||
| * | | add migration | Thomas Citharel | 2017-06-06 | 3 | -4/+53 |
| | | | |||||
| * | | remove craueconfig domain name setting and add a proper one in parameters | Thomas Citharel | 2017-06-06 | 18 | -14/+8 |
| | | | |||||
* | | | Merge pull request #3192 from wallabag/validate-content-fields | Jérémy Benoist | 2017-06-09 | 5 | -41/+275 |
|\ \ \ | | | | | | | | | Validate language & preview picture fields | ||||
| * | | | Cleanup test | Jeremy Benoist | 2017-06-09 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | Looks like we didn't ALWAYS get a value for language from 20minutes. Ahem. | ||||
| * | | | Convert - to _ in language | Jeremy Benoist | 2017-06-09 | 3 | -5/+13 |
| | | | | | | | | | | | | | | | | Mostly to increase language supports | ||||
| * | | | Use Locale instead of Language | Jeremy Benoist | 2017-06-09 | 2 | -16/+80 |
| | | | | |||||
| * | | | Fix test | Jeremy Benoist | 2017-06-08 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | de_DE is not valid language. Zataz doesn’t send a valid language in their content (they use `fr-FR`). | ||||
| * | | | CS | Jeremy Benoist | 2017-06-08 | 1 | -1/+2 |
| | | | | |||||
| * | | | Validate language & preview picture fields | Jeremy Benoist | 2017-06-08 | 3 | -23/+185 |
| | | | | | | | | | | | | | | | | | | | | Instead of saving the value of each field right into the content without any validation, it seems better to validate them. This might sounds obvious now we say that. | ||||
* | | | | Merge pull request #3195 from wallabag/authentication-error | Jérémy Benoist | 2017-06-09 | 3 | -0/+114 |
|\ \ \ \ | |/ / / |/| | | | Log an error level message when user auth fail | ||||
| * | | | Use a listener to catch auth failure | Jeremy Benoist | 2017-06-09 | 5 | -68/+111 |
| | | | | |||||
| * | | | CS | Jeremy Benoist | 2017-06-08 | 1 | -2/+2 |
| | | | | |||||
| * | | | Log an error level message when user auth fail | Jeremy Benoist | 2017-06-08 | 3 | -0/+71 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user login using the form we know log an error level information with information about the user: - username used - IP - User agent For example: > Authentication failure for user "eza", from IP "127.0.0.1", with UA: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36". It’ll allows server admin using fail2ban to configure it to block these people if they generate too much failure authentication. | ||||
* | | | Merge pull request #3187 from wallabag/api-client-credentials | Jérémy Benoist | 2017-06-08 | 7 | -19/+88 |
|\ \ \ | | | | | | | | | Create (and return) a client after creating a new user using the API | ||||
| * | | | Add ability to name the client | Jeremy Benoist | 2017-06-08 | 2 | -4/+6 |
| | | | | |||||
| * | | | CS | Jeremy Benoist | 2017-06-07 | 3 | -8/+6 |
| | | | | |||||
| * | | | Create a client when creating a user using the api | Jeremy Benoist | 2017-06-07 | 5 | -13/+82 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While creating a new user using the API, we also create a new client for the current user. So the app which just create the user can use its newly created client to configure the app. That new client is only return after creating the user. When calling the endpoint /api/user to get user information, the new client information won’t be return. | ||||
* | | | | Merge pull request #3189 from wallabag/add-discourse | Nicolas Lœuillet | 2017-06-08 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Added link to community in issue template | ||||
| * | | | Added link to community in issue template | Nicolas Lœuillet | 2017-06-08 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #3093 from aaa2000/annotation-error-on-save | Nicolas Lœuillet | 2017-06-07 | 23 | -26/+270 |
|\ \ \ | | | | | | | | | Displays an error with an annotation with a too long quote | ||||
| * | | | Fix postgresql migration | adev | 2017-06-07 | 1 | -2/+2 |
| | | | | |||||
| * | | | Displays an error with an annotation with a too long quote | adev | 2017-06-04 | 23 | -26/+270 |
| | | | | | | | | | | | | | | | | Fix #2762 | ||||
* | | | | Merge pull request #3181 from wallabag/api-content-patch | Jérémy Benoist | 2017-06-07 | 3 | -76/+87 |
|\ \ \ \ | | | | | | | | | | | Add ability to patch an entry with more fields | ||||
| * | | | | Refactorize the way to save an Entry in the API | Jeremy Benoist | 2017-06-07 | 1 | -102/+70 |
| | | | | | |||||
| * | | | | Add ability to patch an entry with more fields | Jeremy Benoist | 2017-06-02 | 3 | -4/+47 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Like when we create an entry, we can now patch an entry with new fields: - content - language - preview_picture - published_at - authors | ||||
* | | | | Merge pull request #3184 from wallabag/better-way-image-extension | Jérémy Benoist | 2017-06-07 | 3 | -5/+70 |
|\ \ \ \ | | | | | | | | | | | Use an alternative way to detect images | ||||
| * | | | | Use an alternative way to detect image | Jeremy Benoist | 2017-06-05 | 3 | -5/+70 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | When parsing content to retrieve images to save locally, we only check for the content-type of the image response. In some case, that value is empty. Now we’re also checking for the first few bytes of the content as an alternative to detect if it’s an image wallabag can handle. We might get higher image supports using that alternative method. | ||||
* | | | | Merge pull request #3179 from wallabag/show-user-command | Jérémy Benoist | 2017-06-07 | 2 | -0/+172 |
|\ \ \ \ | | | | | | | | | | | Show user command | ||||
| * | | | | Fix review | Thomas Citharel | 2017-06-04 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | | | | Add show user command | Thomas Citharel | 2017-06-02 | 2 | -0/+172 |
| |/ / / | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | | | | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-06-06 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | |||||
| * | | Merge pull request #3167 from wallabag/doc-github-template | Nicolas Lœuillet | 2017-05-31 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Fix link in Github template | ||||
| | * | | Fix link in Github template | Jérémy Benoist | 2017-05-31 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #3177 from wallabag/api-create-user-update | Jérémy Benoist | 2017-06-06 | 23 | -385/+358 |
|\ \ \ | | | | | | | | | API user creation behing a toggle | ||||
| * \ \ | Merge pull request #3180 from wallabag/mruminski-patch-1 | Jérémy Benoist | 2017-06-02 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | Update PL translation | ||||
| | * | | | Update PL transation | Mateusz Rumiński | 2017-06-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | add missing translation | ||||
| * | | | | Return 201 on user creation | Jeremy Benoist | 2017-06-02 | 2 | -7/+14 |
| |/ / / | |||||
| * | | | Add :it: translation | Jérémy Benoist | 2017-06-02 | 1 | -1/+1 |
| | | | |