aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1304 from wallabag/v2-rename-starred-menuThomas Citharel2015-08-091-1/+1
|\ | | | | rename favorite in starred
| * rename favorite in starredNicolas Lœuillet2015-08-091-1/+1
|/
* Merge pull request #1296 from wallabag/v2-fix-564Thomas Citharel2015-08-081-1/+1
|\ | | | | fix #564: replace Untitled by the domain name
| * fix #564: replace Untitled by the domain nameNicolas Lœuillet2015-08-071-1/+1
|/
* Merge pull request #1294 from wallabag/v2-fix-1282Jeremy Benoist2015-08-071-1/+1
|\ | | | | fix #1282: add title on wallabag logo
| * 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 views
| * 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
|\ | | | | fix #1283: display the good title for each category
| * 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/
| * 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
|\ | | | | Added Material theme
| * 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.
| * Adds pagerfanta paginator everywhere, modifies article routing. Change API ↵Francois Gravelaine2015-07-288-59/+76
|/ | | | for is_starred and is_archived
* 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
|\ \ | | | | | | Upgrade to Symfony 2.7
| * | Update to Symfony 2.7Jeremy Benoist2015-06-029-135/+80
| | | | | | | | | | | | And fix some deps instead of using dev tags
| * | Remove phinxJeremy Benoist2015-06-024-40/+0
|/ / | | | | | | Doctrine handle quite correctly database migration. Thanks to `doctrine:schema:update`
| * Add basic title editionJeremy Benoist2015-06-028-13/+147
|/ | | | | Fix #218 I mean basic, because there is no javascript at all. It could be a nice edit-in-place. But for the moment, it is simple.
* Update depsJeremy Benoist2015-06-012-14/+22
|
* Merge pull request #1167 from wallabag/v2-api-bundleNicolas Lœuillet2015-06-0156-789/+1142
|\ | | | | Move API stuff in ApiBundle
| * 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
| | | | | | | | See https://github.com/doctrine/doctrine2/commit/20fb8270dc3c84eceaf90979644fdfbe0b2e615e
| * Disable coverageJeremy Benoist2015-05-301-10/+10
| | | | | | | | | | | | It takes ages to process and most of the time the build fail for "execution time" too long. Too much time already burned to investigate it. We'll investigate later, it's not a priority atm.
| * Enable debug on phpunitJeremy Benoist2015-04-041-1/+1
| |
| * Avoid / in feed tokenJeremy2015-04-011-1/+2
| | | | | | | | Of course, it breaks the url and the route matcher for each feed route
| * 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
|\ \ | | | | | | Add some required
| * | name not requiredThomas Citharel2015-04-151-1/+1
| | |
| * | changed email fields with the email type and added required parameter on ↵Thomas Citharel2015-04-154-5/+6
|/ / | | | | | | some stuff
* / 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 username
| * Remove ability to change usernameJeremy2015-04-015-33/+25
| | | | | | | | | | | | | | | | | | | | Since password are linked to username it was hard to change username while checking that the password is the good one. Instead of doing crazy things to achieve that, I act that user won't be able to update username. Also, username (and email) must be unique, since people logged in using username and can request a new password using email. This should fix #1149
* | Merge pull request #1165 from wallabag/v2-prefix-dbNicolas Lœuillet2015-04-0110-8/+99
|\ \ | |/ |/| Prefix table
| * And phpunit with html coverage to antJeremy2015-04-011-0/+7
| | | | | | | | Launching `ant phpunit` will now generate HTML Coverage
| * Ability to prefix tablesJeremy2015-04-019-8/+92
|/ | | | Will fix #799
* Merge pull request #1166 from wallabag/v2-rssNicolas Lœuillet2015-04-0127-88/+1074
|\ | | | | Add RSS feeds
| * Force raw on contentJeremy2015-04-011-3/+3
| | | | | | We don't want Symfony to escape html content
| * Avoid timeout on code coverage from ScrutinizerJeremy2015-03-311-1/+2
| |
| * Use lemonde instead of mailjetJeremy2015-03-312-3/+3
| | | | | | | | | | | | Mailjet seems to be laggy, hope that LeMonde will be more reliable in the future. @see https://travis-ci.org/wallabag/wallabag/jobs/56246231
| * Update InstallCommand testJeremy2015-03-313-6/+35
| | | | | | | | | | | | | | | | They are god damn too long to execute because it launch external command (mostly related to doctrine). So I've added a PHPUnit @group (`command-doctrine`) so that we can avoid launching them on a regular basis, like that: `phpunit --exclude-group command-doctrine`
| * Add testsJeremy2015-03-3113-26/+533
| | | | | | | | and fix few mistakes