aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2375 from wallabag/upgrade-nodejsThomas Citharel2016-10-051-1/+1
|\ | | | | try to reduce assets build npm connection failing by updating nodejs
| * try to reduce assets build npm connection failing by updating nodejsThomas Citharel2016-10-051-1/+1
| |
* | Merge pull request #2363 from wallabag/clean-composerNicolas Lœuillet2016-10-041-4/+1
|\ \ | | | | | | Remove mouf/nodejs-installer from composer
| * | Remove mouf/nodejs-installer from composerJeremy Benoist2016-10-041-4/+1
|/ /
* / Update md5 hash for packageNicolas Lœuillet2016-10-045-5/+5
|/
* Merge pull request #2349 from wallabag/prepare-211Nicolas Lœuillet2016-10-049-13/+29
|\ | | | | Prepare wallabag 2.1.1
| * Update CHANGELOG.mdNicolas Lœuillet2016-10-041-1/+1
| |
| * TypoJeremy Benoist2016-10-041-1/+1
| |
| * Update CHANGELOGJeremy Benoist2016-10-041-2/+5
| |
| * Prepare wallabag 2.1.1Nicolas Lœuillet2016-10-049-11/+24
|/
* Merge pull request #2353 from wallabag/assets-fixThomas Citharel2016-10-04103-147/+130247
|\ | | | | Basically, fix everything
| * typo and build on testThomas Citharel2016-10-043-3/+3
| |
| * use airbnb base rules and update eslintThomas Citharel2016-10-048-11/+21
| |
| * Fix icon positionThomas Citharel2016-10-047-37/+40
| |
| * Fixed calendar icon position with baggy themeNicolas Lœuillet2016-10-041-1/+2
| |
| * Fixed icon position in share menuNicolas Lœuillet2016-10-048-43/+45
| |
| * fix iconsThomas Citharel2016-10-044-11/+10
| |
| * Add eslint & stylelint tests (fix a few things) and move dependencies to devThomas Citharel2016-10-0414-82/+96
| |
| * Update docJeremy Benoist2016-10-049-13/+11
| | | | | | | | Merge VALIDATE_TRANSLATION_FILE & ASSET build (less build on Travis)
| * Fix font & TravisJeremy Benoist2016-10-0480-54/+130001
| | | | | | | | Grunt now copy fonts instead of symlink (node_modules won't exist for the end user)
| * shaarli instead of DiasporaJeremy Benoist2016-10-041-1/+1
| |
| * Update .travis.ymlJeremy Benoist2016-10-041-1/+1
| |
| * Fix grunt pathThomas Citharel2016-10-041-1/+1
| |
| * remove install scripts and tweak travisThomas Citharel2016-10-033-29/+3
| |
| * Basically, fix everythingThomas Citharel2016-10-0388-56/+267
| | | | | | | | | | | | * Remove install.sh * Assets are now provided * Icons font issues are fixed
* | Merge pull request #2359 from wallabag/user-configNicolas Lœuillet2016-10-043-44/+0
|\ \ | | | | | | Create config even if user is disabled
| * | 👋 HHVMJeremy Benoist2016-10-041-20/+0
| | |
| * | Create config even if user is disabledJeremy Benoist2016-10-042-24/+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 #2354 from Zayon/masterNicolas Lœuillet2016-10-043-0/+3
|\ \ | |/ |/| Add php-bcmath extension to requirements
| * Add php-bcmath extension to requirementsZayon2016-10-033-0/+3
|/ | | | Fix issue #2342
* Add missing env in install.shJeremy Benoist2016-10-031-1/+1
| | | Fix https://github.com/wallabag/wallabag/issues/2345
* Merge pull request #2341 from mruminski/masterThomas Citharel2016-10-031-31/+31
|\ | | | | Update messages.pl.yml
| * Update messages.pl.ymlMateusz Rumiński2016-10-031-31/+31
| | | | | | add missing and update existing translation
* | Merge pull request #2340 from wallabag/improve-ger-translThomas Citharel2016-10-031-1/+1
|\ \ | | | | | | small improvement for german translation
| * | improve German translationSven Fischer2016-10-031-1/+1
|/ /
* | Merge pull request #2338 from wallabag/install-2.1Thomas Citharel2016-10-0312-23/+31
|\ \ | |/ |/| Fix for 2.1 installation
| * Ensure cache is clear before upgradingJeremy Benoist2016-10-036-0/+6
| | | | | | | | If we changed some namespace / classes, we need to refresh the cache before anything else.
| * Use install_dev.sh for TravisJeremy Benoist2016-10-033-23/+22
| | | | | | | | Add `--no-dev` to `composer install` for prod env
| * Re-add wallabag:installJeremy Benoist2016-10-033-0/+3
|/
* Update md5 hash for wallabag 2.1.0Nicolas Lœuillet2016-10-036-6/+6
|
* Merge pull request #2334 from wallabag/prepare-21Jeremy Benoist2016-10-035-4/+57
|\ | | | | Prepare wallabag 2.1.0 :rocket:
| * Prepare wallabag 2.1.0 :rocket:Nicolas Lœuillet2016-10-035-4/+57
| |
* | Merge pull request #2335 from wallabag/fix-quickstart-cssNicolas Lœuillet2016-10-032-3/+7
|\ \ | | | | | | Fixed CSS for quickstart links
| * | Fixed CSS for quickstart linksNicolas Lœuillet2016-10-032-3/+7
|/ /
* | Merge pull request #2333 from wallabag/translation-german-for-2.1Jeremy Benoist2016-10-031-51/+51
|\ \ | |/ |/| for 2.1, translate all strings to German, which haven't been translated yet
| * Update messages.de.ymlJeremy Benoist2016-10-031-1/+1
| |
| * Fixed typosNicolas Lœuillet2016-10-031-2/+1
| |
| * Better translation for the weird sentenceJulian Oster2016-10-021-1/+2
| |
| * Improve the german translation a bitJulian Oster2016-10-021-10/+10
| | | | | | Just some little mistakes, good work so far :)
| * translate all strings to German, which haven't been translated yetSven Fischer2016-10-021-51/+51
| |