Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Update doc | Jeremy Benoist | 2016-10-04 | 9 | -13/+11 | |
| | | | | | | | | Merge VALIDATE_TRANSLATION_FILE & ASSET build (less build on Travis) | |||||
| * | Fix font & Travis | Jeremy Benoist | 2016-10-04 | 80 | -54/+130001 | |
| | | | | | | | | Grunt now copy fonts instead of symlink (node_modules won't exist for the end user) | |||||
| * | shaarli instead of Diaspora | Jeremy Benoist | 2016-10-04 | 1 | -1/+1 | |
| | | ||||||
| * | Update .travis.yml | Jeremy Benoist | 2016-10-04 | 1 | -1/+1 | |
| | | ||||||
| * | Fix grunt path | Thomas Citharel | 2016-10-04 | 1 | -1/+1 | |
| | | ||||||
| * | remove install scripts and tweak travis | Thomas Citharel | 2016-10-03 | 3 | -29/+3 | |
| | | ||||||
| * | Basically, fix everything | Thomas Citharel | 2016-10-03 | 88 | -56/+267 | |
| | | | | | | | | | | | | * Remove install.sh * Assets are now provided * Icons font issues are fixed | |||||
* | | Merge pull request #2359 from wallabag/user-config | Nicolas LĹ“uillet | 2016-10-04 | 3 | -44/+0 | |
|\ \ | | | | | | | Create config even if user is disabled | |||||
| * | | đź‘‹ HHVM | Jeremy Benoist | 2016-10-04 | 1 | -20/+0 | |
| | | | ||||||
| * | | Create config even if user is disabled | Jeremy Benoist | 2016-10-04 | 2 | -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/master | Nicolas LĹ“uillet | 2016-10-04 | 3 | -0/+3 | |
|\ \ | |/ |/| | Add php-bcmath extension to requirements | |||||
| * | Add php-bcmath extension to requirements | Zayon | 2016-10-03 | 3 | -0/+3 | |
|/ | | | | Fix issue #2342 | |||||
* | Add missing env in install.sh | Jeremy Benoist | 2016-10-03 | 1 | -1/+1 | |
| | | | Fix https://github.com/wallabag/wallabag/issues/2345 | |||||
* | 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 | |||||
* | | Merge pull request #2340 from wallabag/improve-ger-transl | Thomas Citharel | 2016-10-03 | 1 | -1/+1 | |
|\ \ | | | | | | | small improvement for german translation | |||||
| * | | improve German translation | Sven Fischer | 2016-10-03 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #2338 from wallabag/install-2.1 | Thomas Citharel | 2016-10-03 | 12 | -23/+31 | |
|\ \ | |/ |/| | Fix for 2.1 installation | |||||
| * | Ensure cache is clear before upgrading | Jeremy Benoist | 2016-10-03 | 6 | -0/+6 | |
| | | | | | | | | If we changed some namespace / classes, we need to refresh the cache before anything else. | |||||
| * | Use install_dev.sh for Travis | Jeremy Benoist | 2016-10-03 | 3 | -23/+22 | |
| | | | | | | | | Add `--no-dev` to `composer install` for prod env | |||||
| * | Re-add wallabag:install | Jeremy Benoist | 2016-10-03 | 3 | -0/+3 | |
|/ | ||||||
* | Update md5 hash for wallabag 2.1.0 | Nicolas LĹ“uillet | 2016-10-03 | 6 | -6/+6 | |
| | ||||||
* | Merge pull request #2334 from wallabag/prepare-21 | Jeremy Benoist | 2016-10-03 | 5 | -4/+57 | |
|\ | | | | | Prepare wallabag 2.1.0 :rocket: | |||||
| * | Prepare wallabag 2.1.0 :rocket: | Nicolas LĹ“uillet | 2016-10-03 | 5 | -4/+57 | |
| | | ||||||
* | | Merge pull request #2335 from wallabag/fix-quickstart-css | Nicolas LĹ“uillet | 2016-10-03 | 2 | -3/+7 | |
|\ \ | | | | | | | Fixed CSS for quickstart links | |||||
| * | | Fixed CSS for quickstart links | Nicolas LĹ“uillet | 2016-10-03 | 2 | -3/+7 | |
|/ / | ||||||
* | | 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 | 28 | -502/+498 | |
|\ \ | |/ |/| | Assets work | |||||
| * | remove bower dependency from npm | Thomas Citharel | 2016-09-29 | 1 | -1/+0 | |
| | | ||||||
| * | remove bower | Thomas Citharel | 2016-09-29 | 4 | -51/+2 | |
| | | ||||||
| * | fonts & ligatures | Thomas Citharel | 2016-09-29 | 4 | -26/+24 | |
| | | ||||||
| * | remove autocomplete and bring fonts through npm | Thomas Citharel | 2016-09-28 | 3 | -8/+32 | |
| | | ||||||
| * | Remove .idea stuff | Thomas Citharel | 2016-09-28 | 1 | -5/+1 | |
| | | ||||||
| * | Assets work | Thomas Citharel | 2016-09-28 | 23 | -417/+445 | |
| | | | | | | | | | | | | | | | | | | | | * 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 | 3 | -4/+115 | |
|\ \ | | | | | | | Fix parameters in API _links | |||||
| * | | Fix parameters in API _links | Jeremy Benoist | 2016-10-02 | 3 | -4/+115 | |
| | | | | | | | | | | | | 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 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Merge pull request #2330 from pmichelazzo/master | Jeremy Benoist | 2016-10-02 | 1 | -1/+1 | |
| |\ \ | | | | | | | | | Remove error message when creating ePub versions | |||||
| | * | | 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 | 31 | -346/+917 | |
|\ \ \ | | | | | | | | | Add users management UI | |||||
| * | | | Disabled delete button for the logged user | Jeremy Benoist | 2016-10-02 | 2 | -1/+12 | |
| | | | | | | | | | | | | | | | | To avoid some bad things to happen… | |||||
| * | | | Remove NewUser test from Config | Jeremy Benoist | 2016-10-02 | 1 | -114/+0 | |
| | | | | ||||||
| * | | | Cleanup & add link on baggy menu | Jeremy Benoist | 2016-10-02 | 3 | -60/+1 | |
| | | | | ||||||
| * | | | Add users management UI | Jeremy Benoist | 2016-10-02 | 29 | -223/+956 | |
| | | | | | | | | | | | | | | | | | | | | | | | | - 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 | 2 | -0/+54 | |
|\ \ \ \ | | | | | | | | | | | Add an exists endpoint in API |