aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2455 from wallabag/fix-material-config-tabsJeremy Benoist2016-10-161-1/+1
|\ | | | | Fix tabs on material
| * Fix tabs on materialThomas Citharel2016-10-151-1/+1
| | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | Merge pull request #2454 from wallabag/fix-baggy-small-widthJeremy Benoist2016-10-161-0/+8
|\ \ | | | | | | Fix baggy display on small screens
| * | Fix baggy on small screensThomas Citharel2016-10-151-0/+8
| |/
* / German: improve existing and add missing translationSven Fischer2016-10-161-4/+4
|/
* Merge pull request #2450 from wallabag/new-improvement-viewThomas Citharel2016-10-151-1/+21
|\ | | | | View improvements
| * fix stylelintThomas Citharel2016-10-151-1/+1
| |
| * Improved side menu, reduced the font size on small screens, fixed a form to ↵Alexandr Danilov2016-10-151-1/+21
| | | | | | | | add links on small screens
* | Merge pull request #2412 from wallabag/fix-postgres-migrationThomas Citharel2016-10-154-14/+24
|\ \ | |/ |/| Fix PostgreSQL migrations
| * Fix PostgreSQL migrationsJeremy Benoist2016-10-094-14/+24
| |
* | Define a dev version for the masterJeremy Benoist2016-10-101-1/+1
|/ | | This is to be sure that user testing wallabag from the master will have the version defined as dev.
* CSJeremy Benoist2016-10-091-1/+2
|
* Optimize the way tag list is renderedJeremy Benoist2016-10-091-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-deletionNicolas Lœuillet2016-10-081-0/+5
|\ | | | | Changed relation between API client and refresh token
| * Ensure access_token are removedJeremy Benoist2016-10-081-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 configJeremy Benoist2016-10-081-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 socketJeremy Benoist2016-10-072-0/+4
| | | | | | | | For Redis & MySQL
* | better tags on materialThomas Citharel2016-10-051-0/+9
| |
* | better tags on baggyThomas Citharel2016-10-041-1/+15
| |
* | Prepare wallabag 2.1.1Nicolas Lœuillet2016-10-041-1/+1
| |
* | typo and build on testThomas Citharel2016-10-041-1/+1
| |
* | use airbnb base rules and update eslintThomas Citharel2016-10-042-3/+6
| |
* | Fixed icon position in share menuNicolas Lœuillet2016-10-041-2/+5
| |
* | fix iconsThomas Citharel2016-10-041-1/+2
| |
* | Add eslint & stylelint tests (fix a few things) and move dependencies to devThomas Citharel2016-10-043-7/+8
| |
* | Update docJeremy Benoist2016-10-041-1/+1
| | | | | | | | Merge VALIDATE_TRANSLATION_FILE & ASSET build (less build on Travis)
* | shaarli instead of DiasporaJeremy Benoist2016-10-041-1/+1
| |
* | Basically, fix everythingThomas Citharel2016-10-034-6/+83
|/ | | | | | * Remove install.sh * Assets are now provided * Icons font issues are fixed
* Fixed CSS for quickstart linksNicolas Lœuillet2016-10-031-2/+6
|
* Merge pull request #2314 from wallabag/assetsNicolas Lœuillet2016-10-0316-383/+414
|\ | | | | Assets work
| * fonts & ligaturesThomas Citharel2016-09-293-13/+3
| |
| * remove autocomplete and bring fonts through npmThomas Citharel2016-09-281-1/+6
| |
| * Assets workThomas Citharel2016-09-2815-369/+405
| | | | | | | | | | | | | | | | | | | | * ES6 all the things ! * ESLint checks everything * CSS fixes (use stylelint) * Fix #2231
* | Add users management UIJeremy Benoist2016-10-022-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-quickstartJeremy Benoist2016-10-021-2/+2
|\ \ | | | | | | Changed quickstart layout
| * | Changed quickstart layoutNicolas Lœuillet2016-10-011-2/+2
| | |
* | | Merge pull request #2323 from wallabag/footer-statsJeremy Benoist2016-10-021-0/+1
|\ \ \ | | | | | | | | Add simple stats in footer
| * | | Add simple stats in footerJeremy Benoist2016-10-011-0/+1
| |/ /
* / / Customize errors templatesJeremy Benoist2016-10-011-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.0Nicolas Lœuillet2016-09-281-1/+5
| |
* | Remove CSS class who caused long loading on FirefoxNicolas Lœuillet2016-09-271-1/+0
| | | | | | | | Fix #2302 #2281
* | Add controller test for InstapaperJeremy Benoist2016-09-271-0/+13
| |
* | Add Instapaper importJeremy Benoist2016-09-271-1/+1
|/ | | | Also update ImportController with latest import (chrome, firefox & instapaper).
* cs & fixesThomas Citharel2016-09-251-0/+26
|
* Merge pull request #2239 from wallabag/documentation-2.1Nicolas Lœuillet2016-09-201-1/+1
|\ | | | | Update documentation with new features for 2.1
| * Fixed version in documentationNicolas Lœuillet2016-09-191-1/+1
| |
| * Add documentation about article sharingNicolas Lœuillet2016-09-191-1/+1
| |
* | Update CraueConfigBundle.pl.ymlMateusz Rumiński2016-09-191-1/+1
| | | | | | fix misspell
* | Update CraueConfigBundle.pl.ymlMateusz Rumiński2016-09-191-8/+8
|/ | | add missing translation
* Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-09-191-1/+1
|\