aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* workThomas Citharel2016-10-0814-1/+65
|
* Merge pull request #2399 from wallabag/use-locale-for-configJeremy Benoist2016-10-081-1/+1
|\ | | | | Use default locale for user config
| * 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
* | Merge pull request #2400 from wallabag/doc-env-prodJeremy Benoist2016-10-089-51/+51
|\ \ | |/ |/| Set env to prod in documentation
| * Set env to prod in documentationJeremy Benoist2016-10-089-51/+51
|/
* Merge pull request #2396 from wallabag/mruminski-patch-1Nicolas Lœuillet2016-10-071-1/+1
|\ | | | | Update messages.pl.yml
| * Update messages.pl.ymlMateusz Rumiński2016-10-071-1/+1
| | | | | | translated shared_by_wallabag to polish
* | Merge pull request #2395 from wallabag/socket-connectionNicolas Lœuillet2016-10-073-1/+6
|\ \ | |/ |/| Add ability to use socket
| * Add ability to use socketJeremy Benoist2016-10-073-1/+6
|/ | | | For Redis & MySQL
* Merge pull request #2386 from wallabag/update-changelogNicolas Lœuillet2016-10-072-240/+2438
|\ | | | | Changed Changelog by using github-changelog-generator from @skywinder
| * Update release processNicolas Lœuillet2016-10-071-0/+1
| |
| * Changed Changelog by using github-changelog-generator from @skywinderNicolas Lœuillet2016-10-071-240/+2437
| |
* | Merge pull request #2389 from wallabag/add-info-publich-articlesNicolas Lœuillet2016-10-072-0/+3
|\ \ | | | | | | Added default picture if preview picture is null
| * | Added default picture if preview picture is nullNicolas Lœuillet2016-10-072-0/+3
| | |
* | | Merge pull request #2388 from wallabag/fix-2factor-user-adminNicolas Lœuillet2016-10-072-2/+2
|\ \ \ | | | | | | | | Fixed two-factor checkbox display in user admin panel
| * | | Fixed two-factor checkbox display in user admin panelNicolas Lœuillet2016-10-072-2/+2
| | | | | | | | | | | | | | | | Fix #2380
* | | | Merge pull request #2385 from wallabag/add-doc-about-siteconfigJeremy Benoist2016-10-072-6/+30
|\ \ \ \ | |/ / / |/| | | Added documentation about siteconfig fix
| * | | Fixed reviewNicolas Lœuillet2016-10-071-2/+2
| | | |
| * | | Added link to fivefilters websiteNicolas Lœuillet2016-10-072-5/+5
| | | |
| * | | Fixed reviewNicolas Lœuillet2016-10-072-3/+3
| | | |
| * | | Added documentation about siteconfig fixNicolas Lœuillet2016-10-072-6/+30
| | |/ | |/| | | | | | | Found in #2358, thank you @j0k3r
* | | Merge pull request #2383 from wallabag/add-info-publich-articlesNicolas Lœuillet2016-10-0713-3/+35
|\ \ \ | |/ / |/| / | |/ Added OpenGraph support for public articles
| * Added test for OpenGraphNicolas Lœuillet2016-10-071-1/+4
| |
| * Fixed reviewNicolas Lœuillet2016-10-0712-21/+21
| |
| * Added OpenGraph support for public articlesNicolas Lœuillet2016-10-0712-2/+31
| | | | | | | | Fix #2289
* | Merge pull request #2332 from wallabag/tags-exportJeremy Benoist2016-10-0717-42/+84
|\ \ | |/ |/| Fix relations export for Entry
| * Fix tag testJeremy Benoist2016-10-073-13/+16
| |
| * Fix bad translation keyJeremy Benoist2016-10-0711-11/+11
| | | | | | | | `entry_reload_failed` instead of `entry_reloaded_failed`
| * Fix relations export for EntryJeremy Benoist2016-10-075-19/+58
|/ | | | | Tags & Annotations weren’t really well exported. This is now fixed (+ tests)
* Merge pull request #2377 from wallabag/fix-exists-apiThomas Citharel2016-10-052-1/+8
|\ | | | | Fix exists API call
| * Fix typo & add testJeremy Benoist2016-10-052-1/+8
| |
| * Fix exists API callThomas Citharel2016-10-051-1/+1
| | | | | | Boo
* | Merge pull request #2374 from wallabag/clickable-tagsJeremy Benoist2016-10-0510-14/+40
|\ \ | | | | | | Clickable tags
| * | better tags on materialThomas Citharel2016-10-055-7/+17
| | |
| * | better tags on baggyThomas Citharel2016-10-045-7/+23
| | |
* | | 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
| |