]> git.immae.eu Git - github/wallabag/wallabag.git/log
github/wallabag/wallabag.git
8 years agochange </div> into </ul> 1365/head
Nicolas Lœuillet [Tue, 18 Aug 2015 16:20:07 +0000 (18:20 +0200)] 
change </div> into </ul>

8 years agoMerge pull request #1341 from wallabag/v2-capistrano
Jeremy Benoist [Tue, 18 Aug 2015 14:14:23 +0000 (16:14 +0200)] 
Merge pull request #1341 from wallabag/v2-capistrano

capistrano config

8 years agoMerge pull request #1353 from wallabag/v2-pluriel
Jeremy Benoist [Tue, 18 Aug 2015 12:29:10 +0000 (14:29 +0200)] 
Merge pull request #1353 from wallabag/v2-pluriel

check if one entry or not

8 years agoMerge pull request #1343 from wallabag/v2-filter-date
Jeremy Benoist [Tue, 18 Aug 2015 12:28:43 +0000 (14:28 +0200)] 
Merge pull request #1343 from wallabag/v2-filter-date

[WIP] filter by creation date

8 years agoMerge pull request #1354 from wallabag/v2-clean
Jeremy Benoist [Tue, 18 Aug 2015 07:11:40 +0000 (09:11 +0200)] 
Merge pull request #1354 from wallabag/v2-clean

some cleanup

8 years agoUpdate CONTRIBUTING.md 1354/head
Nicolas Lœuillet [Tue, 18 Aug 2015 06:49:42 +0000 (08:49 +0200)] 
Update CONTRIBUTING.md

8 years agousage of transchoice 1353/head
Nicolas Lœuillet [Tue, 18 Aug 2015 06:32:50 +0000 (08:32 +0200)] 
usage of transchoice

8 years agoremove capistrano in gitignore 1341/head
Nicolas Lœuillet [Tue, 18 Aug 2015 06:26:41 +0000 (08:26 +0200)] 
remove capistrano in gitignore

8 years agosome cleanup
Nicolas Lœuillet [Mon, 17 Aug 2015 15:59:12 +0000 (17:59 +0200)] 
some cleanup

8 years agoMerge pull request #1355 from wallabag/v2-clear-button
Jeremy Benoist [Mon, 17 Aug 2015 21:22:24 +0000 (23:22 +0200)] 
Merge pull request #1355 from wallabag/v2-clear-button

clean -> clear

8 years agoMerge pull request #1358 from wallabag/nicosomb-patch-1
Jeremy Benoist [Mon, 17 Aug 2015 21:21:59 +0000 (23:21 +0200)] 
Merge pull request #1358 from wallabag/nicosomb-patch-1

Disable external_code_coverage on Scrutinizr

8 years agodisable external_code_coverage 1358/head
Nicolas Lœuillet [Mon, 17 Aug 2015 21:11:20 +0000 (23:11 +0200)] 
disable external_code_coverage

8 years agochange timeout because scrutinizer failed
Nicolas Lœuillet [Mon, 17 Aug 2015 19:39:07 +0000 (21:39 +0200)] 
change timeout because scrutinizer failed

8 years agoclean -> clear 1355/head
Nicolas Lœuillet [Mon, 17 Aug 2015 18:12:11 +0000 (20:12 +0200)] 
clean -> clear

8 years agocheck if one entry or not
Nicolas Lœuillet [Mon, 17 Aug 2015 16:02:54 +0000 (18:02 +0200)] 
check if one entry or not

8 years agofilter by creation date 1343/head
Nicolas Lœuillet [Fri, 14 Aug 2015 20:57:16 +0000 (22:57 +0200)] 
filter by creation date

8 years agocapistrano config
Nicolas Lœuillet [Fri, 14 Aug 2015 19:26:14 +0000 (21:26 +0200)] 
capistrano config

8 years agoMerge pull request #1337 from modos189/v2_material
Nicolas Lœuillet [Mon, 17 Aug 2015 13:32:59 +0000 (15:32 +0200)] 
Merge pull request #1337 from modos189/v2_material

fixes material

8 years agofix 1337/head
Alexandr Danilov [Mon, 17 Aug 2015 13:30:30 +0000 (16:30 +0300)] 
fix

8 years agoMerge pull request #1352 from wallabag/v2-fix-pagination
Jeremy Benoist [Mon, 17 Aug 2015 13:19:35 +0000 (15:19 +0200)] 
Merge pull request #1352 from wallabag/v2-fix-pagination

fix #1350: fix pagination with filters

8 years agoadd test 1352/head
Nicolas Lœuillet [Mon, 17 Aug 2015 13:15:51 +0000 (15:15 +0200)] 
add test

8 years agoFix calendar in chromium and reducing the size of the calendar
Alexandr Danilov [Mon, 17 Aug 2015 12:43:44 +0000 (15:43 +0300)] 
Fix calendar in chromium and reducing the size of the calendar

8 years agofix #1350: fix pagination with filters
Nicolas Lœuillet [Mon, 17 Aug 2015 10:13:37 +0000 (12:13 +0200)] 
fix #1350: fix pagination with filters

8 years agoMerge pull request #1349 from wallabag/v2-add-original-link
Jeremy Benoist [Mon, 17 Aug 2015 07:20:41 +0000 (09:20 +0200)] 
Merge pull request #1349 from wallabag/v2-add-original-link

