aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/Resources
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'wallabag/master'Paulino Michelazzo2016-10-1854-13/+3898
|\
| * Fixed hardcoded title for internal settingsNicolas Lœuillet2016-10-171-1/+1
| | | | | | | | Fix #2458
| * 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
| |/
| * 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
| * 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
| * better tags on materialThomas Citharel2016-10-051-0/+9
| |
| * better tags on baggyThomas Citharel2016-10-041-1/+15
| |
| * 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
| |
| * 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
| * | Changed quickstart layoutNicolas Lœuillet2016-10-011-2/+2
| | |
| * | Remove CSS class who caused long loading on FirefoxNicolas Lœuillet2016-09-271-1/+0
| |/ | | | | | | Fix #2302 #2281
| * 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 pull request #1941 from wallabag/v2-asynchronous-jobsJeremy Benoist2016-09-1911-10/+51
| |\ | | | | | | Use asynchronous jobs for imports
| | * Moved Pocket token to user configJeremy Benoist2016-09-1611-10/+31
| | |
| | * Add missing translationsJeremy Benoist2016-09-1310-1/+20
| | |
| | * Replace RabbitMQ injection with CraueConfigurationNicolas Lœuillet2016-09-111-0/+1
| | |
| * | Remove footer partNicolas Lœuillet2016-09-131-1/+1
| |/
| * Merge pull request #2002 from wallabag/feature-display-itemsNumberJeremy Benoist2016-09-031-0/+4
| |\ | | | | | | Feature display items number
| | * Display entries number for each categoryNicolas Lœuillet2016-08-231-0/+4
| | |
| * | Fixed different font-size for labels in config screenNicolas Lœuillet2016-09-021-0/+4
| | | | | | | | | | | | Fix #1788
| * | Merge pull request #2252 from wallabag/fix-last-mergeNicolas Lœuillet2016-09-021-1/+1
| |\ \ | | | | | | | | Fixed last merge who caused CSS/JS bugs
| | * | Fixed last merge who caused CSS/JS bugsNicolas Lœuillet2016-08-301-1/+1
| | | |
| * | | Merge pull request #2242 from wallabag/fix-minor-cssJeremy Benoist2016-09-012-2/+17
| |\ \ \ | | |/ / | |/| | Fix print / article views
| | * | CSS indentationNicolas Lœuillet2016-09-011-2/+2
| | | |
| | * | Fixed print view for baggy themeNicolas Lœuillet2016-08-261-1/+3
| | | |
| | * | Fix print / article viewsNicolas Lœuillet2016-08-261-1/+14
| | | |
| * | | Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-08-281-0/+11
| |\ \ \ | | |/ / | |/| |
| * | | Add icon for public share linkNicolas Lœuillet2016-08-251-0/+4
| | | |
| * | | Handle share_entryJeremy Benoist2016-08-2410-0/+25
| | |/ | |/| | | | | | | | | | - share_entry needs to be in the migration too - and it needs a translation
| * | Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-08-222-3/+3
| |\|
| * | Bring tags on entries view to baggyThomas Citharel2016-07-012-74/+126
| | | | | | | | | | | | Also, a couple of UI improvement and CSS fixing
| * | uniformize tags on article view tooThomas Citharel2016-06-241-2/+3
| | |
| * | minor ui fixesThomas Citharel2016-06-231-0/+4
| | |