1568 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jeremy Benoist	dc1c2debfb	Apply margin only on settings page	2015-08-24 12:03:00 +02:00
Nicolas Lœuillet	7083d183b9	Merge pull request #1392 from wallabag/v2-fix-redirect ... Fix redirect after deletion	2015-08-24 10:44:14 +02:00
Nicolas Lœuillet	8bb1f3d69a	Merge pull request #1393 from wallabag/fix-filter-same-day ... Fix date filter on same day	2015-08-24 10:39:24 +02:00
Jeremy Benoist	f90af145ca	Add test for same day filter	2015-08-23 22:06:27 +02:00
Nicolas Lœuillet	bccb5bba75	Merge pull request #1384 from wallabag/v2-fix-config-display ... fix #1371 config screen: display bug in RSS tab	2015-08-23 13:17:21 +02:00
Jeremy Benoist	7d6c3edcdd	Fix date filter on same day ... Fix #1379	2015-08-22 15:36:07 +02:00
Jeremy Benoist	ec00964de2	Merge pull request #1372 from wallabag/v2-assign-tags ... assign tags to an entry	2015-08-22 12:56:42 +02:00
Nicolas Lœuillet	7244d6cb61	assign tags to an entry	2015-08-22 12:40:48 +02:00
Jeremy Benoist	83aaf84195	Fix display issue in config rss tab	2015-08-22 12:30:06 +02:00
Jeremy Benoist	16a3d04cbd	Fix redirect after deletion ... Fix #1391	2015-08-22 12:09:27 +02:00
Jeremy Benoist	f9d5155abf	Merge pull request #1390 from wallabag/coderating ... Enable code rating on Scrutinizer	2015-08-21 18:11:52 +02:00
Jeremy Benoist	b45c188516	Enable code rating on Scrutinizer	2015-08-21 18:00:02 +02:00
Jeremy Benoist	f506da40e2	Merge pull request #1385 from wallabag/v2-status-filter ... filters: implement status filter and a new view (to display all entries)	2015-08-21 17:49:20 +02:00
Nicolas Lœuillet	3b84dc08fc	restore composer.lock	2015-08-21 11:02:22 +02:00
Jeremy Benoist	78f66dcc52	Merge pull request #1389 from wallabag/v2-fix-duplicate ... remove dead code	2015-08-21 11:00:49 +02:00
Nicolas Lœuillet	c937de3443	remove dead code	2015-08-21 08:36:57 +02:00
Nicolas Lœuillet	2b7a488917	filters: adapt queryBuilder for 'all' view	2015-08-21 07:38:18 +02:00
Nicolas Lœuillet	e177976099	filters: add test for status filter and adapt other tests results	2015-08-21 07:30:48 +02:00
Nicolas Lœuillet	89659c9eae	filters: implement status filter and a new view (to display all entries)	2015-08-21 07:30:48 +02:00
Nicolas Lœuillet	109d67dbb1	Merge pull request #1386 from wallabag/v2-refactor ... WIP – Fixing things around 💨	2015-08-20 21:51:02 +02:00
Jeremy Benoist	6682139ec5	CS	2015-08-20 20:39:52 +02:00
Jeremy Benoist	e6f55346fd	Add test on getting starred entries using the API	2015-08-20 20:39:26 +02:00
Jeremy Benoist	eccf5eb2e0	Add title in "picto-link" ... Picto aren't always obvious for every one. So it's better to have some title when we move the mouse over.	2015-08-20 20:39:26 +02:00
Jeremy Benoist	1dbcd63b59	Update baggy about page ... According to what have been done on the material theme	2015-08-20 20:39:26 +02:00
Jeremy Benoist	4793ee6509	Fixed my name & website 👌	2015-08-20 20:39:26 +02:00
Jeremy Benoist	6eebd8c909	Remove unsed things	2015-08-20 20:39:26 +02:00
Jeremy Benoist	0ab7404f93	Refactorize the way to retrieve entries ... One place to retrieve entries in Entry & Rss controller. More simple and easy to maintain.	2015-08-20 20:39:22 +02:00
Nicolas Lœuillet	4fcb7eaf13	Merge pull request #1383 from wallabag/cs ... CS	2015-08-20 08:22:39 +02:00
Jeremy Benoist	8ce32af612	CS ... We shouldn't forget to run `php-cs-fixer` time to time	2015-08-20 07:53:55 +02:00
Jeremy Benoist	34437f408c	Merge pull request #1369 from wallabag/v2-bottombar ... fix #1332: bottom bar to display message	2015-08-19 21:27:49 +02:00
Jeremy Benoist	ab4aeb8bd8	Merge pull request #1375 from wallabag/v2-fix-1371 ... fix #1368 config: redirect on correct tab in material theme	2015-08-19 21:26:29 +02:00
Nicolas Lœuillet	fdab81e910	warning bar: add parameter to dis/enable it	2015-08-19 16:00:15 +02:00
Jeremy Benoist	c3fdbcc60f	Merge pull request #1374 from wallabag/v2-fix-filters-display ... filters: enhance view for domain name	2015-08-19 15:32:38 +02:00
Nicolas Lœuillet	e62d27ff9b	bottom bar to display message	2015-08-19 15:14:08 +02:00
Nicolas Lœuillet	8b8cdabc89	config: redirect on correct tab in material theme	2015-08-19 15:10:11 +02:00
Nicolas Lœuillet	bdd23b076a	filters: enhance view for domain name	2015-08-19 14:55:39 +02:00
Jeremy Benoist	7b2d336893	Merge pull request #1342 from wallabag/v2-domain-filter ... fix #981: add filter on domain name	2015-08-19 14:33:46 +02:00
Nicolas Lœuillet	443cecd2d8	add filter on domain name	2015-08-19 14:27:00 +02:00
Jeremy Benoist	b71ebd9af9	Merge pull request #1366 from wallabag/fix-tags-view ... fix tag view in material theme	2015-08-19 12:02:24 +02:00
Jeremy Benoist	22ed64522a	Merge pull request #1365 from wallabag/v2-typo-pagination ... change </div> into </ul>	2015-08-19 11:21:31 +02:00
Jeremy Benoist	2e02b50409	Merge pull request #1367 from wallabag/v2-fix-actions-label ... action labels depend on status	2015-08-19 11:20:22 +02:00
Jeremy Benoist	a3b4e8a2c0	Merge pull request #1363 from wallabag/v2-add-date-filter-view ... add creation date filter view	2015-08-19 11:19:43 +02:00
Jeremy Benoist	d5e9a99ce6	Merge pull request #1370 from wallabag/v2-composer-cleanup ... fix 1356: diet for composer	2015-08-19 11:19:04 +02:00
Nicolas Lœuillet	68568bf0b7	diet for composer	2015-08-18 21:53:11 +02:00
Nicolas Lœuillet	02947111c0	change </div> into </ul>	2015-08-18 18:20:07 +02:00
Nicolas Lœuillet	e68d9179a1	fix tag view in material theme	2015-08-18 18:18:35 +02:00
Nicolas Lœuillet	c713273619	action labels depend on status	2015-08-18 18:13:30 +02:00
Nicolas Lœuillet	3f357ee241	add test	2015-08-18 16:33:32 +02:00
Jeremy Benoist	c3cb46809b	Merge pull request #1341 from wallabag/v2-capistrano ... capistrano config	2015-08-18 16:14:23 +02:00
Nicolas Lœuillet	72ea6dd1a7	add creation date filter view	2015-08-18 15:26:45 +02:00