Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'wallabag/master' | Paulino Michelazzo | 2016-10-18 | 67 | -35/+4247 |
|\ | |||||
| * | Update wallabag version for master branch | Nicolas Lœuillet | 2016-10-17 | 1 | -1/+1 |
| | | |||||
| * | Prepare wallabag 2.1.2 :rocket: | Nicolas Lœuillet | 2016-10-17 | 1 | -1/+1 |
| | | |||||
| * | Fixed hardcoded title for internal settings | Nicolas Lœuillet | 2016-10-17 | 1 | -1/+1 |
| | | | | | | | | Fix #2458 | ||||
| * | Merge pull request #2455 from wallabag/fix-material-config-tabs | Jeremy Benoist | 2016-10-16 | 1 | -1/+1 |
| |\ | | | | | | | Fix tabs on material | ||||
| | * | Fix tabs on material | Thomas Citharel | 2016-10-15 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | | Merge pull request #2454 from wallabag/fix-baggy-small-width | Jeremy Benoist | 2016-10-16 | 1 | -0/+8 |
| |\ \ | | | | | | | | | Fix baggy display on small screens | ||||
| | * | | Fix baggy on small screens | Thomas Citharel | 2016-10-15 | 1 | -0/+8 |
| | |/ | |||||
| * / | German: improve existing and add missing translation | Sven Fischer | 2016-10-16 | 1 | -4/+4 |
| |/ | |||||
| * | Merge pull request #2450 from wallabag/new-improvement-view | Thomas Citharel | 2016-10-15 | 1 | -1/+21 |
| |\ | | | | | | | View improvements | ||||
| | * | fix stylelint | Thomas Citharel | 2016-10-15 | 1 | -1/+1 |
| | | | |||||
| | * | Improved side menu, reduced the font size on small screens, fixed a form to ↵ | Alexandr Danilov | 2016-10-15 | 1 | -1/+21 |
| | | | | | | | | | | | | add links on small screens | ||||
| * | | Merge pull request #2412 from wallabag/fix-postgres-migration | Thomas Citharel | 2016-10-15 | 4 | -14/+24 |
| |\ \ | | |/ | |/| | Fix PostgreSQL migrations | ||||
| | * | Fix PostgreSQL migrations | Jeremy Benoist | 2016-10-09 | 4 | -14/+24 |
| | | | |||||
| * | | Define a dev version for the master | Jeremy Benoist | 2016-10-10 | 1 | -1/+1 |
| |/ | | | | | This is to be sure that user testing wallabag from the master will have the version defined as dev. | ||||
| * | CS | Jeremy Benoist | 2016-10-09 | 1 | -1/+2 |
| | | |||||
| * | Optimize the way tag list is rendered | Jeremy Benoist | 2016-10-09 | 1 | -2/+3 |
| | | | | | | | | | | | | Instead of retrieve all informations about entries of a tag to just count them, we’ll count them before with a fastest query. Also change the layout of the tag list in material design | ||||
| * | Merge pull request #2351 from wallabag/fix-api-client-deletion | Nicolas Lœuillet | 2016-10-08 | 1 | -0/+5 |
| |\ | | | | | | | Changed relation between API client and refresh token | ||||
| | * | Ensure access_token are removed | Jeremy Benoist | 2016-10-08 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | When we remove the client, we should ensure that access_token are also removed. To ensure that, I created a test that generated an access_token. So when we remove the client, this association should be cascaded and shouldn’t generate an error. Also I moved some Api related stuff to the ApiBundle (like the developer controler and ClientType form) | ||||
| * | | Use default locale for user config | Jeremy Benoist | 2016-10-08 | 1 | -1/+1 |
| | | | | | | | | | | | | When creating a user, we set the language config “en” by default. We should use the defined locale (from `parameters.yml`) instead | ||||
| * | | Add ability to use socket | Jeremy Benoist | 2016-10-07 | 2 | -0/+4 |
| | | | | | | | | | | | | For Redis & MySQL | ||||
| * | | better tags on material | Thomas Citharel | 2016-10-05 | 1 | -0/+9 |
| | | | |||||
| * | | better tags on baggy | Thomas Citharel | 2016-10-04 | 1 | -1/+15 |
| | | | |||||
| * | | Prepare wallabag 2.1.1 | Nicolas Lœuillet | 2016-10-04 | 1 | -1/+1 |
| | | | |||||
| * | | typo and build on test | Thomas Citharel | 2016-10-04 | 1 | -1/+1 |
| | | | |||||
| * | | use airbnb base rules and update eslint | Thomas Citharel | 2016-10-04 | 2 | -3/+6 |
| | | | |||||
| * | | Fixed icon position in share menu | Nicolas Lœuillet | 2016-10-04 | 1 | -2/+5 |
| | | | |||||
| * | | fix icons | Thomas Citharel | 2016-10-04 | 1 | -1/+2 |
| | | | |||||
| * | | Add eslint & stylelint tests (fix a few things) and move dependencies to dev | Thomas Citharel | 2016-10-04 | 3 | -7/+8 |
| | | | |||||
| * | | Update doc | Jeremy Benoist | 2016-10-04 | 1 | -1/+1 |
| | | | | | | | | | | | | Merge VALIDATE_TRANSLATION_FILE & ASSET build (less build on Travis) | ||||
| * | | shaarli instead of Diaspora | Jeremy Benoist | 2016-10-04 | 1 | -1/+1 |
| | | | |||||
| * | | Basically, fix everything | Thomas Citharel | 2016-10-03 | 4 | -6/+83 |
| |/ | | | | | | | | | | | * Remove install.sh * Assets are now provided * Icons font issues are fixed | ||||
| * | Fixed CSS for quickstart links | Nicolas Lœuillet | 2016-10-03 | 1 | -2/+6 |
| | | |||||
| * | Merge pull request #2314 from wallabag/assets | Nicolas Lœuillet | 2016-10-03 | 16 | -383/+414 |
| |\ | | | | | | | Assets work | ||||
| | * | fonts & ligatures | Thomas Citharel | 2016-09-29 | 3 | -13/+3 |
| | | | |||||
| | * | remove autocomplete and bring fonts through npm | Thomas Citharel | 2016-09-28 | 1 | -1/+6 |
| | | | |||||
| | * | Assets work | Thomas Citharel | 2016-09-28 | 15 | -369/+405 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ES6 all the things ! * ESLint checks everything * CSS fixes (use stylelint) * Fix #2231 | ||||
| * | | Add users management UI | Jeremy Benoist | 2016-10-02 | 2 | -0/+6 |
| | | | | | | | | | | | | | | | | | | - remove the “add a user” from the config page - add a CRUD on user - fix some missing translations (+ bad indentation) | ||||
| * | | Merge pull request #2326 from wallabag/update-quickstart | Jeremy Benoist | 2016-10-02 | 1 | -2/+2 |
| |\ \ | | | | | | | | | Changed quickstart layout | ||||
| | * | | Changed quickstart layout | Nicolas Lœuillet | 2016-10-01 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge pull request #2323 from wallabag/footer-stats | Jeremy Benoist | 2016-10-02 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | | | Add simple stats in footer | ||||
| | * | | | Add simple stats in footer | Jeremy Benoist | 2016-10-01 | 1 | -0/+1 |
| | |/ / | |||||
| * / / | Customize errors templates | Jeremy Benoist | 2016-10-01 | 1 | -0/+1 |
| |/ / | | | | | | | | | | All error goes to the same template which only display the error message and the status code. | ||||
| * | | Some fixes about upgrade from 2.0.x -> 2.1.0 | Nicolas Lœuillet | 2016-09-28 | 1 | -1/+5 |
| | | | |||||
| * | | Remove CSS class who caused long loading on Firefox | Nicolas Lœuillet | 2016-09-27 | 1 | -1/+0 |
| | | | | | | | | | | | | Fix #2302 #2281 | ||||
| * | | Add controller test for Instapaper | Jeremy Benoist | 2016-09-27 | 1 | -0/+13 |
| | | | |||||
| * | | Add Instapaper import | Jeremy Benoist | 2016-09-27 | 1 | -1/+1 |
| |/ | | | | | | | Also update ImportController with latest import (chrome, firefox & instapaper). | ||||
| * | cs & fixes | Thomas Citharel | 2016-09-25 | 1 | -0/+26 |
| | | |||||
| * | Merge pull request #2239 from wallabag/documentation-2.1 | Nicolas Lœuillet | 2016-09-20 | 1 | -1/+1 |
| |\ | | | | | | | Update documentation with new features for 2.1 | ||||
| | * | Fixed version in documentation | Nicolas Lœuillet | 2016-09-19 | 1 | -1/+1 |
| | | |