aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1294 from wallabag/v2-fix-1282Jeremy Benoist2015-08-071-1/+1
|\
| * fix #1282: add title on wallabag logoNicolas Lœuillet2015-08-071-1/+1
|/
* Merge pull request #1293 from wallabag/v2-items-per-pageJeremy Benoist2015-08-071-0/+3
|\
| * get itemsPerPage for unread/fav/archive viewsNicolas Lœuillet2015-08-071-0/+3
|/
* Merge pull request #1286 from wallabag/v2-issue-1283Danilow Alexandr2015-08-061-1/+12
|\
| * change order of conditionNicolas Lœuillet2015-08-051-3/+3
| * fix #1283: display the good title for each categoryNicolas Lœuillet2015-08-051-1/+12
* | Many corrections material themeAlexandr Danilov2015-08-0611-23/+353
|/
* Merge pull request #1279 from wallabag/material-defaultJeremy Benoist2015-08-044-4/+4
|\
| * set material to default theme \o/Nicolas Lœuillet2015-08-044-4/+4
|/
* Merge pull request #1276 from modos189/v2Nicolas Lœuillet2015-08-0456-0/+16852
|\
| * Fixes and improve css @mediaAlexandr Danilov2015-08-049-71/+92
| * Added Material themeAlexandr Danilov2015-08-0456-0/+16831
|/
* Merge pull request #1250 from frankoa/v2_pagination_and_apiJeremy Benoist2015-07-298-59/+76
|\
| * Adds pagerfanta paginator everywhere, modifies article routing. Change API fo...Francois Gravelaine2015-07-288-59/+76
|/
* Merge branch 'v2-edit-title' into v2Nicolas Lœuillet2015-06-088-13/+147
|\
| * Merge branch 'v2' into v2-edit-titleNicolas Lœuillet2015-06-0813-175/+80
| |\ | |/ |/|
* | Merge pull request #1206 from wallabag/sf-2.7Nicolas Lœuillet2015-06-0313-175/+80
|\ \
| * | Update to Symfony 2.7Jeremy Benoist2015-06-029-135/+80
| * | Remove phinxJeremy Benoist2015-06-024-40/+0
|/ /
| * Add basic title editionJeremy Benoist2015-06-028-13/+147
|/
* Update depsJeremy Benoist2015-06-012-14/+22
* Merge pull request #1167 from wallabag/v2-api-bundleNicolas Lœuillet2015-06-0156-789/+1142
|\
| * CSJeremy Benoist2015-05-3031-163/+204
| * Update depsJeremy Benoist2015-05-302-320/+349
| * Update naming strategy since Doctrine 2.5Jeremy Benoist2015-05-301-0/+8
| * Disable coverageJeremy Benoist2015-05-301-10/+10
| * Enable debug on phpunitJeremy Benoist2015-04-041-1/+1
| * Avoid / in feed tokenJeremy2015-04-011-1/+2
| * Fix testsJeremy2015-04-014-11/+11
| * Move API stuff in ApiBundleJeremy2015-04-0125-297/+571
* | Merge pull request #1180 from wallabag/v2patchJeremy Benoist2015-04-154-4/+5
|\ \
| * | name not requiredThomas Citharel2015-04-151-1/+1
| * | changed email fields with the email type and added required parameter on some...Thomas Citharel2015-04-154-5/+6
|/ /
* / Add Travis & Scrutinizer badgesJeremy2015-04-021-0/+4
|/
* Merge pull request #1164 from wallabag/v2-remove-username-in-configNicolas Lœuillet2015-04-015-33/+25
|\
| * Remove ability to change usernameJeremy2015-04-015-33/+25
* | Merge pull request #1165 from wallabag/v2-prefix-dbNicolas Lœuillet2015-04-0110-8/+99
|\ \ | |/ |/|
| * And phpunit with html coverage to antJeremy2015-04-011-0/+7
| * Ability to prefix tablesJeremy2015-04-019-8/+92
|/
* Merge pull request #1166 from wallabag/v2-rssNicolas Lœuillet2015-04-0127-88/+1074
|\
| * Force raw on contentJeremy2015-04-011-3/+3
| * Avoid timeout on code coverage from ScrutinizerJeremy2015-03-311-1/+2
| * Use lemonde instead of mailjetJeremy2015-03-312-3/+3
| * Update InstallCommand testJeremy2015-03-313-6/+35
| * Add testsJeremy2015-03-3113-26/+533
| * Sort by id is fasterJeremy2015-03-311-4/+4
| * Add rss for entriesJeremy2015-03-3113-61/+510
|/
* Merge pull request #1152 from wallabag/v2-forgot-passwordNicolas Lœuillet2015-03-3015-8/+526
|\
| * Add some testsJeremy2015-03-082-1/+46