Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2331 from wallabag/api-links | Thomas Citharel | 2016-10-02 | 1 | -1/+1 |
|\ | | | | | Fix parameters in API _links | ||||
| * | Fix parameters in API _links | Jeremy Benoist | 2016-10-02 | 1 | -1/+1 |
| | | | | | | | | We forgot to pass them to the factory | ||||
* | | Merge remote-tracking branch 'origin/master' into 2.1 | Jeremy Benoist | 2016-10-02 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Remove error message when creating ePub versions | Paulino Michelazzo | 2016-10-02 | 1 | -1/+1 |
| | | | | | | | | | | | | Trying to create a ePub version, the first page shows a message of a “missing >”. This change solve this problem (and, for sure, in any download version that’s use HTML). | ||||
* | | Merge pull request #2327 from wallabag/user-management | Jeremy Benoist | 2016-10-02 | 20 | -282/+373 |
|\ \ | | | | | | | Add users management UI | ||||
| * | | Cleanup & add link on baggy menu | Jeremy Benoist | 2016-10-02 | 3 | -60/+1 |
| | | | |||||
| * | | Add users management UI | Jeremy Benoist | 2016-10-02 | 18 | -222/+372 |
| | | | | | | | | | | | | | | | | | | - remove the “add a user” from the config page - add a CRUD on user - fix some missing translations (+ bad indentation) | ||||
* | | | Merge pull request #2328 from wallabag/avoid-duplicate-url | Nicolas Lœuillet | 2016-10-02 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Avoid duplicate url with accents | ||||
| * | | Avoid duplicate url with accents | Jeremy Benoist | 2016-10-01 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #2326 from wallabag/update-quickstart | Jeremy Benoist | 2016-10-02 | 12 | -50/+168 |
|\ \ \ | | | | | | | | | Changed quickstart layout | ||||
| * | | | Fixed french translation | Nicolas Lœuillet | 2016-10-01 | 1 | -3/+3 |
| | | | | |||||
| * | | | Changed translations | Nicolas Lœuillet | 2016-10-01 | 11 | -10/+11 |
| | | | | |||||
| * | | | Changed quickstart layout | Nicolas Lœuillet | 2016-10-01 | 12 | -50/+167 |
| | | | | |||||
* | | | | Merge pull request #2324 from wallabag/edit-tagging-rule | Jeremy Benoist | 2016-10-02 | 13 | -4/+58 |
|\ \ \ \ | | | | | | | | | | | Add ability to edit a tagging rule | ||||
| * | | | | CS | Jeremy Benoist | 2016-10-01 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Introduce validateRuleAction | Jeremy Benoist | 2016-10-01 | 1 | -5/+13 |
| | | | | | |||||
| * | | | | Add ability to edit a tagging rule | Jeremy Benoist | 2016-10-01 | 13 | -1/+47 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #2323 from wallabag/footer-stats | Jeremy Benoist | 2016-10-02 | 13 | -4/+64 |
|\ \ \ \ | | | | | | | | | | | Add simple stats in footer | ||||
| * | | | | Add simple stats in footer | Jeremy Benoist | 2016-10-01 | 13 | -4/+64 |
| | |/ / | |/| | | |||||
* | | | | Fix OC typos | Jeremy Benoist | 2016-10-02 | 11 | -20/+20 |
| | | | | | | | | | | | | | | | | + remove extra sentence | ||||
* | | | | Occitan version update | Quent-in | 2016-10-01 | 1 | -24/+26 |
| |/ / |/| | | | | | to be ready for the future of Wallabag :) | ||||
* | | | Merge pull request #2322 from wallabag/v2-404 | Nicolas Lœuillet | 2016-10-01 | 5 | -4/+103 |
|\ \ \ | | | | | | | | | Customize errors templates | ||||
| * | | | Customize errors templates | Jeremy Benoist | 2016-10-01 | 5 | -4/+103 |
| |/ / | | | | | | | | | | 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 | 4 | -80/+12 |
|/ / | | | | | | | | | | | | | | | 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 | ||||
* | | Removed duplicated templates files | Nicolas Lœuillet | 2016-09-30 | 26 | -494/+18 |
| | | |||||
* | | Merge pull request #2315 from wallabag/fixes-about-upgrade | Nicolas Lœuillet | 2016-09-29 | 1 | -1/+1 |
|\ \ | | | | | | | Fixes about upgrade | ||||
| * | | Reordered upgrade documentation | Nicolas Lœuillet | 2016-09-28 | 1 | -1/+0 |
| | | | |||||
| * | | Some fixes about upgrade from 2.0.x -> 2.1.0 | Nicolas Lœuillet | 2016-09-28 | 1 | -0/+1 |
| | | | |||||
* | | | Update messages.pl.yml | Mateusz Rumiński | 2016-09-29 | 1 | -2/+2 |
|/ / | | | | | add missing translation for Instapaper importer | ||||
* | | Add Instapaper translations | Jeremy Benoist | 2016-09-27 | 11 | -52/+96 |
| | | |||||
* | | Update messages.pl.yml | Mateusz Rumiński | 2016-09-27 | 1 | -12/+12 |
| | | | | | | add missing translation for Firefox and Chrome imports | ||||
* | | Merge pull request #2192 from wallabag/import-browser-bookmarks | Jeremy Benoist | 2016-09-26 | 11 | -1/+89 |
|\ \ | | | | | | | Import Firefox & Chrome bookmarks into wallabag | ||||
| * | | bring chrome and firefox as separate imports | Thomas Citharel | 2016-09-25 | 11 | -42/+86 |
| | | | |||||
| * | | Indentation and renamed fixtures file | Nicolas Lœuillet | 2016-09-25 | 9 | -27/+27 |
| | | | |||||
| * | | Add Chrome path for Mac OS | Nicolas Lœuillet | 2016-09-25 | 3 | -3/+3 |
| | | | |||||
| * | | Import Firefox & Chrome bookmarks into wallabag | Thomas Citharel | 2016-09-25 | 11 | -1/+45 |
| | | | |||||
* | | | Fix tag count for PostgreSQL | Jeremy Benoist | 2016-09-25 | 2 | -8/+6 |
| | | | |||||
* | | | CS | Jeremy Benoist | 2016-09-25 | 3 | -6/+4 |
| | | | |||||
* | | | Use scheduled entity insertions to avoid tag duplicate | Jeremy Benoist | 2016-09-25 | 1 | -5/+20 |
| | | | | | | | | | | | | Using `getScheduledEntityInsertions()` we can retrieve not yet flushed but already persisted entities and then avoid tags duplication on import. | ||||
* | | | Fix tags count in menu | Jeremy Benoist | 2016-09-25 | 3 | -44/+46 |
|/ / | | | | | | | Move enable cache for Tag in the Entity because function `find*` should return result and not a Query | ||||
* | | Display a message when async import won’t work | Jeremy Benoist | 2016-09-24 | 11 | -0/+33 |
| | | | | | | | | | | Mostly if Redis or RabbitMQ isn’t installed / launched. I guess it’ll avoid some issues. | ||||
* | | Merge pull request #2301 from wallabag/fix-rss-feeds | Jeremy Benoist | 2016-09-22 | 2 | -18/+2 |
|\ \ | | | | | | | fix feeds not syncing on android app | ||||
| * | | fix feeds not syncing on android app | Thomas Citharel | 2016-09-21 | 2 | -18/+2 |
| |/ | |||||
* | | Update messages.pl.yml | Mateusz Rumiński | 2016-09-19 | 1 | -5/+5 |
| | | | | | | add missing translation | ||||
* | | Merge remote-tracking branch 'origin/master' into 2.1 | Jeremy Benoist | 2016-09-19 | 2 | -4/+26 |
|\| | |||||
| * | Fix issue #2296: epub export with `+` in the title. | Étienne Gilli | 2016-09-18 | 1 | -1/+5 |
| | | |||||
| * | CS | Jeremy Benoist | 2016-09-03 | 1 | -1/+1 |
| | | |||||
| * | Update test | Jeremy Benoist | 2016-09-03 | 1 | -4/+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. | ||||
| * | Add a check for the database connection | Jeremy Benoist | 2016-09-03 | 1 | -2/+18 |
| | | | | | | | | | | | | Checking for the driver isn't enough. We are now checking if we can etablish a connection to the database before trying to do anything. By displaying the error from the Exception (in case of error) we hope to reduce issues overload about people getting error with the database | ||||
* | | Merge pull request #1941 from wallabag/v2-asynchronous-jobs | Jeremy Benoist | 2016-09-19 | 22 | -60/+208 |
|\ \ | | | | | | | Use asynchronous jobs for imports |