]>
git.immae.eu Git - github/wallabag/wallabag.git/log
Alexandr Danilov [Wed, 12 Aug 2015 20:52:40 +0000 (23:52 +0300)]
Fix form rendere
Alexandr Danilov [Wed, 12 Aug 2015 20:02:19 +0000 (23:02 +0300)]
Merge remote-tracking branch 'origin/v2' into v2_material
Jeremy Benoist [Wed, 12 Aug 2015 19:58:46 +0000 (21:58 +0200)]
Merge pull request #1331 from wallabag/v2-disable-download
disable download links on entry view
Alexandr Danilov [Wed, 12 Aug 2015 19:55:44 +0000 (22:55 +0300)]
#1320 Design for filters
Nicolas Lœuillet [Wed, 12 Aug 2015 18:40:17 +0000 (20:40 +0200)]
disable download links on entry view
Jeremy Benoist [Wed, 12 Aug 2015 19:45:21 +0000 (21:45 +0200)]
Merge pull request #1334 from wallabag/v2-store-domainname
store domainName in database
Nicolas Lœuillet [Wed, 12 Aug 2015 19:16:00 +0000 (21:16 +0200)]
store domainName in database
Alexandr Danilov [Wed, 12 Aug 2015 17:27:30 +0000 (20:27 +0300)]
improved view
Alexandr Danilov [Wed, 12 Aug 2015 16:18:31 +0000 (19:18 +0300)]
fix #1321
Jeremy Benoist [Wed, 12 Aug 2015 12:12:08 +0000 (14:12 +0200)]
Merge pull request #1328 from wallabag/v2-fix-1324
fix #1324: do not display pagination when only 1 page
Nicolas Lœuillet [Wed, 12 Aug 2015 12:06:56 +0000 (14:06 +0200)]
remove pagination if page == 1 with baggy theme
Nicolas Lœuillet [Wed, 12 Aug 2015 12:05:53 +0000 (14:05 +0200)]
fix #1324: do not display pagination when only 1 page
Jeremy Benoist [Wed, 12 Aug 2015 11:42:32 +0000 (13:42 +0200)]
Merge pull request #1326 from wallabag/v2-fix-1299
fix #1299: change send buttons on config page
Nicolas Lœuillet [Wed, 12 Aug 2015 11:35:48 +0000 (13:35 +0200)]
fix #1299: change send buttons on config page
Jeremy Benoist [Wed, 12 Aug 2015 11:31:34 +0000 (13:31 +0200)]
Merge pull request #1325 from wallabag/v2-fix-1314
fix #1314: change max-width in material theme
Nicolas Lœuillet [Wed, 12 Aug 2015 11:26:49 +0000 (13:26 +0200)]
fix #1314: change max-width in material theme
Jeremy Benoist [Wed, 12 Aug 2015 11:23:52 +0000 (13:23 +0200)]
Merge pull request #1323 from wallabag/v2-1302-checkbox
fix #1302: add 'stay connected' checkbox
Jeremy Benoist [Wed, 12 Aug 2015 11:21:16 +0000 (13:21 +0200)]
Merge pull request #1312 from wallabag/v2-fix-1311
fix #1311, redirect after login
Nicolas Lœuillet [Wed, 12 Aug 2015 11:21:07 +0000 (13:21 +0200)]
add translation
Nicolas Lœuillet [Wed, 12 Aug 2015 11:18:39 +0000 (13:18 +0200)]
add test
Nicolas Lœuillet [Wed, 12 Aug 2015 11:03:26 +0000 (13:03 +0200)]
fix indentation
Jeremy Benoist [Wed, 12 Aug 2015 10:43:02 +0000 (12:43 +0200)]
Merge pull request #1322 from wallabag/v2-fix-1303
fix #1303, add link to homepage on forgot password page
Nicolas Lœuillet [Wed, 12 Aug 2015 10:27:12 +0000 (12:27 +0200)]
add 'stay connected' checkbox
Nicolas Lœuillet [Wed, 12 Aug 2015 10:16:50 +0000 (12:16 +0200)]
fix #1303, add link to homepage on forgot password page
Jeremy Benoist [Wed, 12 Aug 2015 08:14:44 +0000 (10:14 +0200)]
Merge pull request #1319 from wallabag/v2-form-header
add new post form in material header
Nicolas Lœuillet [Wed, 12 Aug 2015 06:22:30 +0000 (08:22 +0200)]
add new post form in material header
Jeremy Benoist [Wed, 12 Aug 2015 07:05:21 +0000 (09:05 +0200)]
Merge pull request #1297 from wallabag/v2-estimated-time
store estimated reading time in database (#393)
Nicolas Lœuillet [Fri, 7 Aug 2015 20:20:30 +0000 (22:20 +0200)]
store estimated reading time / filters on reading time
Jeremy Benoist [Tue, 11 Aug 2015 19:26:31 +0000 (21:26 +0200)]
Merge pull request #1317 from wallabag/v2-fix-typo
fix link in howto page
Nicolas Lœuillet [Tue, 11 Aug 2015 18:08:02 +0000 (20:08 +0200)]
fix link in howto page
Thomas Citharel [Tue, 11 Aug 2015 18:00:30 +0000 (20:00 +0200)]
Merge pull request #1316 from wallabag/v2-focus-searchform
fix #1310 add focus to search form
Nicolas Lœuillet [Tue, 11 Aug 2015 16:07:02 +0000 (18:07 +0200)]
add focus to search form
Nicolas Lœuillet [Mon, 10 Aug 2015 20:37:56 +0000 (22:37 +0200)]
fix #1311, redirect after login
Nicolas Lœuillet [Mon, 10 Aug 2015 17:35:23 +0000 (19:35 +0200)]
Merge pull request #1298 from modos189/v2_fix_material
fix material
Alexandr Danilov [Mon, 10 Aug 2015 12:25:23 +0000 (15:25 +0300)]
Merge remote-tracking branch 'origin/v2' into v2_fix_material
# Conflicts:
# src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
Jeremy Benoist [Mon, 10 Aug 2015 12:15:11 +0000 (14:15 +0200)]
Merge pull request #1295 from wallabag/v2-howto
add howto page
Nicolas Lœuillet [Mon, 10 Aug 2015 12:13:23 +0000 (14:13 +0200)]
remove useless line
Alexandr Danilov [Mon, 10 Aug 2015 09:27:12 +0000 (12:27 +0300)]
Merge remote-tracking branch 'origin/v2' into v2_fix_material
# Conflicts:
# src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
Nicolas Lœuillet [Mon, 10 Aug 2015 06:19:40 +0000 (08:19 +0200)]
add tests for static pages
Jeremy Benoist [Sun, 9 Aug 2015 20:47:28 +0000 (22:47 +0200)]
Merge pull request #1292 from wallabag/v2-tags-route
Add tags list display
Thomas Citharel [Sun, 9 Aug 2015 18:47:13 +0000 (20:47 +0200)]
Merge pull request #1304 from wallabag/v2-rename-starred-menu
rename favorite in starred
Nicolas Lœuillet [Sun, 9 Aug 2015 18:31:53 +0000 (20:31 +0200)]
rename favorite in starred
Thomas Citharel [Sat, 8 Aug 2015 18:58:03 +0000 (20:58 +0200)]
Merge pull request #1296 from wallabag/v2-fix-564
fix #564: replace Untitled by the domain name
Alexandr Danilov [Fri, 7 Aug 2015 22:30:52 +0000 (01:30 +0300)]
Preparation for adding links
Alexandr Danilov [Fri, 7 Aug 2015 21:16:14 +0000 (00:16 +0300)]
fix #1281
Alexandr Danilov [Fri, 7 Aug 2015 21:08:29 +0000 (00:08 +0300)]
fix #1281 (notifications when we star articles are buggy)
All notification corrected
Alexandr Danilov [Fri, 7 Aug 2015 21:00:11 +0000 (00:00 +0300)]
fix #1281 (When I save 10 articles, I've got 4 lines: 3 articles on 1st line, 3 on 2nd one, only 1 on 3rd line and 3 on last lines (chrome and firefox))
Alexandr Danilov [Fri, 7 Aug 2015 20:59:11 +0000 (23:59 +0300)]
Title in navigation bar
Alexandr Danilov [Fri, 7 Aug 2015 20:29:21 +0000 (23:29 +0300)]
fix #1282
Nicolas Lœuillet [Fri, 7 Aug 2015 19:57:53 +0000 (21:57 +0200)]
fix #564: replace Untitled by the domain name
Nicolas Lœuillet [Fri, 7 Aug 2015 19:22:43 +0000 (21:22 +0200)]
add howto page
Jeremy Benoist [Fri, 7 Aug 2015 18:56:45 +0000 (20:56 +0200)]
Merge pull request #1294 from wallabag/v2-fix-1282
fix #1282: add title on wallabag logo
Nicolas Lœuillet [Fri, 7 Aug 2015 18:47:19 +0000 (20:47 +0200)]
fix #1282: add title on wallabag logo
Nicolas Lœuillet [Fri, 7 Aug 2015 18:29:03 +0000 (20:29 +0200)]
unit test
Jeremy Benoist [Fri, 7 Aug 2015 18:10:07 +0000 (20:10 +0200)]
Merge pull request #1293 from wallabag/v2-items-per-page
get itemsPerPage for unread/fav/archive views
Nicolas Lœuillet [Fri, 7 Aug 2015 18:07:39 +0000 (20:07 +0200)]
fix display
Nicolas Lœuillet [Fri, 7 Aug 2015 16:17:23 +0000 (18:17 +0200)]
Add tags list display
Nicolas Lœuillet [Fri, 7 Aug 2015 16:04:46 +0000 (18:04 +0200)]
get itemsPerPage for unread/fav/archive views
Danilow Alexandr [Thu, 6 Aug 2015 01:38:04 +0000 (04:38 +0300)]
Merge pull request #1286 from wallabag/v2-issue-1283
fix #1283: display the good title for each category
Alexandr Danilov [Thu, 6 Aug 2015 01:22:45 +0000 (04:22 +0300)]
Many corrections material theme
Nicolas Lœuillet [Wed, 5 Aug 2015 19:16:48 +0000 (21:16 +0200)]
change order of condition
Nicolas Lœuillet [Wed, 5 Aug 2015 19:10:20 +0000 (21:10 +0200)]
fix #1283: display the good title for each category
Jeremy Benoist [Tue, 4 Aug 2015 21:13:15 +0000 (23:13 +0200)]
Merge pull request #1279 from wallabag/material-default
set material to default theme \o/
Nicolas Lœuillet [Tue, 4 Aug 2015 20:51:21 +0000 (22:51 +0200)]
set material to default theme \o/
Nicolas Lœuillet [Tue, 4 Aug 2015 20:42:33 +0000 (22:42 +0200)]
Merge pull request #1276 from modos189/v2
Added Material theme
Alexandr Danilov [Tue, 4 Aug 2015 16:39:26 +0000 (19:39 +0300)]
Fixes and improve css @media
Alexandr Danilov [Tue, 4 Aug 2015 14:18:15 +0000 (17:18 +0300)]
Added Material theme
Jeremy Benoist [Wed, 29 Jul 2015 07:02:30 +0000 (09:02 +0200)]
Merge pull request #1250 from frankoa/v2_pagination_and_api
Adds pagerfanta paginator everywhere, modifies article routing.
Francois Gravelaine [Mon, 27 Jul 2015 21:20:32 +0000 (23:20 +0200)]
Adds pagerfanta paginator everywhere, modifies article routing. Change API for is_starred and is_archived
Nicolas Lœuillet [Mon, 8 Jun 2015 14:35:41 +0000 (16:35 +0200)]
Merge branch 'v2-edit-title' into v2
Nicolas Lœuillet [Mon, 8 Jun 2015 14:35:02 +0000 (16:35 +0200)]
Merge branch 'v2' into v2-edit-title
Nicolas Lœuillet [Wed, 3 Jun 2015 19:24:11 +0000 (21:24 +0200)]
Merge pull request #1206 from wallabag/sf-2.7
Upgrade to Symfony 2.7
Jeremy Benoist [Tue, 2 Jun 2015 16:54:34 +0000 (18:54 +0200)]
Add basic title edition
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.
Jeremy Benoist [Tue, 2 Jun 2015 14:58:19 +0000 (16:58 +0200)]
Update to Symfony 2.7
And fix some deps instead of using dev tags
Jeremy Benoist [Tue, 2 Jun 2015 14:54:52 +0000 (16:54 +0200)]
Remove phinx
Doctrine handle quite correctly database migration. Thanks to `doctrine:schema:update`
Jeremy Benoist [Mon, 1 Jun 2015 15:39:05 +0000 (17:39 +0200)]
Update deps
Nicolas Lœuillet [Mon, 1 Jun 2015 13:49:49 +0000 (15:49 +0200)]
Merge pull request #1167 from wallabag/v2-api-bundle
Move API stuff in ApiBundle
Jeremy Benoist [Sat, 30 May 2015 11:52:26 +0000 (13:52 +0200)]
CS
Jeremy Benoist [Sat, 30 May 2015 11:42:38 +0000 (13:42 +0200)]
Update deps
Jeremy Benoist [Sat, 30 May 2015 11:40:39 +0000 (13:40 +0200)]
Update naming strategy since Doctrine 2.5
See https://github.com/doctrine/doctrine2/commit/
20fb8270dc3c84eceaf90979644fdfbe0b2e615e
Jeremy Benoist [Sat, 30 May 2015 11:31:54 +0000 (13:31 +0200)]
Disable coverage
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.
Jeremy Benoist [Wed, 15 Apr 2015 15:29:28 +0000 (17:29 +0200)]
Merge pull request #1180 from wallabag/v2patch
Add some required
Thomas Citharel [Wed, 15 Apr 2015 15:19:37 +0000 (17:19 +0200)]
name not required
Thomas Citharel [Wed, 15 Apr 2015 14:50:20 +0000 (16:50 +0200)]
changed email fields with the email type and added required parameter on some stuff
Jeremy Benoist [Sat, 4 Apr 2015 19:55:06 +0000 (21:55 +0200)]
Enable debug on phpunit
Jeremy [Thu, 2 Apr 2015 09:45:53 +0000 (11:45 +0200)]
Add Travis & Scrutinizer badges
Jeremy [Wed, 1 Apr 2015 19:54:22 +0000 (21:54 +0200)]
Avoid / in feed token
Of course, it breaks the url and the route matcher for each feed route
Jeremy [Wed, 1 Apr 2015 19:53:57 +0000 (21:53 +0200)]
Fix tests
Jeremy [Sun, 29 Mar 2015 08:53:10 +0000 (10:53 +0200)]
Move API stuff in ApiBundle
Nicolas Lœuillet [Wed, 1 Apr 2015 19:58:08 +0000 (21:58 +0200)]
Merge pull request #1164 from wallabag/v2-remove-username-in-config
Remove ability to change username
Nicolas Lœuillet [Wed, 1 Apr 2015 19:53:48 +0000 (21:53 +0200)]
Merge pull request #1165 from wallabag/v2-prefix-db
Prefix table
Jeremy [Sat, 28 Mar 2015 11:01:48 +0000 (12:01 +0100)]
And phpunit with html coverage to ant
Launching `ant phpunit` will now generate HTML Coverage
Jeremy [Sat, 28 Mar 2015 10:29:19 +0000 (11:29 +0100)]
Ability to prefix tables
Will fix #799
Jeremy [Fri, 27 Mar 2015 23:10:39 +0000 (00:10 +0100)]
Remove ability to change username
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
Nicolas Lœuillet [Wed, 1 Apr 2015 19:08:56 +0000 (21:08 +0200)]
Merge pull request #1166 from wallabag/v2-rss
Add RSS feeds
Jeremy [Wed, 1 Apr 2015 14:11:19 +0000 (16:11 +0200)]
Force raw on content
We don't want Symfony to escape html content
Jeremy [Sat, 28 Mar 2015 21:31:32 +0000 (22:31 +0100)]
Avoid timeout on code coverage from Scrutinizer
Jeremy [Sat, 28 Mar 2015 21:15:24 +0000 (22:15 +0100)]
Use lemonde instead of mailjet
Mailjet seems to be laggy, hope that LeMonde will be more reliable in the future.
@see https://travis-ci.org/wallabag/wallabag/jobs/
56246231
Jeremy [Sat, 28 Mar 2015 20:45:35 +0000 (21:45 +0100)]
Update InstallCommand test
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`
Jeremy [Sat, 28 Mar 2015 20:43:49 +0000 (21:43 +0100)]
Add tests
and fix few mistakes