]> git.immae.eu Git - github/wallabag/wallabag.git/log
github/wallabag/wallabag.git
9 years agoMerge pull request #933 from wallabag/dev 1.8.1b 1.8.1bis 1.8.1old
Nicolas Lœuillet [Sun, 16 Nov 2014 20:12:47 +0000 (21:12 +0100)] 
Merge pull request #933 from wallabag/dev

1.8.1b

9 years agoupdate constant version 933/head
Thomas Citharel [Sun, 16 Nov 2014 01:29:01 +0000 (02:29 +0100)] 
update constant version

9 years agoMerge pull request #932 from wallabag/dev 1.8.1
Nicolas Lœuillet [Sat, 15 Nov 2014 19:48:49 +0000 (20:48 +0100)] 
Merge pull request #932 from wallabag/dev

1.8.1

9 years agoadd DS_Store in gitignore 932/head
Nicolas Lœuillet [Sat, 8 Nov 2014 07:25:00 +0000 (08:25 +0100)] 
add DS_Store in gitignore

9 years agoMerge pull request #926 from jsit/aboutlink
Nicolas Lœuillet [Wed, 5 Nov 2014 16:24:05 +0000 (17:24 +0100)] 
Merge pull request #926 from jsit/aboutlink

Fixing URL typo on about page

9 years agoFixing URL typo on about page 926/head
Jay Sitter [Wed, 5 Nov 2014 16:22:22 +0000 (11:22 -0500)] 
Fixing URL typo on about page

9 years agoMerge pull request #921 from wallabag/about-page
Thomas Citharel [Mon, 3 Nov 2014 22:01:23 +0000 (23:01 +0100)] 
Merge pull request #921 from wallabag/about-page

add about page

9 years agoMerge pull request #920 from jsit/uifixes
Nicolas Lœuillet [Mon, 3 Nov 2014 21:48:07 +0000 (22:48 +0100)] 
Merge pull request #920 from jsit/uifixes

Many small UI changes/fixes to Baggy theme and English translation files

9 years agoMerge pull request #922 from jsit/menuhiding
Nicolas Lœuillet [Mon, 3 Nov 2014 21:42:49 +0000 (22:42 +0100)] 
Merge pull request #922 from jsit/menuhiding

Fixing menu hiding behavior when switching from mobile width to desktop width

9 years agoImproving class names for menu hiding 922/head
Jay Sitter [Mon, 3 Nov 2014 18:32:20 +0000 (13:32 -0500)] 
Improving class names for menu hiding

9 years agoFixing menu hiding behavior when switching from mobile width to desktop width
Jay Sitter [Mon, 3 Nov 2014 18:28:58 +0000 (13:28 -0500)] 
Fixing menu hiding behavior when switching from mobile width to desktop width

9 years agoApplying changes to config.twig to default theme as well 920/head
Jay Sitter [Mon, 3 Nov 2014 17:06:44 +0000 (12:06 -0500)] 
Applying changes to config.twig to default theme as well

9 years agoRemoving title text from bookmarklet
Jay Sitter [Mon, 3 Nov 2014 14:13:42 +0000 (09:13 -0500)] 
Removing title text from bookmarklet

9 years agoRestoring change password section in config
Jay Sitter [Mon, 3 Nov 2014 14:11:25 +0000 (09:11 -0500)] 
Restoring change password section in config

9 years agoadd about page 921/head
Nicolas Lœuillet [Mon, 3 Nov 2014 06:44:56 +0000 (07:44 +0100)] 
add about page

9 years agoMerge pull request #919 from jsit/popupjs_
Nicolas Lœuillet [Mon, 3 Nov 2014 05:46:18 +0000 (06:46 +0100)] 
Merge pull request #919 from jsit/popupjs_

Improving JavaScript for popup forms

