]> git.immae.eu Git - github/wallabag/wallabag.git/log
github/wallabag/wallabag.git
9 years agoMerge pull request #1323 from wallabag/v2-1302-checkbox
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

9 years agoMerge pull request #1312 from wallabag/v2-fix-1311
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

9 years agoadd translation 1323/head
Nicolas Lœuillet [Wed, 12 Aug 2015 11:21:07 +0000 (13:21 +0200)] 
add translation

9 years agoadd test 1312/head
Nicolas Lœuillet [Wed, 12 Aug 2015 11:18:39 +0000 (13:18 +0200)] 
add test

9 years agofix indentation
Nicolas Lœuillet [Wed, 12 Aug 2015 11:03:26 +0000 (13:03 +0200)] 
fix indentation

9 years agoMerge pull request #1322 from wallabag/v2-fix-1303
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

9 years agoadd 'stay connected' checkbox
Nicolas Lœuillet [Wed, 12 Aug 2015 10:27:12 +0000 (12:27 +0200)] 
add 'stay connected' checkbox

9 years agofix #1303, add link to homepage on forgot password page 1322/head
Nicolas Lœuillet [Wed, 12 Aug 2015 10:16:50 +0000 (12:16 +0200)] 
fix #1303, add link to homepage on forgot password page

9 years agoMerge pull request #1319 from wallabag/v2-form-header
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

9 years agoadd new post form in material header 1319/head
Nicolas Lœuillet [Wed, 12 Aug 2015 06:22:30 +0000 (08:22 +0200)] 
add new post form in material header

9 years agoMerge pull request #1297 from wallabag/v2-estimated-time
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)

9 years agostore estimated reading time / filters on reading time 1297/head
Nicolas Lœuillet [Fri, 7 Aug 2015 20:20:30 +0000 (22:20 +0200)] 
store estimated reading time / filters on reading time

9 years agoMerge pull request #1317 from wallabag/v2-fix-typo
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

9 years agofix link in howto page 1317/head
Nicolas Lœuillet [Tue, 11 Aug 2015 18:08:02 +0000 (20:08 +0200)] 
fix link in howto page

9 years agoMerge pull request #1316 from wallabag/v2-focus-searchform
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

9 years agoadd focus to search form 1316/head
Nicolas Lœuillet [Tue, 11 Aug 2015 16:07:02 +0000 (18:07 +0200)] 
add focus to search form

9 years agofix #1311, redirect after login
Nicolas Lœuillet [Mon, 10 Aug 2015 20:37:56 +0000 (22:37 +0200)] 
fix #1311, redirect after login

9 years agoMerge pull request #1298 from modos189/v2_fix_material
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

9 years agoMerge remote-tracking branch 'origin/v2' into v2_fix_material 1298/head
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

9 years agoMerge pull request #1295 from wallabag/v2-howto
Jeremy Benoist [Mon, 10 Aug 2015 12:15:11 +0000 (14:15 +0200)] 
Merge pull request #1295 from wallabag/v2-howto

add howto page

9 years agoremove useless line 1295/head
Nicolas Lœuillet [Mon, 10 Aug 2015 12:13:23 +0000 (14:13 +0200)] 
remove useless line

9 years agoMerge remote-tracking branch 'origin/v2' into v2_fix_material
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

9 years agoadd tests for static pages
Nicolas Lœuillet [Mon, 10 Aug 2015 06:19:40 +0000 (08:19 +0200)] 
add tests for static pages

9 years agoMerge pull request #1292 from wallabag/v2-tags-route
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

9 years agoMerge pull request #1304 from wallabag/v2-rename-starred-menu
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

9 years agorename favorite in starred 1304/head
Nicolas Lœuillet [Sun, 9 Aug 2015 18:31:53 +0000 (20:31 +0200)] 
rename favorite in starred

9 years agoMerge pull request #1296 from wallabag/v2-fix-564
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

9 years agoPreparation for adding links
Alexandr Danilov [Fri, 7 Aug 2015 22:30:52 +0000 (01:30 +0300)] 
Preparation for adding links

9 years agofix #1281
Alexandr Danilov [Fri, 7 Aug 2015 21:16:14 +0000 (00:16 +0300)] 
fix #1281

9 years agofix #1281 (notifications when we star articles are buggy)
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

9 years agofix #1281 (When I save 10 articles, I've got 4 lines: 3 articles on 1st line, 3 on...
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))

9 years agoTitle in navigation bar
Alexandr Danilov [Fri, 7 Aug 2015 20:59:11 +0000 (23:59 +0300)] 
Title in navigation bar

9 years agofix #1282
Alexandr Danilov [Fri, 7 Aug 2015 20:29:21 +0000 (23:29 +0300)] 
fix #1282

9 years agofix #564: replace Untitled by the domain name 1296/head
Nicolas Lœuillet [Fri, 7 Aug 2015 19:57:53 +0000 (21:57 +0200)] 
fix #564: replace Untitled by the domain name

