Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2396 from wallabag/mruminski-patch-1 | Nicolas Lœuillet | 2016-10-07 | 1 | -1/+1 |
|\ | | | | | Update messages.pl.yml | ||||
| * | Update messages.pl.yml | Mateusz Rumiński | 2016-10-07 | 1 | -1/+1 |
| | | | | | | translated shared_by_wallabag to polish | ||||
* | | Add ability to use socket | Jeremy Benoist | 2016-10-07 | 1 | -1/+2 |
|/ | | | | For Redis & MySQL | ||||
* | Merge pull request #2389 from wallabag/add-info-publich-articles | Nicolas Lœuillet | 2016-10-07 | 1 | -0/+2 |
|\ | | | | | Added default picture if preview picture is null | ||||
| * | Added default picture if preview picture is null | Nicolas Lœuillet | 2016-10-07 | 1 | -0/+2 |
| | | |||||
* | | 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 | 12 | -2/+31 |
|\| | | | | | Added OpenGraph support for public articles | ||||
| * | Fixed review | Nicolas Lœuillet | 2016-10-07 | 12 | -21/+21 |
| | | |||||
| * | Added OpenGraph support for public articles | Nicolas Lœuillet | 2016-10-07 | 12 | -2/+31 |
| | | | | | | | | Fix #2289 | ||||
* | | Fix tag test | Jeremy Benoist | 2016-10-07 | 1 | -1/+0 |
| | | |||||
* | | Fix bad translation key | Jeremy Benoist | 2016-10-07 | 11 | -11/+11 |
| | | | | | | | | `entry_reload_failed` instead of `entry_reloaded_failed` | ||||
* | | Fix relations export for Entry | Jeremy Benoist | 2016-10-07 | 4 | -10/+30 |
|/ | | | | | Tags & Annotations weren’t really well exported. This is now fixed (+ tests) | ||||
* | Merge pull request #2377 from wallabag/fix-exists-api | Thomas Citharel | 2016-10-05 | 1 | -1/+1 |
|\ | | | | | Fix exists API call | ||||
| * | Fix typo & add test | Jeremy Benoist | 2016-10-05 | 1 | -1/+1 |
| | | |||||
| * | Fix exists API call | Thomas Citharel | 2016-10-05 | 1 | -1/+1 |
| | | | | | | Boo | ||||
* | | better tags on material | Thomas Citharel | 2016-10-05 | 2 | -5/+6 |
| | | |||||
* | | better tags on baggy | Thomas Citharel | 2016-10-04 | 2 | -4/+6 |
|/ | |||||
* | Merge pull request #2353 from wallabag/assets-fix | Thomas Citharel | 2016-10-04 | 2 | -20/+25 |
|\ | | | | | Basically, fix everything | ||||
| * | Fix icon position | Thomas Citharel | 2016-10-04 | 1 | -3/+6 |
| | | |||||
| * | Fixed calendar icon position with baggy theme | Nicolas Lœuillet | 2016-10-04 | 1 | -1/+2 |
| | | |||||
| * | Fixed icon position in share menu | Nicolas Lœuillet | 2016-10-04 | 1 | -7/+6 |
| | | |||||
| * | fix icons | Thomas Citharel | 2016-10-04 | 1 | -8/+6 |
| | | |||||
| * | Basically, fix everything | Thomas Citharel | 2016-10-03 | 2 | -21/+25 |
| | | | | | | | | | | | | * Remove install.sh * Assets are now provided * Icons font issues are fixed | ||||
* | | Create config even if user is disabled | Jeremy Benoist | 2016-10-04 | 1 | -4/+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. | ||||
* | Merge pull request #2341 from mruminski/master | Thomas Citharel | 2016-10-03 | 1 | -31/+31 |
|\ | | | | | Update messages.pl.yml | ||||
| * | Update messages.pl.yml | Mateusz Rumiński | 2016-10-03 | 1 | -31/+31 |
| | | | | | | add missing and update existing translation | ||||
* | | improve German translation | Sven Fischer | 2016-10-03 | 1 | -1/+1 |
|/ | |||||
* | Fixed CSS for quickstart links | Nicolas Lœuillet | 2016-10-03 | 1 | -1/+1 |
| | |||||
* | Merge pull request #2333 from wallabag/translation-german-for-2.1 | Jeremy Benoist | 2016-10-03 | 1 | -51/+51 |
|\ | | | | | for 2.1, translate all strings to German, which haven't been translated yet | ||||
| * | Update messages.de.yml | Jeremy Benoist | 2016-10-03 | 1 | -1/+1 |
| | | |||||
| * | Fixed typos | Nicolas Lœuillet | 2016-10-03 | 1 | -2/+1 |
| | | |||||
| * | Better translation for the weird sentence | Julian Oster | 2016-10-02 | 1 | -1/+2 |
| | | |||||
| * | Improve the german translation a bit | Julian Oster | 2016-10-02 | 1 | -10/+10 |
| | | | | | | Just some little mistakes, good work so far :) | ||||
| * | translate all strings to German, which haven't been translated yet | Sven Fischer | 2016-10-02 | 1 | -51/+51 |
| | | |||||
* | | Merge pull request #2314 from wallabag/assets | Nicolas Lœuillet | 2016-10-03 | 3 | -21/+3 |
|\ \ | |/ |/| | Assets work | ||||
| * | Assets work | Thomas Citharel | 2016-09-28 | 3 | -21/+3 |
| | | | | | | | | | | | | | | | | | | | | * ES6 all the things ! * ESLint checks everything * CSS fixes (use stylelint) * Fix #2231 | ||||
* | | Merge pull request #2331 from wallabag/api-links | Thomas Citharel | 2016-10-02 | 2 | -3/+16 |
|\ \ | | | | | | | Fix parameters in API _links | ||||
| * | | Fix parameters in API _links | Jeremy Benoist | 2016-10-02 | 2 | -3/+16 |
| | | | | | | | | | | | | 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 | 27 | -232/+829 |
|\ \ \ | | | | | | | | | Add users management UI | ||||
| * | | | Disabled delete button for the logged user | Jeremy Benoist | 2016-10-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | To avoid some bad things to happen… | ||||
| * | | | Cleanup & add link on baggy menu | Jeremy Benoist | 2016-10-02 | 3 | -60/+1 |
| | | | | |||||
| * | | | Add users management UI | Jeremy Benoist | 2016-10-02 | 26 | -223/+879 |
| | | | | | | | | | | | | | | | | | | | | | | | | - 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/+32 |
|\ \ \ \ | | | | | | | | | | | Add an exists endpoint in API | ||||
| * | | | | CS | Jeremy Benoist | 2016-10-02 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add an exists endpoint in API | Jeremy Benoist | 2016-10-01 | 1 | -0/+32 |
| | | | | | | | | | | | | | | | | | | | | 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 | -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 |