9 years agoMany small UI changes/fixes to Baggy theme and English translation files. May need...
Jay Sitter [Sun, 2 Nov 2014 18:37:44 +0000 (13:37 -0500)] 
Many small UI changes/fixes to Baggy theme and English translation files. May need review.

9 years agoImproving JavaScript for popup forms 919/head
Jay Sitter [Sun, 2 Nov 2014 16:15:36 +0000 (11:15 -0500)] 
Improving JavaScript for popup forms

9 years agoRemoving spaces before colons on config screen
Jay Sitter [Sun, 2 Nov 2014 15:30:13 +0000 (10:30 -0500)] 
Removing spaces before colons on config screen

9 years agoMerge branch 'dev' into uitextcase
Jay Sitter [Sat, 1 Nov 2014 22:29:41 +0000 (18:29 -0400)] 
Merge branch 'dev' into uitextcase

9 years agoMerge pull request #917 from jsit/menuopacity
Thomas Citharel [Fri, 31 Oct 2014 19:45:40 +0000 (20:45 +0100)] 
Merge pull request #917 from jsit/menuopacity

Fixing opacity issue when using mobile menu (#912)

9 years agoChanging my tabs to spaces :) 917/head
Jay Sitter [Fri, 31 Oct 2014 19:38:25 +0000 (15:38 -0400)] 
Changing my tabs to spaces :)

9 years agoFixing opacity issue when using mobile menu
Jay Sitter [Fri, 31 Oct 2014 19:37:08 +0000 (15:37 -0400)] 
Fixing opacity issue when using mobile menu

9 years agoCapitalizing "EPUB" as is defined by IDPF: http://idpf.org/epub
Jay Sitter [Fri, 31 Oct 2014 19:26:33 +0000 (15:26 -0400)] 
Capitalizing "EPUB" as is defined by IDPF: http://idpf.org/epub

9 years agoMerge pull request #913 from jsit/hotfix
Thomas Citharel [Fri, 31 Oct 2014 18:35:35 +0000 (19:35 +0100)] 
Merge pull request #913 from jsit/hotfix

Fixing regression in popup close button styling

9 years agoFixing regression in popup close button styling 913/head
Jay Sitter [Fri, 31 Oct 2014 18:34:10 +0000 (14:34 -0400)] 
Fixing regression in popup close button styling

9 years agoMerge branch 'jsit-duplicateformstyles' into dev
tcit [Fri, 31 Oct 2014 17:54:20 +0000 (18:54 +0100)] 
Merge branch 'jsit-duplicateformstyles' into dev

9 years agofix merge errors
tcit [Fri, 31 Oct 2014 17:54:08 +0000 (18:54 +0100)] 
fix merge errors

9 years agoMerge branch 'jsit-duplicateformstyles' into dev
tcit [Fri, 31 Oct 2014 17:48:02 +0000 (18:48 +0100)] 
Merge branch 'jsit-duplicateformstyles' into dev

9 years agomerge
tcit [Fri, 31 Oct 2014 17:47:54 +0000 (18:47 +0100)] 
merge

9 years agoMerging changes with dev 911/head
Jay Sitter [Fri, 31 Oct 2014 17:47:45 +0000 (13:47 -0400)] 
Merging changes with dev

9 years agoMerge pull request #909 from jsit/closebutton
Thomas Citharel [Fri, 31 Oct 2014 17:44:42 +0000 (18:44 +0100)] 
Merge pull request #909 from jsit/closebutton

Standardizing class names and styles for close buttons

9 years agoRemoving left border on popup forms on mobile widths 909/head
Jay Sitter [Fri, 31 Oct 2014 17:32:34 +0000 (13:32 -0400)] 
Removing left border on popup forms on mobile widths

9 years agoFixing popup form width issue on narrow width
Jay Sitter [Fri, 31 Oct 2014 17:28:39 +0000 (13:28 -0400)] 
Fixing popup form width issue on narrow width

