Commit Graph

374 Commits

Author SHA1 Message Date
Nicolas Lœuillet 79026b73a8 Merge pull request #226 from inthepoche/dev
beta5
2013-09-20 04:36:35 -07:00
Nicolas Lœuillet 6a6c1c1172 update themes submodule 2013-09-20 11:58:08 +02:00
Nicolas Lœuillet 18bd1cc3b1 update themes 2013-09-20 11:54:39 +02:00
Nicolas Lœuillet 74c0733c1e update themes 2013-09-20 11:50:19 +02:00
Nicolas Lœuillet f55f734fda remove themes 2013-09-20 11:35:46 +02:00
Nicolas Lœuillet d477db2cfb add themes 2013-09-20 11:32:19 +02:00
Nicolas Lœuillet 6fe07ab815 remove themes 2013-09-20 11:31:28 +02:00
Nicolas Lœuillet 1a1142893f remove themes 2013-09-20 11:30:53 +02:00
Nicolas Lœuillet 7bda34c66b help when sqlite file not found 2013-09-20 11:25:44 +02:00
Nicolas Lœuillet 2af5015668 remove config.inc.php 2013-09-20 11:05:12 +02:00
Nicolas Lœuillet 5801355cbc chmod & mail address 2013-09-20 11:04:36 +02:00
Nicolas Lœuillet d6b28d43c8 update themes 2013-09-20 11:00:33 +02:00
Nicolas Lœuillet 6d7e6f5e36 themes submodule 2013-09-20 10:58:53 +02:00
Nicolas Lœuillet 469590fde5 remove themes folder 2013-09-20 10:55:46 +02:00
Nicolas Lœuillet 00dbaf90bc merge #224 2013-09-20 10:21:39 +02:00
Nicolas Lœuillet 705250b93d fixes with new session class 2013-09-20 09:32:49 +02:00
Nicolas Lœuillet 0d64be15de remove csrf check 2013-09-18 09:25:28 +02:00
Nicolas Lœuillet f6597c7cb9 fix bug #127: update session class 2013-09-17 14:48:16 +02:00
Nicolas Lœuillet a8778dc23e fix bug #105: Scroll position save / sync 2013-09-17 13:27:16 +02:00
Nicolas Lœuillet d62dfd88d2 Merge pull request #221 from NumEricR/language
Fix #183: language declaration
2013-09-15 10:12:56 -07:00
NumEricR d081f272b0 Use dynamic lang value in IE conditional comments 2013-09-14 10:06:59 +02:00
NumEricR 1b2abab6dd Add lang attribute in html tag 2013-09-14 10:06:59 +02:00
NumEricR 10ab20d8e2 Fix missing lang in html tag of update pages 2013-09-14 10:06:59 +02:00
Nicolas Lœuillet 48207b6814 remove poche.js 2013-09-13 10:29:03 +02:00
Nicolas Lœuillet 1a08e7b6f6 titles with colon bad parsed 2013-09-13 09:01:33 +02:00
Nicolas Lœuillet b9523a0ba0 fix bug #209: titles with colon bad parsed 2013-09-12 19:28:59 +02:00
Nicolas Lœuillet 084ec2a63d change strings for gettext 2013-09-12 14:26:30 +02:00
Nicolas Lœuillet b9e0514783 update locale files 2013-09-12 13:24:09 +02:00
Nicolas Lœuillet 3e05742568 Merge branch 'dev' of https://github.com/inthepoche/poche into dev 2013-09-12 12:36:07 +02:00
Nicolas Lœuillet 660b998eb7 add english language 2013-09-12 12:28:22 +02:00
Nicolas Lœuillet b084cde854 Merge pull request #216 from NumEricR/css-icons
Move icon's no-repeat to common code and clean CSS
2013-09-10 21:43:46 -07:00
Nicolas Lœuillet 8ca368e7e3 fix flattr span 2013-09-11 06:40:29 +02:00
NumEricR a0fd7c5b44 Format CSS code 2013-09-10 23:54:40 +02:00
NumEricR 7eb64927cc Move icons no-repeat into common style 2013-09-10 23:54:18 +02:00
Nicolas Lœuillet 9074534c93 fix flattr span 2013-09-10 22:19:34 +02:00
Nicolas Lœuillet 12d9cfbcaa Merge branch 'Flattr' of git://github.com/tcitworld/poche into tcitworld-Flattr
Conflicts:
	inc/3rdparty/site_config
2013-09-10 19:22:47 +02:00
Nicolas Lœuillet f3a6080fce add site_config submodule 2013-09-10 18:50:42 +02:00
Nicolas Lœuillet f16b0747a4 remove site_config to manage them by a submodule 2013-09-10 18:28:17 +02:00
Thomas Citharel 964481d023 Fixed bugs, added a flattr button and an option
There's a button and an option in define.inc.php to show the button or
not.
2013-09-10 18:23:56 +02:00
Nicolas Lœuillet d143cae25a remove comments in poche_compatibility_test 2013-09-10 15:47:09 +02:00
Nicolas Lœuillet d11e2bcf48 change doc url 2013-09-10 15:46:05 +02:00
Nicolas Lœuillet 3c33e40b61 change email address in header 2013-09-10 15:43:01 +02:00
Nicolas Lœuillet eaf2c769be Merge branch 'dev' of https://github.com/inthepoche/poche into dev 2013-09-10 14:44:59 +02:00
Nicolas Lœuillet ce4a1dcc19 changes to add url directly from poche 2013-09-10 14:41:58 +02:00
Nicolas Lœuillet 2230a38cd6 Merge pull request #205 from NumEricR/less-is-more
Less is more :-)
2013-09-09 05:01:58 -07:00
Nicolas Lœuillet ef6051b95e Merge pull request #199 from NumEricR/nb-results
Add the number of results next to pager
2013-09-09 04:55:56 -07:00
Thomas Citharel af1d279226 Fixed errors and changed source of flattrs
Fixed errors, and the number displayed is no longer the number of peope
who has flattred an article, but the number of flattrs he has got.
2013-09-08 21:52:01 +02:00
Thomas Citharel d5ce28df67 Fixed bugs due to migration 2013-09-08 21:26:30 +02:00
Thomas Citharel 693b3f8677 Implemented Add Button
Added a button to add an URL when directly into Poche. If JS isn't
enabled, nothing happens.
2013-09-08 21:07:59 +02:00
Thomas Citharel a322312740 Implemented Flattr changes
Added a button to say if the article is flattrable or not and how many
people have flattred this object.
2013-09-08 20:54:11 +02:00