aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * Update depsJeremy Benoist2015-09-102-96/+160
| |
| * Update url from grabyJeremy Benoist2015-08-242-1/+2
| |
| * CSJeremy Benoist2015-08-244-114/+409
| |
| * Integrate grabyJeremy Benoist2015-08-2410-181/+59
| |
* | Merge pull request #1403 from wallabag/v2-material-full-size-domain-filterJeremy Benoist2015-08-261-1/+1
|\ \ | | | | | | Use full size of the panel for domain-filtering
| * | typoThomas Citharel2015-08-261-1/+1
| | |
| * | Use full size of the panel for domain-filteringThomas Citharel2015-08-261-1/+1
|/ / | | | | For longer domains
* | Merge pull request #1400 from wallabag/v2-fix-1357Jeremy Benoist2015-08-253-5/+10
|\ \ | |/ |/| fix #1357, truncate domain name if it's too loooong
| * fix #1357, truncate domain name if it's too loooongNicolas Lœuillet2015-08-243-5/+10
|/
* Merge pull request #1395 from wallabag/v2-fix-1378Jeremy Benoist2015-08-244-5/+48
|\ | | | | fix #1378: nice display for tags list
| * fix #1378: nice display for tags listNicolas Lœuillet2015-08-244-5/+48
| |
* | Merge pull request #1396 from wallabag/j0k3r-patch-1Nicolas Lœuillet2015-08-241-1/+2
|\ \ | |/ |/| Apply margin only on settings page
| * Apply margin only on settings pageJeremy Benoist2015-08-241-1/+2
|/
* Merge pull request #1392 from wallabag/v2-fix-redirectNicolas Lœuillet2015-08-241-5/+4
|\ | | | | Fix redirect after deletion
| * Fix redirect after deletionJeremy Benoist2015-08-221-5/+4
| | | | | | | | Fix #1391
* | Merge pull request #1393 from wallabag/fix-filter-same-dayNicolas Lœuillet2015-08-244-2/+51
|\ \ | | | | | | Fix date filter on same day
| * | Add test for same day filterJeremy Benoist2015-08-232-5/+14
| | |
| * | Fix date filter on same dayJeremy Benoist2015-08-223-2/+42
| | | | | | | | | | | | Fix #1379
* | | Merge pull request #1384 from wallabag/v2-fix-config-displayNicolas Lœuillet2015-08-232-14/+21
|\ \ \ | |/ / |/| | fix #1371 config screen: display bug in RSS tab
| * | Fix display issue in config rss tabJeremy Benoist2015-08-222-14/+21
| | |
* | | Merge pull request #1372 from wallabag/v2-assign-tagsJeremy Benoist2015-08-229-2/+186
|\ \ \ | |_|/ |/| | assign tags to an entry
| * | assign tags to an entryNicolas Lœuillet2015-08-229-2/+186
| | |
* | | Merge pull request #1390 from wallabag/coderatingJeremy Benoist2015-08-211-0/+4
|\ \ \ | | | | | | | | Enable code rating on Scrutinizer
| * | | Enable code rating on ScrutinizerJeremy Benoist2015-08-211-0/+4
|/ / /
* | | Merge pull request #1385 from wallabag/v2-status-filterJeremy Benoist2015-08-219-6/+88
|\ \ \ | | | | | | | | filters: implement status filter and a new view (to display all entries)
| * | | restore composer.lockNicolas Lœuillet2015-08-211-11/+11
| | | |
| * | | filters: adapt queryBuilder for 'all' viewNicolas Lœuillet2015-08-212-28/+19
| | | |
| * | | filters: add test for status filter and adapt other tests resultsNicolas Lœuillet2015-08-212-2/+31
| | | |
| * | | filters: implement status filter and a new view (to display all entries)Nicolas Lœuillet2015-08-217-15/+77
| |/ /
* | | Merge pull request #1389 from wallabag/v2-fix-duplicateJeremy Benoist2015-08-211-23/+0
|\ \ \ | |/ / |/| | remove dead code
| * | remove dead codeNicolas Lœuillet2015-08-211-23/+0
|/ /
* | Merge pull request #1386 from wallabag/v2-refactorNicolas Lœuillet2015-08-2016-290/+182
|\ \ | |/ |/| WIP – Fixing things around :dash:
| * CSJeremy Benoist2015-08-203-2/+3
| |
| * Add test on getting starred entries using the APIJeremy Benoist2015-08-201-0/+25
| |
| * Add title in "picto-link"Jeremy Benoist2015-08-201-3/+3
| | | | | | | | Picto aren't always obvious for every one. So it's better to have some title when we move the mouse over.
| * Update baggy about pageJeremy Benoist2015-08-201-20/+18
| | | | | | | | According to what have been done on the material theme
| * Fixed my name & website :ok_hand:Jeremy Benoist2015-08-202-1/+2
| |
| * Remove unsed thingsJeremy Benoist2015-08-206-157/+15
| |
| * Refactorize the way to retrieve entriesJeremy Benoist2015-08-203-108/+117
|/ | | | | One place to retrieve entries in Entry & Rss controller. More simple and easy to maintain.
* Merge pull request #1383 from wallabag/csNicolas Lœuillet2015-08-2022-74/+73
|\ | | | | CS
| * CSJeremy Benoist2015-08-2022-74/+73
|/ | | | We shouldn't forget to run `php-cs-fixer` time to time
* Merge pull request #1369 from wallabag/v2-bottombarJeremy Benoist2015-08-194-0/+24
|\ | | | | fix #1332: bottom bar to display message
| * warning bar: add parameter to dis/enable itNicolas Lœuillet2015-08-194-3/+12
| |
| * bottom bar to display messageNicolas Lœuillet2015-08-192-0/+15
| |