9 years agoMaking visual styling of search and bag it popup forms more consistent
Jay Sitter [Fri, 31 Oct 2014 16:48:35 +0000 (12:48 -0400)] 
Making visual styling of search and bag it popup forms more consistent

9 years agoRemoving duplicate popup form styles
Jay Sitter [Fri, 31 Oct 2014 16:35:19 +0000 (12:35 -0400)] 
Removing duplicate popup form styles

9 years agoMerge pull request #910 from jsit/default-theme-search-form-css
Thomas Citharel [Fri, 31 Oct 2014 16:34:03 +0000 (17:34 +0100)] 
Merge pull request #910 from jsit/default-theme-search-form-css

Moving search-form style out of messages css and into style.css

9 years agoMoving search-form style out of messages css and into style.css 910/head
Jay Sitter [Fri, 31 Oct 2014 16:31:13 +0000 (12:31 -0400)] 
Moving search-form style out of messages css and into style.css

9 years agoStandardizing class names and styles for close buttons
Jay Sitter [Fri, 31 Oct 2014 15:10:38 +0000 (11:10 -0400)] 
Standardizing class names and styles for close buttons

9 years agoMerge pull request #908 from jsit/closemessage
Thomas Citharel [Fri, 31 Oct 2014 15:10:16 +0000 (16:10 +0100)] 
Merge pull request #908 from jsit/closemessage

Changing close message button to use × instead of X

9 years agoChanging close message button to use × instead of X 908/head
Jay Sitter [Fri, 31 Oct 2014 14:44:20 +0000 (10:44 -0400)] 
Changing close message button to use × instead of X

9 years agoMerge pull request #907 from jsit/login
Thomas Citharel [Fri, 31 Oct 2014 14:10:01 +0000 (15:10 +0100)] 
Merge pull request #907 from jsit/login

Some small design tweaks to the login page: Moving 'Stay signed in'...

