1062 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Thomas Citharel	8a76674568	Merge pull request #913 from jsit/hotfix ... Fixing regression in popup close button styling	2014-10-31 19:35:35 +01:00
Jay Sitter	40800c97b2	Fixing regression in popup close button styling	2014-10-31 14:34:10 -04:00
tcit	6926f6dcc7	Merge branch 'jsit-duplicateformstyles' into dev	2014-10-31 18:54:20 +01:00
tcit	a63cd1b06f	fix merge errors	2014-10-31 18:54:08 +01:00
tcit	9cf370cfb6	Merge branch 'jsit-duplicateformstyles' into dev	2014-10-31 18:48:02 +01:00
tcit	ccaefcf69a	merge	2014-10-31 18:47:54 +01:00
Jay Sitter	15eb5ca4b8	Merging changes with dev	2014-10-31 13:47:45 -04:00
Thomas Citharel	224528f1de	Merge pull request #909 from jsit/closebutton ... Standardizing class names and styles for close buttons	2014-10-31 18:44:42 +01:00
Jay Sitter	ad2b61db80	Removing left border on popup forms on mobile widths	2014-10-31 13:32:34 -04:00
Jay Sitter	344c8f6b5c	Fixing popup form width issue on narrow width	2014-10-31 13:28:39 -04:00
Jay Sitter	4bc70ed401	Making visual styling of search and bag it popup forms more consistent	2014-10-31 12:48:35 -04:00
Jay Sitter	b95a6f57bf	Removing duplicate popup form styles	2014-10-31 12:37:54 -04:00
Thomas Citharel	87e37e82fd	Merge pull request #910 from jsit/default-theme-search-form-css ... Moving search-form style out of messages css and into style.css	2014-10-31 17:34:03 +01:00
Jay Sitter	8519cc796f	Moving search-form style out of messages css and into style.css	2014-10-31 12:31:13 -04:00
Jay Sitter	827bd1f899	Standardizing class names and styles for close buttons	2014-10-31 11:10:38 -04:00
Thomas Citharel	ed0436d21e	Merge pull request #908 from jsit/closemessage ... Changing close message button to use × instead of X	2014-10-31 16:10:16 +01:00
Jay Sitter	242746fd17	Changing close message button to use × instead of X	2014-10-31 10:44:20 -04:00
Thomas Citharel	f23fd0ee5e	Merge pull request #907 from jsit/login ... Some small design tweaks to the login page: Moving 'Stay signed in'...	2014-10-31 15:10:01 +01:00
Jay Sitter	1087b3cb4e	Adding right margin to labels (to compensate for now-missing left margin on input fields)	2014-10-31 09:53:01 -04:00
Jay Sitter	f60c9b00ab	Some small design tweaks to the login page: Moving 'Stay signed in' label and removing left margin on input boxes	2014-10-31 09:30:57 -04:00
Thomas Citharel	6fe9b616aa	Merge pull request #894 from wallabag/change-password-field ... Fix #891: change type for password field in installation	2014-10-31 11:51:13 +01:00
Thomas Citharel	655550e23a	Merge pull request #904 from wallabag/vagrantfile ... Vagrantfile	2014-10-31 11:50:53 +01:00
Nicolas Lœuillet	4bada2b954	Merge pull request #906 from jsit/tagstitle ... Uppercasing 'tags' page title	2014-10-30 21:55:46 +01:00
Jay Sitter	a87a1b7d3b	Uppercasing 'tags' page title	2014-10-30 16:54:24 -04:00
Nicolas Lœuillet	4fae3b0a85	Merge pull request #898 from jsit/previewtext ... Fixing issue #874, displaying preview text when in list mode	2014-10-30 21:43:21 +01:00
Nicolas Lœuillet	052bdfc17e	Merge pull request #897 from jsit/displaymode ... Fixing display mode switching in Baggy theme (issue #896)	2014-10-30 21:43:15 +01:00
Nicolas Lœuillet	476b8902bb	Merge pull request #905 from jsit/closebutton ... Making the close button more visually consistent on the menu popup forms	2014-10-30 21:25:26 +01:00
Nicolas Lœuillet	6f0b92138f	Merge pull request #903 from jsit/uitextcase ... Fixing some more text case issues	2014-10-30 21:08:11 +01:00
Jay Sitter	cd271fc485	Making the close button more visually consistent on the menu popup forms	2014-10-30 16:00:18 -04:00
Nicolas Lœuillet	0bf65303ca	change database name	2014-10-30 20:43:39 +01:00
Nicolas Lœuillet	c4800fc6da	ignore vagrant directory	2014-10-30 20:42:17 +01:00
Nicolas Lœuillet	d51c2e05d3	Vagrantfile, from @fguillot for kanboard	2014-10-30 20:40:56 +01:00
Jay Sitter	ce096afed7	Fixing some more text case issues	2014-10-30 15:37:59 -04:00
Nicolas Lœuillet	06e7e7ff7b	Merge pull request #902 from jsit/en_us ... Adding 'en_US' locale (issue #901)	2014-10-30 20:34:08 +01:00
Jay Sitter	bbbda080bf	Adding 'en_US' locale (issue #901)	2014-10-30 15:32:00 -04:00
Jay Sitter	574f3faf06	Adding 'en_US' locale (issue #901)	2014-10-30 15:30:09 -04:00
Thomas Citharel	b56c86457c	Merge pull request #900 from jsit/uitextcase ... Fixing a bunch of English translation letter casing and syntax (issue #899)	2014-10-30 18:37:58 +01:00
Jay Sitter	7212386e98	Fixing a bunch of English translation letter casing and syntax (issue #899)	2014-10-30 12:17:26 -04:00
Jay Sitter	b73a175386	Fixing issue #874, displaying preview text when in list mode	2014-10-30 11:23:18 -04:00
Jay Sitter	c9e6fec4bf	Fixing display mode switching in Baggy theme (issue #896)	2014-10-30 11:20:05 -04:00
Nicolas Lœuillet	fcd37d0c7b	change type for password field in installation	2014-10-29 21:02:07 +01:00
Nicolas Lœuillet	b40cd4e73f	Merge pull request #889 from wallabag/fix#871 ... Fix#871	2014-10-27 20:58:13 +01:00
tcit	1b6e21d7a6	translation fix finished for #871 and bring add tag from search feature to all themes	2014-10-27 15:12:46 +01:00
tcit	7ee1972599	translation fix for #887 and tiny display fix	2014-10-27 14:00:47 +01:00
Thomas Citharel	24479b479d	Merge pull request #888 from wallabag/updated-site-config ... updated site_config	2014-10-27 09:28:30 +01:00
Nicolas Lœuillet	90a1a78b1e	updated site_config	2014-10-27 06:46:13 +01:00
Nicolas Lœuillet	4a50075784	Merge pull request #883 from wallabag/hotfixepub ... fix #882	2014-10-22 15:12:49 +02:00
tcit	606bea72e1	fix #882	2014-10-22 15:10:38 +02:00
Thomas Citharel	4eb603430d	Merge pull request #879 from Marmo/patch-1 ... update zeit.de.txt for removal of inline ads	2014-10-21 19:42:21 +02:00
Marmo	76b1e0babe	update zeit.de.txt for removal of inline ads	2014-10-21 19:33:40 +02:00