9 years agoadd howto page
Nicolas Lœuillet [Fri, 7 Aug 2015 19:22:43 +0000 (21:22 +0200)] 
add howto page

9 years agoMerge pull request #1294 from wallabag/v2-fix-1282
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

9 years agofix #1282: add title on wallabag logo 1294/head
Nicolas Lœuillet [Fri, 7 Aug 2015 18:47:19 +0000 (20:47 +0200)] 
fix #1282: add title on wallabag logo

9 years agounit test 1292/head
Nicolas Lœuillet [Fri, 7 Aug 2015 18:29:03 +0000 (20:29 +0200)] 
unit test

9 years agoMerge pull request #1293 from wallabag/v2-items-per-page
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

9 years agofix display
Nicolas Lœuillet [Fri, 7 Aug 2015 18:07:39 +0000 (20:07 +0200)] 
fix display

9 years agoAdd tags list display
Nicolas Lœuillet [Fri, 7 Aug 2015 16:17:23 +0000 (18:17 +0200)] 
Add tags list display

9 years agoget itemsPerPage for unread/fav/archive views 1293/head
Nicolas Lœuillet [Fri, 7 Aug 2015 16:04:46 +0000 (18:04 +0200)] 
get itemsPerPage for unread/fav/archive views

9 years agoMerge pull request #1286 from wallabag/v2-issue-1283
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

9 years agoMany corrections material theme
Alexandr Danilov [Thu, 6 Aug 2015 01:22:45 +0000 (04:22 +0300)] 
Many corrections material theme

9 years agochange order of condition 1286/head
Nicolas Lœuillet [Wed, 5 Aug 2015 19:16:48 +0000 (21:16 +0200)] 
change order of condition

9 years agofix #1283: display the good title for each category
Nicolas Lœuillet [Wed, 5 Aug 2015 19:10:20 +0000 (21:10 +0200)] 
fix #1283: display the good title for each category

9 years agoMerge pull request #1279 from wallabag/material-default
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/

9 years agoset material to default theme \o/ 1279/head
Nicolas Lœuillet [Tue, 4 Aug 2015 20:51:21 +0000 (22:51 +0200)] 
set material to default theme \o/

9 years agoMerge pull request #1276 from modos189/v2
Nicolas Lœuillet [Tue, 4 Aug 2015 20:42:33 +0000 (22:42 +0200)] 
Merge pull request #1276 from modos189/v2

Added Material theme

9 years agoFixes and improve css @media 1276/head
Alexandr Danilov [Tue, 4 Aug 2015 16:39:26 +0000 (19:39 +0300)] 
Fixes and improve css @media

9 years agoAdded Material theme
Alexandr Danilov [Tue, 4 Aug 2015 14:18:15 +0000 (17:18 +0300)] 
Added Material theme

9 years agoMerge pull request #1250 from frankoa/v2_pagination_and_api
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.

9 years agoAdds pagerfanta paginator everywhere, modifies article routing. Change API for is_sta... 1250/head
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

9 years agoMerge branch 'v2-edit-title' into v2
Nicolas Lœuillet [Mon, 8 Jun 2015 14:35:41 +0000 (16:35 +0200)] 
Merge branch 'v2-edit-title' into v2

9 years agoMerge branch 'v2' into v2-edit-title
Nicolas Lœuillet [Mon, 8 Jun 2015 14:35:02 +0000 (16:35 +0200)] 
Merge branch 'v2' into v2-edit-title

9 years agoMerge pull request #1206 from wallabag/sf-2.7
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

9 years agoAdd basic title edition 1208/head
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.

9 years agoUpdate to Symfony 2.7 1206/head
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

