Commit Graph

1100 Commits

Author SHA1 Message Date
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
Nicolas Lœuillet f2248e604d Merge pull request #878 from wallabag/greybuttonread
fix #873
2014-10-20 15:07:24 +02:00
tcit f56791e6c4 fix #873 2014-10-19 11:12:25 +02:00
tcit 750d904a16 fix translation issues 2014-10-17 21:08:08 +02:00
Nicolas Lœuillet 691a03f176 Merge pull request #868 from wallabag/popupoverlap
fix for #830
2014-10-15 16:53:06 +02:00
tcit 48fb171d7a fix for #830 2014-10-15 16:47:38 +02:00
Nicolas Lœuillet 8fd0512a3c Merge pull request #848 from 11mariom/dev
Add support for custom http port
2014-10-14 19:57:16 +02:00
Nicolas Lœuillet 5b16d508b5 Merge pull request #843 from rros/mysql-utf8mb4
Convert the MySQL charset to utf8mb4 to support the full range of unicode
2014-10-14 19:56:50 +02:00
Nicolas Lœuillet 05e313ad28 Merge pull request #867 from wallabag/zindex-menu-bug
fix z-index-menu mobile view bug #834
2014-10-14 19:50:28 +02:00
tcit b9fa7d2c9c fix z-index-menu mobile view bug #834 2014-10-12 10:24:07 +02:00
Thomas Citharel 8ce508cab0 Create adme.ru.txt
Siteconfig
2014-10-12 10:00:35 +02:00
Thomas Citharel dffbec1c44 Merge pull request #865 from Marmo/patch-1
update heise.de.txt
2014-10-11 15:30:51 +02:00
Marmo ad0eccb4cd 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).
2014-10-11 15:22:53 +02:00
Nicolas Lœuillet 44d35257e8 Merge branch 'dev' 2014-10-10 13:33:54 +02:00
Nicolas Lœuillet cf8a5e1eed Merge branch 'master' into dev
Conflicts:
	index.php
2014-10-10 13:33:36 +02:00
Thomas Citharel 6b0894c66a Merge pull request #860 from wallabag/compatibility_file
Move compatibility file (fixes #858)
2014-10-08 21:36:51 +02:00
tcit a7058a5a13 Right redirect from the new path 2014-10-08 21:35:21 +02:00
Thomas Citharel 1403af5be3 Merge pull request #861 from wallabag/fix-query-sqlite-install
query for populate mysql/postgres was called when we choosed sqlite
2014-10-08 21:32:03 +02:00
Nicolas Lœuillet 20b4d7d621 query for populate mysql/postgres was called when we choosed sqlite 2014-10-08 21:23:34 +02:00
Nicolas Lœuillet 7331ed3e80 change href in install/index.php 2014-10-08 21:11:56 +02:00
Nicolas Lœuillet 79dd109e37 Fixes #858: move compatibility file into install folder 2014-10-08 21:08:21 +02:00
Thomas Citharel a305326973 Merge pull request #787 from wallabag/data-for-mysql
Add data for mysql installation, see #624
2014-10-08 19:32:39 +02:00
tcit 3dca040a0b Fix bug for #787 2014-10-08 19:31:15 +02:00