add link to original article in material theme

8 years agoGUI for filter by creation date #1343
Alexandr Danilov [Mon, 17 Aug 2015 00:12:14 +0000 (03:12 +0300)] 
GUI for filter by creation date #1343

8 years agoHide open menu on page reading articles
Alexandr Danilov [Sun, 16 Aug 2015 23:02:55 +0000 (02:02 +0300)] 
Hide open menu on page reading articles

8 years agoMy implementation progress bar at the top of the page #1348
Alexandr Danilov [Sun, 16 Aug 2015 22:50:46 +0000 (01:50 +0300)] 
My implementation progress bar at the top of the page #1348

8 years agoFix:
Alexandr Danilov [Sun, 16 Aug 2015 22:29:51 +0000 (01:29 +0300)] 
Fix:

    When I click on "new article" icon, and on the cross after, the filter icon is no more visible.
    When I change the size of my browser window, the filter appears but I didn't click on the icon
    Bug: can't click on pagination > 1
    display bug: when we load homepage, we see quickly the filter form
    new entry form: when we click on the field, the history of the field is at the left of the screen, not below the field (see screenshot)

8 years agoMerge remote-tracking branch 'origin/v2' into v2_material
Alexandr Danilov [Sun, 16 Aug 2015 21:33:03 +0000 (00:33 +0300)] 
Merge remote-tracking branch 'origin/v2' into v2_material

8 years agoadd link to original article in material theme 1349/head
Nicolas Lœuillet [Sun, 16 Aug 2015 19:05:37 +0000 (21:05 +0200)] 
add link to original article in material theme

8 years agoMerge pull request #1338 from wallabag/v2-add-titles
Jeremy Benoist [Thu, 13 Aug 2015 09:53:34 +0000 (11:53 +0200)] 
Merge pull request #1338 from wallabag/v2-add-titles

change title for material pages / about page

8 years agofix diaspora url 1338/head
Nicolas Lœuillet [Thu, 13 Aug 2015 07:18:41 +0000 (09:18 +0200)] 
fix diaspora url

8 years agochange title for material pages / about page
Nicolas Lœuillet [Thu, 13 Aug 2015 07:16:22 +0000 (09:16 +0200)] 
change title for material pages / about page

8 years agoFix form rendere
Alexandr Danilov [Wed, 12 Aug 2015 20:52:40 +0000 (23:52 +0300)] 
Fix form rendere

8 years agoMerge remote-tracking branch 'origin/v2' into v2_material
Alexandr Danilov [Wed, 12 Aug 2015 20:02:19 +0000 (23:02 +0300)] 
Merge remote-tracking branch 'origin/v2' into v2_material

8 years agoMerge pull request #1331 from wallabag/v2-disable-download
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

8 years ago#1320 Design for filters
Alexandr Danilov [Wed, 12 Aug 2015 19:55:44 +0000 (22:55 +0300)] 
#1320  Design for filters

8 years agodisable download links on entry view 1331/head
Nicolas Lœuillet [Wed, 12 Aug 2015 18:40:17 +0000 (20:40 +0200)] 
disable download links on entry view

8 years agoMerge pull request #1334 from wallabag/v2-store-domainname
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

8 years agostore domainName in database 1334/head
Nicolas Lœuillet [Wed, 12 Aug 2015 19:16:00 +0000 (21:16 +0200)] 
store domainName in database

8 years agoimproved view
Alexandr Danilov [Wed, 12 Aug 2015 17:27:30 +0000 (20:27 +0300)] 
improved view

8 years agofix #1321
Alexandr Danilov [Wed, 12 Aug 2015 16:18:31 +0000 (19:18 +0300)] 
fix #1321

8 years agoMerge pull request #1328 from wallabag/v2-fix-1324
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

8 years agoremove pagination if page == 1 with baggy theme 1328/head
Nicolas Lœuillet [Wed, 12 Aug 2015 12:06:56 +0000 (14:06 +0200)] 
remove pagination if page == 1 with baggy theme

8 years agofix #1324: do not display pagination when only 1 page
Nicolas Lœuillet [Wed, 12 Aug 2015 12:05:53 +0000 (14:05 +0200)] 
fix #1324: do not display pagination when only 1 page

8 years agoMerge pull request #1326 from wallabag/v2-fix-1299
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

8 years agofix #1299: change send buttons on config page 1326/head
Nicolas Lœuillet [Wed, 12 Aug 2015 11:35:48 +0000 (13:35 +0200)] 
fix #1299: change send buttons on config page

8 years agoMerge pull request #1325 from wallabag/v2-fix-1314
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

8 years agofix #1314: change max-width in material theme 1325/head
Nicolas Lœuillet [Wed, 12 Aug 2015 11:26:49 +0000 (13:26 +0200)] 
fix #1314: change max-width in material theme

8 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

8 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

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

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

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

8 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

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

8 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

8 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

8 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

8 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)

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

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

8 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

8 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

8 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

8 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

8 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

8 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

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

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

8 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

8 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))

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

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

8 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

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

8 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

8 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

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

8 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

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

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

8 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

8 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

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

8 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

8 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

8 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/

8 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/

8 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

8 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

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