]> git.immae.eu Git - github/wallabag/wallabag.git/log
github/wallabag/wallabag.git
9 years agofoo test
Nicolas Lœuillet [Mon, 19 Jan 2015 10:59:22 +0000 (11:59 +0100)] 
foo test

9 years agoadd phpunit
Nicolas Lœuillet [Mon, 19 Jan 2015 10:47:44 +0000 (11:47 +0100)] 
add phpunit

9 years agobin folder
Nicolas Lœuillet [Mon, 19 Jan 2015 10:29:43 +0000 (11:29 +0100)] 
bin folder

9 years agopagination with composer and move FlattrItem
Nicolas Lœuillet [Mon, 19 Jan 2015 10:29:25 +0000 (11:29 +0100)] 
pagination with composer and move FlattrItem

9 years agoreplace session class
Nicolas Lœuillet [Sun, 18 Jan 2015 21:25:29 +0000 (22:25 +0100)] 
replace session class

9 years agoreplace flash messages library
Nicolas Lœuillet [Sun, 18 Jan 2015 21:11:41 +0000 (22:11 +0100)] 
replace flash messages library

9 years agoremove 3rd libraries
Nicolas Lœuillet [Sun, 18 Jan 2015 19:07:46 +0000 (20:07 +0100)] 
remove 3rd libraries

9 years agoremove autoload section in composer.json
Nicolas Lœuillet [Fri, 16 Jan 2015 19:56:46 +0000 (20:56 +0100)] 
remove autoload section in composer.json

9 years agopackagist
Nicolas Lœuillet [Fri, 16 Jan 2015 19:45:23 +0000 (20:45 +0100)] 
packagist

9 years agoMerge pull request #690 from doc75/log_auth_error
Nicolas Lœuillet [Fri, 16 Jan 2015 19:06:57 +0000 (20:06 +0100)] 
Merge pull request #690 from doc75/log_auth_error

Add message in web server log in case of authentication failure

9 years agoMerge pull request #1003 from vpmalley/dev
Nicolas Lœuillet [Fri, 16 Jan 2015 19:04:56 +0000 (20:04 +0100)] 
Merge pull request #1003 from vpmalley/dev

[RSS] introducing query param 'limit' for max items in RSS feed

9 years ago[RSS] introducing query param 'limit' to restrict the number of items to display... 1003/head
Vincent Malley [Fri, 16 Jan 2015 16:42:39 +0000 (11:42 -0500)] 
[RSS] introducing query param 'limit' to restrict the number of items to display in RSS feeds.

9 years agoMerge pull request #999 from moparisthebest/additions_dev
Thomas Citharel [Tue, 13 Jan 2015 21:45:33 +0000 (22:45 +0100)] 
Merge pull request #999 from moparisthebest/additions_dev

Miscellaneous additions

9 years agoAdd ability to mark all articles from a tag as read 999/head
moparisthebest [Tue, 13 Jan 2015 00:52:41 +0000 (19:52 -0500)] 
Add ability to mark all articles from a tag as read

9 years agoAdd ability to delete all articles matching a search
moparisthebest [Tue, 13 Jan 2015 00:11:45 +0000 (19:11 -0500)] 
Add ability to delete all articles matching a search

9 years agoAdd ability to tag an article on creation
moparisthebest [Mon, 12 Jan 2015 23:49:05 +0000 (18:49 -0500)] 
Add ability to tag an article on creation

9 years agoadd message in web server log in case of authentication failure to enable the usage... 690/head
Guillaume Virlet [Wed, 14 May 2014 13:45:52 +0000 (15:45 +0200)] 
add message in web server log in case of authentication failure to enable the usage of fail2ban on failed login attempts

9 years agofixes #963 and use our own readability.php file for mobiClass
Thomas Citharel [Sat, 3 Jan 2015 12:03:26 +0000 (13:03 +0100)] 
fixes #963 and use our own readability.php file for mobiClass

