Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2389 from wallabag/add-info-publich-articles | Nicolas Lœuillet | 2016-10-07 | 1 | -0/+1 |
|\ | | | | | Added default picture if preview picture is null | ||||
| * | Added default picture if preview picture is null | Nicolas Lœuillet | 2016-10-07 | 1 | -0/+1 |
| | | |||||
* | | Fixed two-factor checkbox display in user admin panel | Nicolas Lœuillet | 2016-10-07 | 1 | -1/+1 |
| | | | | | | | | Fix #2380 | ||||
* | | Merge pull request #2383 from wallabag/add-info-publich-articles | Nicolas Lœuillet | 2016-10-07 | 1 | -1/+4 |
|\| | | | | | Added OpenGraph support for public articles | ||||
| * | Added test for OpenGraph | Nicolas Lœuillet | 2016-10-07 | 1 | -1/+4 |
| | | |||||
* | | Fix tag test | Jeremy Benoist | 2016-10-07 | 2 | -12/+16 |
| | | |||||
* | | Fix relations export for Entry | Jeremy Benoist | 2016-10-07 | 1 | -9/+28 |
|/ | | | | | Tags & Annotations weren’t really well exported. This is now fixed (+ tests) | ||||
* | Fix typo & add test | Jeremy Benoist | 2016-10-05 | 1 | -0/+7 |
| | |||||
* | Create config even if user is disabled | Jeremy Benoist | 2016-10-04 | 1 | -20/+0 |
| | | | | | When a user register itself AND the wallabag instance is configured to send a confirmation email, the user is disabled when the listener (which create the config) receive the event. There were a check (don't know why) if the user is enabled we create the config. But the user is disabled when confirmation email is actived. | ||||
* | Fix parameters in API _links | Jeremy Benoist | 2016-10-02 | 1 | -1/+99 |
| | | | | We forgot to pass them to the factory | ||||
* | Merge pull request #2327 from wallabag/user-management | Jeremy Benoist | 2016-10-02 | 2 | -114/+82 |
|\ | | | | | Add users management UI | ||||
| * | Disabled delete button for the logged user | Jeremy Benoist | 2016-10-02 | 1 | -0/+11 |
| | | | | | | | | To avoid some bad things to happen… | ||||
| * | Remove NewUser test from Config | Jeremy Benoist | 2016-10-02 | 1 | -114/+0 |
| | | |||||
| * | Add users management UI | Jeremy Benoist | 2016-10-02 | 1 | -0/+71 |
| | | | | | | | | | | | | - remove the “add a user” from the config page - add a CRUD on user - fix some missing translations (+ bad indentation) | ||||
* | | Merge pull request #2325 from wallabag/api-entries-exists | Nicolas Lœuillet | 2016-10-02 | 1 | -0/+22 |
|\ \ | | | | | | | Add an exists endpoint in API | ||||
| * | | Add test when url doesn’t exist | Jeremy Benoist | 2016-10-01 | 1 | -0/+11 |
| | | | |||||
| * | | Add an exists endpoint in API | Jeremy Benoist | 2016-10-01 | 1 | -0/+11 |
| | | | | | | | | | | | | It should allow third party to check if an url was already saved by a user | ||||
* | | | Merge pull request #2328 from wallabag/avoid-duplicate-url | Nicolas Lœuillet | 2016-10-02 | 1 | -0/+44 |
|\ \ \ | |_|/ |/| | | Avoid duplicate url with accents | ||||
| * | | Remove additional entry | Jeremy Benoist | 2016-10-02 | 1 | -0/+9 |
| | | | | | | | | | | | | After the test is done, cleanup what we’ve done | ||||
| * | | Avoid duplicate url with accents | Jeremy Benoist | 2016-10-01 | 1 | -0/+35 |
| |/ | |||||
* | | Merge pull request #2326 from wallabag/update-quickstart | Jeremy Benoist | 2016-10-02 | 1 | -1/+1 |
|\ \ | | | | | | | Changed quickstart layout | ||||
| * | | Update test | Jeremy Benoist | 2016-10-02 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #2324 from wallabag/edit-tagging-rule | Jeremy Benoist | 2016-10-02 | 1 | -13/+48 |
|\ \ \ | | | | | | | | | Add ability to edit a tagging rule | ||||
| * | | | Add ability to edit a tagging rule | Jeremy Benoist | 2016-10-01 | 1 | -13/+48 |
| | |/ | |/| | |||||
* | | | Merge pull request #2323 from wallabag/footer-stats | Jeremy Benoist | 2016-10-02 | 1 | -1/+17 |
|\ \ \ | |/ / |/| | | Add simple stats in footer | ||||
| * | | Add simple stats in footer | Jeremy Benoist | 2016-10-01 | 1 | -1/+17 |
| |/ | |||||
* | | Merge pull request #2322 from wallabag/v2-404 | Nicolas Lœuillet | 2016-10-01 | 1 | -5/+3 |
|\ \ | | | | | | | Customize errors templates | ||||
| * | | Customize errors templates | Jeremy Benoist | 2016-10-01 | 1 | -5/+3 |
| |/ | | | | | | | All error goes to the same template which only display the error message and the status code. | ||||
* / | Create user config in one place | Jeremy Benoist | 2016-09-30 | 1 | -7/+9 |
|/ | | | | | | | | Using a listener, user config is now created when a user: - is created from the command line - register (with or without email confirmation) - is created from the config panel | ||||
* | Some fixes about upgrade from 2.0.x -> 2.1.0 | Nicolas Lœuillet | 2016-09-28 | 3 | -4/+4 |
| | |||||
* | Add controller test for Instapaper | Jeremy Benoist | 2016-09-27 | 1 | -0/+196 |
| | |||||
* | Add Instapaper import | Jeremy Benoist | 2016-09-27 | 3 | -1/+238 |
| | | | | Also update ImportController with latest import (chrome, firefox & instapaper). | ||||
* | Merge pull request #2192 from wallabag/import-browser-bookmarks | Jeremy Benoist | 2016-09-26 | 10 | -4/+884 |
|\ | | | | | Import Firefox & Chrome bookmarks into wallabag | ||||
| * | Added tags for Firefox import | Nicolas Lœuillet | 2016-09-26 | 2 | -1/+2 |
| | | |||||
| * | Update Firefox file | Jeremy Benoist | 2016-09-25 | 3 | -66/+67 |
| | | | | | | | | | | With real data, the previous looks more than a Chrome converted file. Also, fix date conversion (hope so). | ||||
| * | Fix bad date format in Browser import | Jeremy Benoist | 2016-09-25 | 2 | -0/+8 |
| | | |||||
| * | Fix bad parameter for tests | Jeremy Benoist | 2016-09-25 | 1 | -1/+1 |
| | | |||||
| * | fix tests | Thomas Citharel | 2016-09-25 | 3 | -28/+27 |
| | | |||||
| * | bring chrome and firefox as separate imports | Thomas Citharel | 2016-09-25 | 6 | -35/+679 |
| | | |||||
| * | Added tests for Chrome bookmarks import | Nicolas Lœuillet | 2016-09-25 | 4 | -3/+75 |
| | | |||||
| * | Indentation and renamed fixtures file | Nicolas Lœuillet | 2016-09-25 | 2 | -1/+1 |
| | | |||||
| * | Add Chrome path for Mac OS | Nicolas Lœuillet | 2016-09-25 | 1 | -1/+1 |
| | | |||||
| * | Import Firefox & Chrome bookmarks into wallabag | Thomas Citharel | 2016-09-25 | 2 | -0/+155 |
| | | |||||
* | | Use scheduled entity insertions to avoid tag duplicate | Jeremy Benoist | 2016-09-25 | 4 | -0/+65 |
|/ | | | | Using `getScheduledEntityInsertions()` we can retrieve not yet flushed but already persisted entities and then avoid tags duplication on import. | ||||
* | Avoid failing test for user who didn’t install Redis | Jeremy Benoist | 2016-09-24 | 5 | -0/+19 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into 2.1 | Jeremy Benoist | 2016-09-19 | 1 | -0/+6 |
|\ | |||||
| * | Update test | Jeremy Benoist | 2016-09-03 | 1 | -0/+6 |
| | | | | | | | | | | | | | | If the database isn't found when checking for the connection it means, we can connect to the server. The InstallCommand will create the database later. Also, when checking for the SQLite connection, Doctrine creates the file (so the database). That's why the test is skipped for SQLite. | ||||
* | | Avoid losing entry when fetching fail | Jeremy Benoist | 2016-09-17 | 2 | -2/+4 |
| | | | | | | | | Instead of just say “Failed to save entry” we’ll save the entry at all cost and try to fetch content. If fetching content failed, the entry will still be saved at least, but without content. | ||||
* | | Moved Pocket token to user config | Jeremy Benoist | 2016-09-16 | 1 | -11/+7 |
| | | |||||
* | | AMPQ -> AMQP | Jeremy Benoist | 2016-09-14 | 1 | -5/+5 |
| | |