]>
git.immae.eu Git - github/wallabag/wallabag.git/log
etiess [Wed, 26 Nov 2014 13:07:27 +0000 (14:07 +0100)] 
Update wallabag_compatibility_test.php
Explain how to install Tidy
Thomas Citharel [Mon, 24 Nov 2014 21:56:10 +0000 (22:56 +0100)] 
Merge branch 'remove-courgette' into dev
Conflicts:
themes/courgette/_view.twig
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
Nicolas Lœuillet [Mon, 24 Nov 2014 12:11:57 +0000 (13:11 +0100)]
failover if theme folder doesn't exist
Thomas Citharel [Fri, 21 Nov 2014 21:15:17 +0000 (22:15 +0100)]
Merge pull request #942 from wallabag/carrot
implementing carrot into wallabag
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
Jay Sitter [Fri, 21 Nov 2014 21:07:15 +0000 (16:07 -0500)] 
Fixing icon text on unread page
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
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
Thomas Citharel [Wed, 19 Nov 2014 15:54:28 +0000 (16:54 +0100)]
fix merge confict
Thomas Citharel [Wed, 19 Nov 2014 15:40:36 +0000 (16:40 +0100)]
Merge pull request #943 from wallabag/fixFlattrs
fix Flattrs
Thomas Citharel [Wed, 19 Nov 2014 15:40:02 +0000 (16:40 +0100)]
default deactivated
Thomas Citharel [Wed, 19 Nov 2014 15:35:44 +0000 (16:35 +0100)]
fix Flattrs
Thomas Citharel [Wed, 19 Nov 2014 15:27:56 +0000 (16:27 +0100)]
implementing carrot into wallabag
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
Jay Sitter [Tue, 18 Nov 2014 15:07:32 +0000 (10:07 -0500)]
Updating Baggy theme's head.twig to locate _global js/css
Jay Sitter [Tue, 18 Nov 2014 15:01:37 +0000 (10:01 -0500)]
_global-izing some more js & css
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)
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
Jay Sitter [Mon, 17 Nov 2014 22:11:33 +0000 (17:11 -0500)]
Adjusting Template class so that _global is ignored as a theme
Jay Sitter [Mon, 17 Nov 2014 21:59:53 +0000 (16:59 -0500)]
Modifying Courgette theme to comply with new app icon image location
Jay Sitter [Mon, 17 Nov 2014 21:54:15 +0000 (16:54 -0500)]
Fixing earlier commit wherein I lowercased some JS calls
Jay Sitter [Mon, 17 Nov 2014 21:51:38 +0000 (16:51 -0500)]
Removing app icons from previous locations
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
Jay Sitter [Mon, 17 Nov 2014 19:28:07 +0000 (14:28 -0500)]
Adding/fixing favicon <link>s in Baggy theme header
Thomas Citharel [Sun, 16 Nov 2014 01:29:01 +0000 (02:29 +0100)]
update constant version
Nicolas Lœuillet [Sat, 8 Nov 2014 07:25:00 +0000 (08:25 +0100)]
add DS_Store in gitignore
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
Jay Sitter [Wed, 5 Nov 2014 16:22:22 +0000 (11:22 -0500)]
Fixing URL typo on 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
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
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
Jay Sitter [Mon, 3 Nov 2014 18:32:20 +0000 (13:32 -0500)]
Improving class names for menu hiding
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
Jay Sitter [Mon, 3 Nov 2014 17:06:44 +0000 (12:06 -0500)]
Applying changes to config.twig to default theme as well
Jay Sitter [Mon, 3 Nov 2014 14:13:42 +0000 (09:13 -0500)]
Removing title text from bookmarklet
Jay Sitter [Mon, 3 Nov 2014 14:11:25 +0000 (09:11 -0500)]
Restoring change password section in config
Nicolas Lœuillet [Mon, 3 Nov 2014 06:44:56 +0000 (07:44 +0100)]
add about page
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
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.
Jay Sitter [Sun, 2 Nov 2014 16:15:36 +0000 (11:15 -0500)]
Improving JavaScript for popup forms
Jay Sitter [Sun, 2 Nov 2014 15:30:13 +0000 (10:30 -0500)]
Removing spaces before colons on config screen
Jay Sitter [Sat, 1 Nov 2014 22:29:41 +0000 (18:29 -0400)]
Merge branch 'dev' into uitextcase
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)
Jay Sitter [Fri, 31 Oct 2014 19:38:25 +0000 (15:38 -0400)]
Changing my tabs to spaces :)
Jay Sitter [Fri, 31 Oct 2014 19:37:08 +0000 (15:37 -0400)]
Fixing opacity issue when using mobile menu
Jay Sitter [Fri, 31 Oct 2014 19:26:33 +0000 (15:26 -0400)]
Capitalizing "EPUB" as is defined by IDPF: http://idpf.org/epub
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
Jay Sitter [Fri, 31 Oct 2014 18:34:10 +0000 (14:34 -0400)]
Fixing regression in popup close button styling
tcit [Fri, 31 Oct 2014 17:54:20 +0000 (18:54 +0100)]
Merge branch 'jsit-duplicateformstyles' into dev
tcit [Fri, 31 Oct 2014 17:54:08 +0000 (18:54 +0100)]
fix merge errors
tcit [Fri, 31 Oct 2014 17:48:02 +0000 (18:48 +0100)]
Merge branch 'jsit-duplicateformstyles' into dev
tcit [Fri, 31 Oct 2014 17:47:54 +0000 (18:47 +0100)]
merge
Jay Sitter [Fri, 31 Oct 2014 17:47:45 +0000 (13:47 -0400)]
Merging changes with dev
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
Jay Sitter [Fri, 31 Oct 2014 17:32:34 +0000 (13:32 -0400)]
Removing left border on popup forms on mobile widths
Jay Sitter [Fri, 31 Oct 2014 17:28:39 +0000 (13:28 -0400)]
Fixing popup form width issue on narrow width
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
Jay Sitter [Fri, 31 Oct 2014 16:35:19 +0000 (12:35 -0400)]
Removing duplicate popup form styles
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
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
Jay Sitter [Fri, 31 Oct 2014 15:10:38 +0000 (11:10 -0400)]
Standardizing class names and styles for close buttons
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
Jay Sitter [Fri, 31 Oct 2014 14:44:20 +0000 (10:44 -0400)]
Changing close message button to use × instead of X
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'...
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)
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
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
Thomas Citharel [Fri, 31 Oct 2014 10:50:53 +0000 (11:50 +0100)]
Merge pull request #904 from wallabag/vagrantfile
Vagrantfile
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
Jay Sitter [Thu, 30 Oct 2014 20:54:24 +0000 (16:54 -0400)]
Uppercasing 'tags' page title
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
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)
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
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
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
Nicolas Lœuillet [Thu, 30 Oct 2014 19:43:39 +0000 (20:43 +0100)]
change database name
Nicolas Lœuillet [Thu, 30 Oct 2014 19:42:17 +0000 (20:42 +0100)]
ignore vagrant directory
Nicolas Lœuillet [Thu, 30 Oct 2014 19:40:56 +0000 (20:40 +0100)]
Vagrantfile, from @fguillot for kanboard
Jay Sitter [Thu, 30 Oct 2014 19:37:59 +0000 (15:37 -0400)]
Fixing some more text case issues
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)
Jay Sitter [Thu, 30 Oct 2014 19:32:00 +0000 (15:32 -0400)]
Adding 'en_US' locale (issue #901)
Jay Sitter [Thu, 30 Oct 2014 19:30:09 +0000 (15:30 -0400)]
Adding 'en_US' locale (issue #901)
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)
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)
Jay Sitter [Thu, 30 Oct 2014 15:23:18 +0000 (11:23 -0400)]
Fixing issue #874, displaying preview text when in list mode
Jay Sitter [Thu, 30 Oct 2014 15:20:05 +0000 (11:20 -0400)]
Fixing display mode switching in Baggy theme (issue #896)
Nicolas Lœuillet [Wed, 29 Oct 2014 20:02:07 +0000 (21:02 +0100)]
change type for password field in installation
Nicolas Lœuillet [Mon, 27 Oct 2014 19:58:13 +0000 (20:58 +0100)]
Merge pull request #889 from wallabag/fix#871
Fix#871
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
tcit [Mon, 27 Oct 2014 13:00:47 +0000 (14:00 +0100)]
translation fix for #887 and tiny display fix
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
Nicolas Lœuillet [Mon, 27 Oct 2014 05:46:13 +0000 (06:46 +0100)]
updated site_config
Nicolas Lœuillet [Wed, 22 Oct 2014 13:12:49 +0000 (15:12 +0200)]
Merge pull request #883 from wallabag/hotfixepub
fix #882
tcit [Wed, 22 Oct 2014 13:10:38 +0000 (15:10 +0200)]
fix #882
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
Marmo [Tue, 21 Oct 2014 17:33:40 +0000 (19:33 +0200)] 
update zeit.de.txt for removal of inline ads
Nicolas Lœuillet [Mon, 20 Oct 2014 13:07:24 +0000 (15:07 +0200)]
Merge pull request #878 from wallabag/greybuttonread
fix #873
tcit [Sun, 19 Oct 2014 09:12:25 +0000 (11:12 +0200)]
fix #873
tcit [Fri, 17 Oct 2014 19:08:08 +0000 (21:08 +0200)]
fix translation issues
projects / github / wallabag / wallabag.git / log