9 years agoupdated french mo file (see #986)
Thomas Citharel [Sat, 3 Jan 2015 10:40:19 +0000 (11:40 +0100)] 
updated french mo file (see #986)

9 years agoMerge branch 'master' into dev
Thomas Citharel [Sat, 3 Jan 2015 10:38:32 +0000 (11:38 +0100)] 
Merge branch 'master' into dev
To get the errors

9 years agoMerge pull request #986 from goofy-bz/patch-2
Nicolas Lœuillet [Fri, 2 Jan 2015 20:23:42 +0000 (21:23 +0100)] 
Merge pull request #986 from goofy-bz/patch-2

Update fr_FR.utf8.po

9 years agoUpdate fr_FR.utf8.po 986/head
goofy-bz [Fri, 2 Jan 2015 20:13:54 +0000 (21:13 +0100)] 
Update fr_FR.utf8.po

formulation (trivial)

9 years agoMerge pull request #974 from jbfavre/fix_ftrss_call_can_break_import
Thomas Citharel [Fri, 26 Dec 2014 09:31:15 +0000 (10:31 +0100)] 
Merge pull request #974 from jbfavre/fix_ftrss_call_can_break_import

Make call to FTRSS silent to avoid warnings which can break import

9 years agoMerge branch 'dev' of https://github.com/wallabag/wallabag into dev
Thomas Citharel [Fri, 26 Dec 2014 09:27:30 +0000 (10:27 +0100)] 
Merge branch 'dev' of https://github.com/wallabag/wallabag into dev

9 years agodeleted (again) courgette
Thomas Citharel [Fri, 26 Dec 2014 09:25:49 +0000 (10:25 +0100)] 
deleted (again) courgette

9 years agoMerge pull request #975 from wallabag/fixflattrcalls
Nicolas Lœuillet [Tue, 23 Dec 2014 14:34:05 +0000 (15:34 +0100)] 
Merge pull request #975 from wallabag/fixflattrcalls

don't call flattr if flattr is disabled

9 years agodon't call flattr if flattr is disabled 975/head
Thomas Citharel [Mon, 22 Dec 2014 15:26:23 +0000 (16:26 +0100)] 
don't call flattr if flattr is disabled

9 years agoMake call to FTRSS silent to avoid warnings which can break import 974/head
Jean Baptiste Favre [Sun, 21 Dec 2014 21:41:04 +0000 (22:41 +0100)] 
Make call to FTRSS silent to avoid warnings which can break import

9 years agoMerge pull request #971 from wallabag/fix-jquery-installation
Thomas Citharel [Fri, 19 Dec 2014 20:06:06 +0000 (21:06 +0100)] 
Merge pull request #971 from wallabag/fix-jquery-installation

Fix jquery installation

9 years agoremove idea files 971/head
Nicolas Loeuillet [Thu, 18 Dec 2014 09:37:17 +0000 (10:37 +0100)] 
remove idea files

9 years agochange jquery path into installation script
Nicolas Loeuillet [Thu, 18 Dec 2014 09:36:47 +0000 (10:36 +0100)] 
change jquery path into installation script

9 years agoMerge pull request #923 from wallabag/add-html-doc
Thomas Citharel [Wed, 17 Dec 2014 21:59:28 +0000 (22:59 +0100)] 
Merge pull request #923 from wallabag/add-html-doc

add HTML documentation

9 years agolink to doc inside wallabag:about 923/head
Thomas Citharel [Wed, 17 Dec 2014 21:55:33 +0000 (22:55 +0100)] 
link to doc inside wallabag:about

9 years agoMerge branch 'add-html-doc' of https://github.com/wallabag/wallabag into documentatio...
Thomas Citharel [Wed, 17 Dec 2014 21:44:36 +0000 (22:44 +0100)] 
Merge branch 'add-html-doc' of https://github.com/wallabag/wallabag into documentation-integration

9 years agoenable showing or not for epub/mobi/pdf export buttons
Thomas Citharel [Sun, 14 Dec 2014 14:17:39 +0000 (15:17 +0100)] 
enable showing or not for epub/mobi/pdf export buttons

9 years agoMerge branch 'tcitworld-ebook' into dev
Thomas Citharel [Sat, 13 Dec 2014 23:16:39 +0000 (00:16 +0100)] 
Merge branch 'tcitworld-ebook' into dev

9 years agomerge epub with all the dev evolutions
Thomas Citharel [Sat, 13 Dec 2014 23:16:22 +0000 (00:16 +0100)] 
merge epub with all the dev evolutions

9 years agodiaspora on all themes
Thomas Citharel [Sun, 7 Dec 2014 21:24:25 +0000 (22:24 +0100)] 
diaspora on all themes

9 years agoadded diaspora sharing
Thomas Citharel [Sat, 6 Dec 2014 17:42:29 +0000 (18:42 +0100)] 
added diaspora sharing

9 years agoMerge pull request #958 from etiess/patch-2
Thomas Citharel [Wed, 26 Nov 2014 13:08:51 +0000 (14:08 +0100)] 
Merge pull request #958 from etiess/patch-2

Update wallabag_compatibility_test.php

9 years agoUpdate wallabag_compatibility_test.php 958/head
etiess [Wed, 26 Nov 2014 13:07:27 +0000 (14:07 +0100)] 
Update wallabag_compatibility_test.php

Explain how to install Tidy

9 years agoMerge branch 'remove-courgette' into dev
Thomas Citharel [Mon, 24 Nov 2014 21:56:10 +0000 (22:56 +0100)] 
Merge branch 'remove-courgette' into dev

Conflicts:
themes/courgette/_view.twig

9 years agoupgrade documentation
Nicolas Lœuillet [Mon, 24 Nov 2014 12:46:39 +0000 (13:46 +0100)] 
upgrade documentation

9 years agoadd link to documentation into installation
Nicolas Lœuillet [Mon, 24 Nov 2014 12:46:11 +0000 (13:46 +0100)] 
add link to documentation into installation

9 years agoMerge pull request #939 from jsit/globaljs
Nicolas Lœuillet [Mon, 24 Nov 2014 12:23:53 +0000 (13:23 +0100)] 
Merge pull request #939 from jsit/globaljs

_global-izing some more js & css

9 years agofailover if theme folder doesn't exist 953/head
Nicolas Lœuillet [Mon, 24 Nov 2014 12:11:57 +0000 (13:11 +0100)] 
failover if theme folder doesn't exist

9 years agoMerge pull request #942 from wallabag/carrot
Thomas Citharel [Fri, 21 Nov 2014 21:15:17 +0000 (22:15 +0100)] 
Merge pull request #942 from wallabag/carrot

implementing carrot into wallabag

9 years agoMerge pull request #945 from jsit/carrot 942/head
Thomas Citharel [Fri, 21 Nov 2014 21:10:02 +0000 (22:10 +0100)] 
Merge pull request #945 from jsit/carrot

Fixing icon text on unread page

9 years agoFixing icon text on unread page 945/head
Jay Sitter [Fri, 21 Nov 2014 21:07:15 +0000 (16:07 -0500)] 
Fixing icon text on unread page

9 years agoMerge pull request #944 from jsit/carrot
Thomas Citharel [Fri, 21 Nov 2014 20:47:37 +0000 (21:47 +0100)] 
Merge pull request #944 from jsit/carrot

Globalizing and creating two variants of Carrot.org icon

9 years agoGlobalizing and creating two variants of Carrot.org icon; tidying up some CSS 944/head
Jay Sitter [Fri, 21 Nov 2014 20:30:59 +0000 (15:30 -0500)] 
Globalizing and creating two variants of Carrot.org icon; tidying up some CSS

9 years agofix merge confict
Thomas Citharel [Wed, 19 Nov 2014 15:54:28 +0000 (16:54 +0100)] 
fix merge confict

9 years agoMerge pull request #943 from wallabag/fixFlattrs
Thomas Citharel [Wed, 19 Nov 2014 15:40:36 +0000 (16:40 +0100)] 
Merge pull request #943 from wallabag/fixFlattrs

fix Flattrs

9 years agodefault deactivated
Thomas Citharel [Wed, 19 Nov 2014 15:40:02 +0000 (16:40 +0100)] 
default deactivated

9 years agofix Flattrs 943/head
Thomas Citharel [Wed, 19 Nov 2014 15:35:44 +0000 (16:35 +0100)] 
fix Flattrs

9 years agoimplementing carrot into wallabag
Thomas Citharel [Wed, 19 Nov 2014 15:27:56 +0000 (16:27 +0100)] 
implementing carrot into wallabag

9 years agoMerge pull request #938 from jsit/firefoxiconfix
Thomas Citharel [Tue, 18 Nov 2014 21:36:53 +0000 (22:36 +0100)] 
Merge pull request #938 from jsit/firefoxiconfix

Fix for favicons in Firefox

9 years agoUpdating Baggy theme's head.twig to locate _global js/css 939/head
Jay Sitter [Tue, 18 Nov 2014 15:07:32 +0000 (10:07 -0500)] 
Updating Baggy theme's head.twig to locate _global js/css

9 years ago_global-izing some more js & css
Jay Sitter [Tue, 18 Nov 2014 15:01:37 +0000 (10:01 -0500)] 
_global-izing some more js & css

9 years agoFix for favicons in Firefox (FF only uses the last declared favicon, not the most... 938/head
Jay Sitter [Tue, 18 Nov 2014 14:28:39 +0000 (09:28 -0500)] 
Fix for favicons in Firefox (FF only uses the last declared favicon, not the most appropriate: https://bugzilla.mozilla.org/show_bug.cgi?id=751712)

9 years agoMerge pull request #937 from jsit/favicons
Thomas Citharel [Mon, 17 Nov 2014 22:15:47 +0000 (23:15 +0100)] 
Merge pull request #937 from jsit/favicons

Moving favicons to new _global theme dir and adjusting <link> tags

9 years agoAdjusting Template class so that _global is ignored as a theme 937/head
Jay Sitter [Mon, 17 Nov 2014 22:11:33 +0000 (17:11 -0500)] 
Adjusting Template class so that _global is ignored as a theme

9 years agoModifying Courgette theme to comply with new app icon image location 936/head
Jay Sitter [Mon, 17 Nov 2014 21:59:53 +0000 (16:59 -0500)] 
Modifying Courgette theme to comply with new app icon image location

9 years agoFixing earlier commit wherein I lowercased some JS calls
Jay Sitter [Mon, 17 Nov 2014 21:54:15 +0000 (16:54 -0500)] 
Fixing earlier commit wherein I lowercased some JS calls

9 years agoRemoving app icons from previous locations
Jay Sitter [Mon, 17 Nov 2014 21:51:38 +0000 (16:51 -0500)] 
Removing app icons from previous locations

9 years agoMoving app icon images to /themes/_global/img/appicon/, updating Baggy and Default...
Jay Sitter [Mon, 17 Nov 2014 21:49:34 +0000 (16:49 -0500)] 
Moving app icon images to /themes/_global/img/appicon/, updating Baggy and Default themes to point there

9 years agoAdding/fixing favicon <link>s in Baggy theme header
Jay Sitter [Mon, 17 Nov 2014 19:28:07 +0000 (14:28 -0500)] 
Adding/fixing favicon <link>s in Baggy theme header

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 agoadd HTML documentation
Nicolas Lœuillet [Tue, 4 Nov 2014 07:33:05 +0000 (08:33 +0100)] 
add HTML documentation

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