aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/v2' into v2_fix_materialAlexandr Danilov2015-08-105-2/+122
|\ | | | | | | | | # Conflicts: # src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
| * Merge pull request #1295 from wallabag/v2-howtoJeremy Benoist2015-08-105-0/+120
| |\ | | | | | | add howto page
| | * remove useless lineNicolas Lœuillet2015-08-101-1/+0
| | |
| | * add tests for static pagesNicolas Lœuillet2015-08-101-0/+29
| | |
| | * add howto pageNicolas Lœuillet2015-08-074-0/+92
| | |
* | | Merge remote-tracking branch 'origin/v2' into v2_fix_materialAlexandr Danilov2015-08-106-2/+83
|\| | | | | | | | | | | | | | # Conflicts: # src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
| * | Merge pull request #1292 from wallabag/v2-tags-routeJeremy Benoist2015-08-096-2/+83
| |\ \ | | | | | | | | Add tags list display
| | * | unit testNicolas Lœuillet2015-08-072-2/+19
| | | |
| | * | fix displayNicolas Lœuillet2015-08-071-16/+2
| | | |
| | * | Add tags list displayNicolas Lœuillet2015-08-075-2/+80
| | | |
| * | | 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
| |/ /
* | | Preparation for adding linksAlexandr Danilov2015-08-082-1/+6
| | |
* | | fix #1281Alexandr Danilov2015-08-083-161/+76
| | |
* | | fix #1281 (notifications when we star articles are buggy)Alexandr Danilov2015-08-081-0/+8
| | | | | | | | | | | | All notification corrected
* | | fix #1281 (When I save 10 articles, I've got 4 lines: 3 articles on 1st ↵Alexandr Danilov2015-08-081-2/+3
| | | | | | | | | | | | line, 3 on 2nd one, only 1 on 3rd line and 3 on last lines (chrome and firefox))
* | | Title in navigation barAlexandr Danilov2015-08-073-0/+15
| | |
* | | fix #1282Alexandr Danilov2015-08-072-0/+10
|/ /
* | 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
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 21:24:42 +0000