Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3173 from wallabag/domain-name-param | Jérémy Benoist | 2017-06-10 | 14 | -15/+55 |
|\ | | | | | remove craueconfig domain name setting and add a proper one in parame… | ||||
| * | Promote https | Jeremy Benoist | 2017-06-09 | 1 | -1/+1 |
| | | |||||
| * | Review | Jeremy Benoist | 2017-06-08 | 4 | -4/+3 |
| | | |||||
| * | fix tests | Thomas Citharel | 2017-06-06 | 1 | -0/+1 |
| | | |||||
| * | add migration | Thomas Citharel | 2017-06-06 | 2 | -4/+52 |
| | | |||||
| * | remove craueconfig domain name setting and add a proper one in parameters | Thomas Citharel | 2017-06-06 | 13 | -11/+3 |
| | | |||||
* | | Merge pull request #3093 from aaa2000/annotation-error-on-save | Nicolas Lœuillet | 2017-06-07 | 2 | -1/+115 |
|\ \ | |/ |/| | 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 | 2 | -1/+115 |
| | | | | | | | | Fix #2762 | ||||
* | | Update PL transation | Mateusz Rumiński | 2017-06-02 | 1 | -1/+1 |
| | | | | | | add missing translation | ||||
* | | 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 | 12 | -0/+12 |
| | | |||||
* | | API user creation behing a toggle | Jeremy Benoist | 2017-06-02 | 3 | -0/+182 |
|/ | | | | | | | | 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 #2708 from jcharaoui/import-disablecontentupdate | Jérémy Benoist | 2017-06-02 | 1 | -0/+1 |
|\ | | | | | Import disableContentUpdate | ||||
| * | Put default fetching error title in global config | Jerome Charaoui | 2017-06-01 | 1 | -0/+1 |
| | | |||||
* | | 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 #3137 from aaa2000/isolated-tests | Jérémy Benoist | 2017-06-01 | 6 | -3/+14 |
|\ \ | |/ |/| | Isolated tests | ||||
| * | Isolated tests | adev | 2017-05-31 | 6 | -3/+14 |
| | | | | | | | | Use https://github.com/dmaicher/doctrine-test-bundle to have test isolation. | ||||
* | | Merge pull request #3077 from wallabag/add-tags-list-view | Nicolas Lœuillet | 2017-05-31 | 3 | -1/+62 |
|\ \ | |/ |/| | Added tags on list view | ||||
| * | Reduced border-radius for tags | Nicolas Lœuillet | 2017-05-31 | 2 | -0/+2 |
| | | |||||
| * | Add some flex magic | Thomas Citharel | 2017-05-31 | 2 | -34/+47 |
| | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | Fixed tags display on grid view | Nicolas Lœuillet | 2017-05-31 | 3 | -0/+46 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-05-30 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Fix documentation URL for "How can I help to fix that?" | Damien Cassou | 2017-05-24 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-05-19 | 1 | -1/+1 |
|\| | |||||
| * | Prepare wallabag 2.2.3 | Nicolas Lœuillet | 2017-05-17 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #3120 from aaa2000/fix-delete-annotation-user | Jérémy Benoist | 2017-05-15 | 1 | -0/+5 |
|\ \ | | | | | | | Fix delete annotation when username is defined | ||||
| * | | Fix delete annotation when username is defined | adev | 2017-05-14 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | When an user set his name in "Config" > "User Information", he can't delete or update an annotation Fix #2382 | ||||
* | | | Upgraded CraueConfigBundle to 2.0 | Nicolas Lœuillet | 2017-05-12 | 3 | -6/+13 |
|/ / | |||||
* | | Added headers field in Entry | Nicolas Lœuillet | 2017-05-11 | 1 | -0/+55 |
| | | |||||
* | | Added migration to change length for user fields | Nicolas Lœuillet | 2017-05-10 | 1 | -0/+60 |
| | | |||||
* | | Merge pull request #3022 from wallabag/webpack | Thomas Citharel | 2017-05-09 | 47 | -1723/+3102 |
|\ \ | | | | | | | Adds Webpack support and remove Grunt | ||||
| * | | icon mail a bit better | Thomas Citharel | 2017-05-09 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | | fix 3-dots menu position | Thomas Citharel | 2017-05-08 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | | Fix review again | Thomas Citharel | 2017-05-07 | 2 | -14/+18 |
| | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | | Fix reviews | Aline | 2017-05-07 | 4 | -0/+24 |
| | | | | | | | | | | | | Signed-off-by: Aline <chetta.aline@gmail.com> | ||||
| * | | fixed margin on sidebar menu | Thomas Citharel | 2017-05-05 | 1 | -1/+1 |
| | | | |||||
| * | | Fix according to review | Thomas Citharel | 2017-05-04 | 5 | -1052/+39 |
| | | | |||||
| * | | rebase | Thomas Citharel | 2017-05-04 | 1 | -0/+5 |
| | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | | add comment to config.yml to explain live reload feature | Thomas Citharel | 2017-05-04 | 1 | -0/+1 |
| | | | |||||
| * | | disable default dev server | Thomas Citharel | 2017-05-04 | 1 | -1/+1 |
| | | | |||||
| * | | Adds Webpack support and removes the use for Grunt | Thomas Citharel | 2017-05-04 | 45 | -699/+3057 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> use scss Signed-off-by: Thomas Citharel <tcit@tcit.fr> fix build, add babel, fix annotations fixes (and improvements !) for baggy add live reload & environments & eslint & theme fixes | ||||
* | | | Merge pull request #3053 from wallabag/api-bulk-add | Nicolas Lœuillet | 2017-05-05 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | Added API endpoint to handle a list of URL | ||||
| * | | Added limit | Nicolas Lœuillet | 2017-05-01 | 1 | -0/+1 |
| | | | |||||
* | | | Disabled shortcuts on login/register page | Nicolas Lœuillet | 2017-05-02 | 1 | -0/+5 |
|/ / | |||||
* | | Cleaned craue_config_setting by removing useless download_pictures setting | Nicolas Lœuillet | 2017-04-20 | 1 | -0/+52 |
| | |