aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
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
| | | |
| * | | rename favorite in starredNicolas Lœuillet2015-08-091-1/+1
| | | |
| * | | 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
|/ /
* | fix #1282: add title on wallabag logoNicolas Lœuillet2015-08-071-1/+1
| |
* | 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
|/
* set material to default theme \o/Nicolas Lœuillet2015-08-043-3/+3
|
* Fixes and improve css @mediaAlexandr Danilov2015-08-048-71/+91
|
* Added Material themeAlexandr Danilov2015-08-0455-0/+16830
|
* Adds pagerfanta paginator everywhere, modifies article routing. Change API ↵Francois Gravelaine2015-07-287-55/+68
| | | | for is_starred and is_archived
* Merge branch 'v2' into v2-edit-titleNicolas Lœuillet2015-06-087-18/+24
|\
| * Update to Symfony 2.7Jeremy Benoist2015-06-027-18/+24
| | | | | | | | And fix some deps instead of using dev tags
* | 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.
* Merge pull request #1167 from wallabag/v2-api-bundleNicolas Lœuillet2015-06-0150-457/+776
|\ | | | | Move API stuff in ApiBundle
| * CSJeremy Benoist2015-05-3031-163/+204
| |
| * Update naming strategy since Doctrine 2.5Jeremy Benoist2015-05-301-0/+8
| | | | | | | | See https://github.com/doctrine/doctrine2/commit/20fb8270dc3c84eceaf90979644fdfbe0b2e615e
| * 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-0122-295/+564
| |
* | 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
* 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
* | Ability to prefix tablesJeremy2015-04-017-7/+87
|/ | | | Will fix #799
* Force raw on contentJeremy2015-04-011-3/+3
| | | We don't want Symfony to escape html content
* 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-312-4/+33
| | | | | | | | 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-3112-26/+532
| | | | and fix few mistakes
* Sort by id is fasterJeremy2015-03-311-4/+4
| | | | Since it's the primary key
* Add rss for entriesJeremy2015-03-3112-61/+509
| | | | will fix #1000
* Add some testsJeremy2015-03-082-1/+46
|
* Handle forgot passwordJeremy2015-03-0811-5/+468
|