9 years agoAdding right margin to labels (to compensate for now-missing left margin on input... 907/head
Jay Sitter [Fri, 31 Oct 2014 13:53:01 +0000 (09:53 -0400)] 
Adding right margin to labels (to compensate for now-missing left margin on input fields)

9 years agoSome small design tweaks to the login page: Moving 'Stay signed in' label and removin...
Jay Sitter [Fri, 31 Oct 2014 13:30:57 +0000 (09:30 -0400)] 
Some small design tweaks to the login page: Moving 'Stay signed in' label and removing left margin on input boxes

9 years agoMerge pull request #894 from wallabag/change-password-field
Thomas Citharel [Fri, 31 Oct 2014 10:51:13 +0000 (11:51 +0100)] 
Merge pull request #894 from wallabag/change-password-field

Fix #891: change type for password field in installation

9 years agoMerge pull request #904 from wallabag/vagrantfile
Thomas Citharel [Fri, 31 Oct 2014 10:50:53 +0000 (11:50 +0100)] 
Merge pull request #904 from wallabag/vagrantfile

Vagrantfile

9 years agoMerge pull request #906 from jsit/tagstitle
Nicolas Lœuillet [Thu, 30 Oct 2014 20:55:46 +0000 (21:55 +0100)] 
Merge pull request #906 from jsit/tagstitle

Uppercasing 'tags' page title

9 years agoUppercasing 'tags' page title 906/head
Jay Sitter [Thu, 30 Oct 2014 20:54:24 +0000 (16:54 -0400)] 
Uppercasing 'tags' page title

9 years agoMerge pull request #898 from jsit/previewtext
Nicolas Lœuillet [Thu, 30 Oct 2014 20:43:21 +0000 (21:43 +0100)] 
Merge pull request #898 from jsit/previewtext

Fixing issue #874, displaying preview text when in list mode

9 years agoMerge pull request #897 from jsit/displaymode
Nicolas Lœuillet [Thu, 30 Oct 2014 20:43:15 +0000 (21:43 +0100)] 
Merge pull request #897 from jsit/displaymode

Fixing display mode switching in Baggy theme (issue #896)

9 years agoMerge pull request #905 from jsit/closebutton
Nicolas Lœuillet [Thu, 30 Oct 2014 20:25:26 +0000 (21:25 +0100)] 
Merge pull request #905 from jsit/closebutton

Making the close button more visually consistent on the menu popup forms

9 years agoMerge pull request #903 from jsit/uitextcase
Nicolas Lœuillet [Thu, 30 Oct 2014 20:08:11 +0000 (21:08 +0100)] 
Merge pull request #903 from jsit/uitextcase

Fixing some more text case issues

9 years agoMaking the close button more visually consistent on the menu popup forms 905/head
Jay Sitter [Thu, 30 Oct 2014 20:00:18 +0000 (16:00 -0400)] 
Making the close button more visually consistent on the menu popup forms

9 years agochange database name 904/head
Nicolas Lœuillet [Thu, 30 Oct 2014 19:43:39 +0000 (20:43 +0100)] 
change database name

9 years agoignore vagrant directory
Nicolas Lœuillet [Thu, 30 Oct 2014 19:42:17 +0000 (20:42 +0100)] 
ignore vagrant directory

9 years agoVagrantfile, from @fguillot for kanboard
Nicolas Lœuillet [Thu, 30 Oct 2014 19:40:56 +0000 (20:40 +0100)] 
Vagrantfile, from @fguillot for kanboard

9 years agoFixing some more text case issues 903/head
Jay Sitter [Thu, 30 Oct 2014 19:37:59 +0000 (15:37 -0400)] 
Fixing some more text case issues

9 years agoMerge pull request #902 from jsit/en_us
Nicolas Lœuillet [Thu, 30 Oct 2014 19:34:08 +0000 (20:34 +0100)] 
Merge pull request #902 from jsit/en_us

Adding 'en_US' locale (issue #901)

9 years agoAdding 'en_US' locale (issue #901) 902/head
Jay Sitter [Thu, 30 Oct 2014 19:32:00 +0000 (15:32 -0400)] 
Adding 'en_US' locale (issue #901)

9 years agoAdding 'en_US' locale (issue #901)
Jay Sitter [Thu, 30 Oct 2014 19:30:09 +0000 (15:30 -0400)] 
Adding 'en_US' locale (issue #901)

9 years agoMerge pull request #900 from jsit/uitextcase
Thomas Citharel [Thu, 30 Oct 2014 17:37:58 +0000 (18:37 +0100)] 
Merge pull request #900 from jsit/uitextcase

Fixing a bunch of English translation letter casing and syntax (issue #899)

9 years agoFixing a bunch of English translation letter casing and syntax (issue #899) 900/head
Jay Sitter [Thu, 30 Oct 2014 16:17:26 +0000 (12:17 -0400)] 
Fixing a bunch of English translation letter casing and syntax (issue #899)

9 years agoFixing issue #874, displaying preview text when in list mode 898/head
Jay Sitter [Thu, 30 Oct 2014 15:23:18 +0000 (11:23 -0400)] 
Fixing issue #874, displaying preview text when in list mode

9 years agoFixing display mode switching in Baggy theme (issue #896) 897/head
Jay Sitter [Thu, 30 Oct 2014 15:20:05 +0000 (11:20 -0400)] 
Fixing display mode switching in Baggy theme (issue #896)

9 years agochange type for password field in installation 894/head
Nicolas Lœuillet [Wed, 29 Oct 2014 20:02:07 +0000 (21:02 +0100)] 
change type for password field in installation

9 years agoMerge pull request #889 from wallabag/fix#871
Nicolas Lœuillet [Mon, 27 Oct 2014 19:58:13 +0000 (20:58 +0100)] 
Merge pull request #889 from wallabag/fix#871

Fix#871

9 years agotranslation fix finished for #871 and bring add tag from search feature to all themes 889/head
tcit [Mon, 27 Oct 2014 14:12:46 +0000 (15:12 +0100)] 
translation fix finished for #871 and bring add tag from search feature to all themes

9 years agotranslation fix for #887 and tiny display fix
tcit [Mon, 27 Oct 2014 13:00:47 +0000 (14:00 +0100)] 
translation fix for #887 and tiny display fix

9 years agoMerge pull request #888 from wallabag/updated-site-config
Thomas Citharel [Mon, 27 Oct 2014 08:28:30 +0000 (09:28 +0100)] 
Merge pull request #888 from wallabag/updated-site-config

updated site_config

9 years agoupdated site_config 888/head
Nicolas Lœuillet [Mon, 27 Oct 2014 05:46:13 +0000 (06:46 +0100)] 
updated site_config

9 years agoMerge pull request #883 from wallabag/hotfixepub
Nicolas Lœuillet [Wed, 22 Oct 2014 13:12:49 +0000 (15:12 +0200)] 
Merge pull request #883 from wallabag/hotfixepub

fix #882

9 years agofix #882 883/head
tcit [Wed, 22 Oct 2014 13:10:38 +0000 (15:10 +0200)] 
fix #882

9 years agoMerge pull request #879 from Marmo/patch-1
Thomas Citharel [Tue, 21 Oct 2014 17:42:21 +0000 (19:42 +0200)] 
Merge pull request #879 from Marmo/patch-1

update zeit.de.txt for removal of inline ads

9 years agoupdate zeit.de.txt for removal of inline ads 879/head
Marmo [Tue, 21 Oct 2014 17:33:40 +0000 (19:33 +0200)] 
update zeit.de.txt for removal of inline ads

9 years agoMerge pull request #878 from wallabag/greybuttonread
Nicolas Lœuillet [Mon, 20 Oct 2014 13:07:24 +0000 (15:07 +0200)] 
Merge pull request #878 from wallabag/greybuttonread

fix #873

9 years agofix #873 878/head
tcit [Sun, 19 Oct 2014 09:12:25 +0000 (11:12 +0200)] 
fix #873

9 years agofix translation issues
tcit [Fri, 17 Oct 2014 19:08:08 +0000 (21:08 +0200)] 
fix translation issues

9 years agoMerge pull request #868 from wallabag/popupoverlap
Nicolas Lœuillet [Wed, 15 Oct 2014 14:53:06 +0000 (16:53 +0200)] 
Merge pull request #868 from wallabag/popupoverlap

fix for #830

9 years agofix for #830 868/head
tcit [Wed, 15 Oct 2014 14:47:38 +0000 (16:47 +0200)] 
fix for #830

9 years agoMerge pull request #848 from 11mariom/dev
Nicolas Lœuillet [Tue, 14 Oct 2014 17:57:16 +0000 (19:57 +0200)] 
Merge pull request #848 from 11mariom/dev

Add support for custom http port

9 years agoMerge pull request #843 from rros/mysql-utf8mb4
Nicolas Lœuillet [Tue, 14 Oct 2014 17:56:50 +0000 (19:56 +0200)] 
Merge pull request #843 from rros/mysql-utf8mb4

Convert the MySQL charset to utf8mb4 to support the full range of unicode

9 years agoMerge pull request #867 from wallabag/zindex-menu-bug
Nicolas Lœuillet [Tue, 14 Oct 2014 17:50:28 +0000 (19:50 +0200)] 
Merge pull request #867 from wallabag/zindex-menu-bug

fix z-index-menu mobile view bug #834

9 years agofix z-index-menu mobile view bug #834 867/head
tcit [Sun, 12 Oct 2014 08:24:07 +0000 (10:24 +0200)] 
fix z-index-menu mobile view bug #834

9 years agoCreate adme.ru.txt
Thomas Citharel [Sun, 12 Oct 2014 08:00:35 +0000 (10:00 +0200)] 
Create adme.ru.txt

Siteconfig

9 years agoMerge pull request #865 from Marmo/patch-1
Thomas Citharel [Sat, 11 Oct 2014 13:30:51 +0000 (15:30 +0200)] 
Merge pull request #865 from Marmo/patch-1

update heise.de.txt

9 years agoupdate heise.de.txt 865/head
Marmo [Sat, 11 Oct 2014 13:22:53 +0000 (15:22 +0200)] 
update heise.de.txt

Multi-page Telepolis-articles (www.heise.de/tp/...) are not fetched correctly atm. My addition to the single_page_link makes it work (tested with http://www.heise.de/tp/artikel/42/42579/1.html).

9 years agoMerge branch 'dev' 1.8.0
Nicolas Lœuillet [Fri, 10 Oct 2014 11:33:54 +0000 (13:33 +0200)] 
Merge branch 'dev'

9 years agoMerge branch 'master' into dev
Nicolas Lœuillet [Fri, 10 Oct 2014 11:33:36 +0000 (13:33 +0200)] 
Merge branch 'master' into dev

Conflicts:
index.php

9 years agoMerge pull request #860 from wallabag/compatibility_file 863/head
Thomas Citharel [Wed, 8 Oct 2014 19:36:51 +0000 (21:36 +0200)] 
Merge pull request #860 from wallabag/compatibility_file

Move compatibility file (fixes #858)

9 years agoRight redirect from the new path 860/head
tcit [Wed, 8 Oct 2014 19:35:21 +0000 (21:35 +0200)] 
Right redirect from the new path

9 years agoMerge pull request #861 from wallabag/fix-query-sqlite-install
Thomas Citharel [Wed, 8 Oct 2014 19:32:03 +0000 (21:32 +0200)] 
Merge pull request #861 from wallabag/fix-query-sqlite-install

query for populate mysql/postgres was called when we choosed sqlite

9 years agoquery for populate mysql/postgres was called when we choosed sqlite 861/head
Nicolas Lœuillet [Wed, 8 Oct 2014 19:23:34 +0000 (21:23 +0200)] 
query for populate mysql/postgres was called when we choosed sqlite

9 years agochange href in install/index.php
Nicolas Lœuillet [Wed, 8 Oct 2014 19:11:56 +0000 (21:11 +0200)] 
change href in install/index.php

9 years agoFixes #858: move compatibility file into install folder
Nicolas Lœuillet [Wed, 8 Oct 2014 19:08:21 +0000 (21:08 +0200)] 
Fixes #858: move compatibility file into install folder

9 years agoMerge pull request #787 from wallabag/data-for-mysql
Thomas Citharel [Wed, 8 Oct 2014 17:32:39 +0000 (19:32 +0200)] 
Merge pull request #787 from wallabag/data-for-mysql

Add data for mysql installation, see #624

9 years agoFix bug for #787 787/head
tcit [Wed, 8 Oct 2014 17:31:15 +0000 (19:31 +0200)] 
Fix bug for #787

9 years agoMerge branch 'dev' into data-for-mysql
tcit [Wed, 8 Oct 2014 17:26:26 +0000 (19:26 +0200)] 
Merge branch 'dev' into data-for-mysql

9 years agoMerge pull request #855 from wallabag/fix-828
Nicolas Lœuillet [Sat, 4 Oct 2014 19:27:05 +0000 (21:27 +0200)] 
Merge pull request #855 from wallabag/fix-828

Fix #828

9 years agoMerge pull request #856 from wallabag/fix-826
Nicolas Lœuillet [Sat, 4 Oct 2014 18:34:40 +0000 (20:34 +0200)] 
Merge pull request #856 from wallabag/fix-826

Fix #826

9 years agoget content 856/head
tcit [Sat, 4 Oct 2014 18:17:00 +0000 (20:17 +0200)] 
get content