aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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
| |
* | Merge pull request #2314 from wallabag/assetsNicolas LĹ“uillet2016-10-0328-502/+498
|\ \ | |/ |/| Assets work
| * remove bower dependency from npmThomas Citharel2016-09-291-1/+0
| |
| * remove bowerThomas Citharel2016-09-294-51/+2
| |
| * fonts & ligaturesThomas Citharel2016-09-294-26/+24
| |
| * remove autocomplete and bring fonts through npmThomas Citharel2016-09-283-8/+32
| |
| * Remove .idea stuffThomas Citharel2016-09-281-5/+1
| |
| * Assets workThomas Citharel2016-09-2823-417/+445
| | | | | | | | | | | | | | | | | | | | * ES6 all the things ! * ESLint checks everything * CSS fixes (use stylelint) * Fix #2231
* | Merge pull request #2331 from wallabag/api-linksThomas Citharel2016-10-023-4/+115
|\ \ | | | | | | Fix parameters in API _links
| * | Fix parameters in API _linksJeremy Benoist2016-10-023-4/+115
| | | | | | | | | | | | We forgot to pass them to the factory
* | | Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-10-021-1/+1
|\ \ \ | |/ / |/| |
| * | Merge pull request #2330 from pmichelazzo/masterJeremy Benoist2016-10-021-1/+1
| |\ \ | | | | | | | | Remove error message when creating ePub versions
| | * | Remove error message when creating ePub versionsPaulino Michelazzo2016-10-021-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-managementJeremy Benoist2016-10-0231-346/+917
|\ \ \ | | | | | | | | Add users management UI
| * | | Disabled delete button for the logged userJeremy Benoist2016-10-022-1/+12
| | | | | | | | | | | | | | | | To avoid some bad things to happen…
| * | | Remove NewUser test from ConfigJeremy Benoist2016-10-021-114/+0
| | | |
| * | | Cleanup & add link on baggy menuJeremy Benoist2016-10-023-60/+1
| | | |
| * | | Add users management UIJeremy Benoist2016-10-0229-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-existsNicolas LĹ“uillet2016-10-022-0/+54
|\ \ \ \ | | | | | | | | | | Add an exists endpoint in API