9 years agoRemove phinx
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`

9 years agoUpdate deps
Jeremy Benoist [Mon, 1 Jun 2015 15:39:05 +0000 (17:39 +0200)] 
Update deps

9 years agoMerge pull request #1167 from wallabag/v2-api-bundle
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

9 years agoCS 1167/head
Jeremy Benoist [Sat, 30 May 2015 11:52:26 +0000 (13:52 +0200)] 
CS

9 years agoUpdate deps
Jeremy Benoist [Sat, 30 May 2015 11:42:38 +0000 (13:42 +0200)] 
Update deps

9 years agoUpdate naming strategy since Doctrine 2.5
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

9 years agoDisable coverage
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.

9 years agoMerge pull request #1180 from wallabag/v2patch
Jeremy Benoist [Wed, 15 Apr 2015 15:29:28 +0000 (17:29 +0200)] 
Merge pull request #1180 from wallabag/v2patch

Add some required

9 years agoname not required 1180/head
Thomas Citharel [Wed, 15 Apr 2015 15:19:37 +0000 (17:19 +0200)] 
name not required

9 years agochanged email fields with the email type and added required parameter on some stuff
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

9 years agoEnable debug on phpunit
Jeremy Benoist [Sat, 4 Apr 2015 19:55:06 +0000 (21:55 +0200)] 
Enable debug on phpunit

9 years agoAdd Travis & Scrutinizer badges
Jeremy [Thu, 2 Apr 2015 09:45:53 +0000 (11:45 +0200)] 
Add Travis & Scrutinizer badges

9 years agoAvoid / in feed token
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

9 years agoFix tests
Jeremy [Wed, 1 Apr 2015 19:53:57 +0000 (21:53 +0200)] 
Fix tests

9 years agoMove API stuff in ApiBundle
Jeremy [Sun, 29 Mar 2015 08:53:10 +0000 (10:53 +0200)] 
Move API stuff in ApiBundle

9 years agoMerge pull request #1164 from wallabag/v2-remove-username-in-config
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

9 years agoMerge pull request #1165 from wallabag/v2-prefix-db
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

9 years agoAnd phpunit with html coverage to ant 1165/head
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

9 years agoAbility to prefix tables
Jeremy [Sat, 28 Mar 2015 10:29:19 +0000 (11:29 +0100)] 
Ability to prefix tables

Will fix #799

9 years agoRemove ability to change username 1164/head
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

9 years agoMerge pull request #1166 from wallabag/v2-rss
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

9 years agoForce raw on content 1166/head
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

9 years agoAvoid timeout on code coverage from Scrutinizer
Jeremy [Sat, 28 Mar 2015 21:31:32 +0000 (22:31 +0100)] 
Avoid timeout on code coverage from Scrutinizer

9 years agoUse lemonde instead of mailjet
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

9 years agoUpdate InstallCommand test
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`

9 years agoAdd tests
Jeremy [Sat, 28 Mar 2015 20:43:49 +0000 (21:43 +0100)] 
Add tests

and fix few mistakes

9 years agoSort by id is faster
Jeremy [Sat, 28 Mar 2015 13:28:24 +0000 (14:28 +0100)] 
Sort by id is faster

Since it's the primary key

9 years agoAdd rss for entries
Jeremy [Sat, 28 Mar 2015 13:27:45 +0000 (14:27 +0100)] 
Add rss for entries

will fix #1000

9 years agoMerge pull request #1152 from wallabag/v2-forgot-password
Nicolas Lœuillet [Mon, 30 Mar 2015 15:05:37 +0000 (17:05 +0200)] 
Merge pull request #1152 from wallabag/v2-forgot-password

Handle forgot password

9 years agoMerge pull request #1163 from wallabag/v2-speed-up-tests
Nicolas Lœuillet [Sat, 28 Mar 2015 09:46:33 +0000 (10:46 +0100)] 
Merge pull request #1163 from wallabag/v2-speed-up-tests

Speed up tests

9 years agoRewrite travis & add scrutinizer 1163/head
Jeremy [Fri, 27 Mar 2015 23:23:25 +0000 (00:23 +0100)] 
Rewrite travis & add scrutinizer

9 years agoEnable hhvm & nightly for curiosity
Jeremy [Fri, 27 Mar 2015 18:58:48 +0000 (19:58 +0100)] 
Enable hhvm & nightly for curiosity

9 years agoSwitch to Docker-based infrastructure
Jeremy [Fri, 27 Mar 2015 18:47:30 +0000 (19:47 +0100)] 
Switch to Docker-based infrastructure

9 years agoUse doctrine cache for tests
Jeremy [Fri, 27 Mar 2015 18:46:36 +0000 (19:46 +0100)] 
Use doctrine cache for tests

9 years agoAdd some tests 1152/head
Jeremy [Sun, 8 Mar 2015 21:47:32 +0000 (22:47 +0100)] 
Add some tests

9 years agoHandle forgot password
Jeremy [Sat, 7 Mar 2015 22:25:36 +0000 (23:25 +0100)] 
Handle forgot password

9 years agoMerge pull request #1110 from wallabag/v2-api-hypermedia
Nicolas Lœuillet [Fri, 6 Mar 2015 20:48:33 +0000 (21:48 +0100)] 
Merge pull request #1110 from wallabag/v2-api-hypermedia

[WIP] API : hypermedia & tags

9 years agoUse pager in getEntries() and return Hateoas collection 1110/head
William Durand [Fri, 6 Mar 2015 10:07:39 +0000 (11:07 +0100)] 
Use pager in getEntries() and return Hateoas collection

9 years agoReturn pager into EntryRepository (for entries only)
William Durand [Fri, 6 Mar 2015 10:07:22 +0000 (11:07 +0100)] 
Return pager into EntryRepository (for entries only)

9 years agoAdd Pagerfanta
William Durand [Fri, 6 Mar 2015 10:06:46 +0000 (11:06 +0100)] 
Add Pagerfanta

9 years agoadd getUser on Tag entity
Nicolas Lœuillet [Thu, 5 Mar 2015 18:41:23 +0000 (19:41 +0100)] 
add getUser on Tag entity

9 years agoadd more log on AccessDeniedException
Nicolas Lœuillet [Thu, 5 Mar 2015 18:34:30 +0000 (19:34 +0100)] 
add more log on AccessDeniedException