aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge pull request #1437 from wallabag/v2-clean-materialJeremy Benoist2015-09-3015-51/+2
|\ | | | | some cleanup on material theme
| * some cleanup on material themeNicolas Lœuillet2015-09-2915-51/+2
| |
* | Merge pull request #1439 from wallabag/v2-fix-deployNicolas Lœuillet2015-09-302-106/+1
|\ \ | | | | | | fix Capistrano configuration
| * | fix Capistrano configurationNicolas Lœuillet2015-09-292-106/+1
| |/
* | Merge pull request #1440 from wallabag/v2-fix-1433Thomas Citharel2015-09-294-2/+31
|\ \ | |/ |/| fix #1433: remove www. on entries view
| * forgot one fileNicolas Lœuillet2015-09-291-0/+6
| |
| * remove www. on entries viewNicolas Lœuillet2015-09-293-2/+25
|/
* Merge pull request #1434 from wallabag/travis-dbNicolas Lœuillet2015-09-2816-126/+347
|\ | | | | Add multiple database tests on Travis
| * Enabled Tidy on travis for HHVMJeremy Benoist2015-09-281-0/+6
| |
| * Fix tests for allJeremy Benoist2015-09-283-29/+14
| |
| * Fix Postgres testsJeremy Benoist2015-09-283-22/+52
| |
| * Move readingTime & domainName in ContentProxyJeremy Benoist2015-09-284-7/+25
| | | | | | | | So, everything is centralized in one place when we save a new entry.
| * Use tecnickcom/tcpdfJeremy Benoist2015-09-262-65/+2
| | | | | | | | tecnick.com/tcpdf is abandonned.
| * Fix authentication error from GithubJeremy Benoist2015-09-261-3/+2
| | | | | | | | From: http://blog.wyrihaximus.net/2015/09/github-auth-token-on-travis/
| * Fix HHVM & PHP 7.0Jeremy Benoist2015-09-261-1/+1
| |
| * Add multiple database tests on TravisJeremy Benoist2015-09-268-26/+272
| |
* | Merge pull request #1435 from wallabag/v2-enabled-userNicolas Lœuillet2015-09-262-0/+10
|\ \ | |/ |/| Enabled created user from Config
| * Enabled created user from ConfigJeremy Benoist2015-09-262-0/+10
|/ | | | | | By default, creating user with FOSUser are disabled by default. Fix #1423
* Merge pull request #1429 from wallabag/v2-languageNicolas Lœuillet2015-09-2314-123/+381
|\ | | | | V2 – Handle language in entry
| * Entries filter on languageJeremy Benoist2015-09-238-65/+255
| | | | | | | | + updated deps
| * Remove tab from baggy cssJeremy Benoist2015-09-231-51/+51
| | | | | | | | And add a border left on the filter slider
| * Handle entry in languageJeremy Benoist2015-09-224-5/+56
| | | | | | | | Fix #1333
| * Adjust preview pictureJeremy Benoist2015-09-202-2/+19
|/
* Merge pull request #1420 from modos189/v2_display_picture2.0.0-alpha.0Nicolas Lœuillet2015-09-142-16/+56
|\ | | | | improved display pictures
| * improved display picturesAlexandr Danilov2015-09-142-16/+56
| |
* | Merge pull request #1401 from wallabag/v2-baggy-themesNicolas Lœuillet2015-09-1335-3697/+322
|\ \ | |/ |/| Cleanup baggy
| * A little more width for filter viewThomas Citharel2015-09-131-1/+1
| |
| * Re-add preview picture on baggyJeremy Benoist2015-09-131-1/+6
| | | | | | | | Which should has been removed on merge
| * Update depsJeremy Benoist2015-09-131-51/+56
| |
| * Filters view on side for baggyJeremy Benoist2015-09-132-16/+88
| |
| * Fix testsJeremy Benoist2015-09-132-0/+40
| |
| * Lower domain search lengthJeremy Benoist2015-09-131-1/+1
| | | | | | | | When searching for "bbc" I got no result .. sigh.
| * Handle filter form using some JSJeremy Benoist2015-09-133-15/+49
| | | | | | | | Instead of displaying an ugly form
| * Cleanup base layoutJeremy Benoist2015-09-132-47/+56
| |
| * Remove some global assetsJeremy Benoist2015-09-1313-3544/+4
| | | | | | | | | | Some global assets where dedicated to baggy Remove some non-used css
| * Move baggy theme in its folderJeremy Benoist2015-09-1316-0/+0
|/
* Merge pull request #1417 from wallabag/v2-display-pictureJeremy Benoist2015-09-136-2/+25
|\ | | | | fix #972: add preview pictures
| * add previewPicture on baggy themeNicolas Lœuillet2015-09-133-1/+12
| |
| * add preview picturesNicolas Lœuillet2015-09-123-1/+13
| |
* | Merge pull request #1418 from wallabag/v2-previewpicture-filterJeremy Benoist2015-09-133-2/+32
|\ \ | | | | | | filter for entries with previewPicture
| * | add test for previewPicture filterNicolas Lœuillet2015-09-132-3/+14
| | |
| * | forgot case for previewPicture filterNicolas Lœuillet2015-09-131-0/+6
| | |
| * | filter for entries with previewPictureNicolas Lœuillet2015-09-122-2/+15
| |/
* | Merge pull request #1362 from wallabag/v2-fosuserNicolas Lœuillet2015-09-1218-333/+164
|\ \ | |/ |/| implement FosUser
| * Fix testsJeremy Benoist2015-09-124-10/+11
| | | | | | | | | | | | | | Ensure that created use during install command will always be unique. We assume that the install command must be run to initialize a wallabag instance. NEVER to add more user. Also, use a better way to retrieve the real name of the database and not the one defined in parameters.yml (which isn't the same for test envi because the dbname isn't defined in parameters.yml but directly in config_test.yml)
| * fix tests for FosUserNicolas Lœuillet2015-09-113-17/+16
| |
| * implement FosUserNicolas Lœuillet2015-09-1114-307/+138
|/
* Merge pull request #1397 from wallabag/v2-grabyNicolas Lœuillet2015-09-1112-358/+730
|\ | | | | Integrate graby
| * CSJeremy Benoist2015-09-103-9/+6
| |
| * Move fetching content in a separate classJeremy Benoist2015-09-105-19/+156
| |