Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 #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 |
| | | | | |||||
| * | | | Use a dedicated file for wallabag config | Jeremy Benoist | 2017-06-02 | 2 | -165/+165 |
| | | | | |||||
| * | | | Add translation | Jeremy Benoist | 2017-06-02 | 13 | -1/+13 |
| | | | | |||||
| * | | | API user creation behing a toggle | Jeremy Benoist | 2017-06-02 | 10 | -343/+297 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | I've added a toggle feature (in internal settings) so that user api creation can be disabled while form registration still can be enabled. Also, the /api/user endpoint shouldn't require authentication. Even if we check the authentication when sending a GET request, to retrieve current user information. I've moved all the internal settings definition to config to avoid duplicated place to define them. I don't know why we didn't did that earlier. | ||||
* | | | Merge pull request #3165 from wallabag/it-translation-update | Jérémy Benoist | 2017-06-06 | 1 | -38/+38 |
|\ \ \ | |/ / |/| | | Update Italian translation | ||||
| * | | Update messages.it.yml | Jérémy Benoist | 2017-06-02 | 1 | -23/+23 |
| | | | |||||
| * | | Updated :it: translations | Nicolas Lœuillet | 2017-05-31 | 1 | -13/+13 |
| | | | | | | | | | | | | Thank you @matteocoder | ||||
| * | | Update :it: translation | Jérémy Benoist | 2017-05-30 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #2708 from jcharaoui/import-disablecontentupdate | Jérémy Benoist | 2017-06-02 | 20 | -103/+160 |
|\ \ \ | | | | | | | | | Import disableContentUpdate | ||||
| * | | | Fix option attributes | Jeremy Benoist | 2017-06-01 | 1 | -3/+3 |
| | | | | |||||
| * | | | We don't need that getter | Jeremy Benoist | 2017-06-01 | 1 | -8/+0 |
| | | | | |||||
| * | | | No need to catch that Exception | Jeremy Benoist | 2017-06-01 | 1 | -9/+2 |
| | | | | |||||
| * | | | Rewrote code & fix tests | Jeremy Benoist | 2017-06-01 | 11 | -101/+71 |
| | | | | |||||
| * | | | CS | Jeremy Benoist | 2017-06-01 | 1 | -3/+3 |
| | | | | |||||
| * | | | Fix tests | Jeremy Benoist | 2017-06-01 | 6 | -35/+57 |
| | | | | |||||
| * | | | CS | Jeremy Benoist | 2017-06-01 | 1 | -2/+1 |
| | | | | |||||
| * | | | Replace Wallabag v1 error strings with v2 strings | Jerome Charaoui | 2017-06-01 | 3 | -4/+27 |
| | | | | |||||
| * | | | Add disableContentUpdate import option | Jerome Charaoui | 2017-06-01 | 11 | -60/+118 |
| | | | | | | | | | | | | | | | | | | | | | | | | This commit also decouples the "import" and "update" functions inside ContentProxy. If a content array is available, it must be passed to the new importEntry method. | ||||
| * | | | Put default fetching error title in global config | Jerome Charaoui | 2017-06-01 | 5 | -3/+5 |
| | | | | |||||
| * | | | Avoid returning objects passed by reference. | Jerome Charaoui | 2017-06-01 | 11 | -32/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | Objects are always passed by reference, so it doesn't make sense to return an object which is passed by reference as it will always be the same object. This change makes the code a bit more readable. | ||||
* | | | | Merge pull request #3176 from wallabag/fix-image-download | Nicolas Lœuillet | 2017-06-02 | 2 | -5/+28 |
|\ \ \ \ | | | | | | | | | | | Replace images with & in url | ||||
| * | | | | CS | Jeremy Benoist | 2017-06-01 | 1 | -3/+2 |
| | | | | | |||||
| * | | | | Replace images with & | Jeremy Benoist | 2017-06-01 | 2 | -4/+28 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | Images with `&` in the path weren’t well replaced because they might be with `&` in the html instead. Replacing `&` with `&` fix the problem. | ||||
* | | | | Merge pull request #3171 from wallabag/drop-fucking-sqlite | Nicolas Lœuillet | 2017-06-01 | 1 | -5/+6 |
|\ \ \ \ | | | | | | | | | | | Defined MySQL as the default rdbms for wallabag | ||||
| * | | | | Changed default database name | Nicolas Lœuillet | 2017-06-01 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixed @tcitworld 's review | Nicolas Lœuillet | 2017-05-31 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Defined MySQL as the default rdbms for wallabag | Nicolas Lœuillet | 2017-05-31 | 1 | -4/+5 |
| | | | | | |||||
* | | | | | Merge pull request #3172 from wallabag/more-scruti | Jérémy Benoist | 2017-06-01 | 5 | -13/+9 |
|\ \ \ \ \ | |_|/ / / |/| | | | | More Scrutinizer issues fixed | ||||
| * | | | | fixup! Set the right variable type | Jeremy Benoist | 2017-06-01 | 1 | -2/+2 |
| | | | | |