Commit Graph

173 Commits

Author SHA1 Message Date
Denis Sacchet df6afaf090 Added support for http_auth 2013-10-20 16:53:54 +02:00
Nicolas Lœuillet 0c994bd934 Merge branch 'dev' of https://github.com/inthepoche/poche into dev 2013-10-10 14:07:13 +02:00
Nicolas Lœuillet 18889e230a remove empty file 2013-10-10 14:06:53 +02:00
Nicolas Lœuillet e557b7bb44 Merge pull request #274 from NumEricR/select-theme
Update select theme filter and sort names (dev branch PR)
2013-10-08 23:33:48 -07:00
Nicolas Lœuillet 5188585864 Merge pull request #272 from jcsaaddupuy/custom_ssl_port
Custom ssl port
2013-10-08 03:48:49 -07:00
Nicolas Lœuillet 1e98ee1de0 bug fix: changing password was buggy 2013-10-07 14:56:21 +02:00
Nicolas Lœuillet 5011388f39 bug fix #215: change language from config screen 2013-10-07 14:26:25 +02:00
Jean-Christophe Saad-Dupuy 5e07dc8b51 Merge remote branch 'upstream/dev' into dev
Conflicts:
	themes/default/_head.twig
2013-10-07 14:25:24 +02:00
Nicolas Lœuillet 031df528b6 bug fix #268: move POCHE_VERSION in index.php and change the name to avoid conflicts when updating 2013-10-07 13:19:34 +02:00
Nicolas Lœuillet 9d3b88b379 bug fix #266: make installation steps easier 2013-10-07 13:12:28 +02:00
Jean-Christophe Saad-Dupuy 2916d24b20 Added support for custom SSL port 2013-10-07 12:47:13 +02:00
Jean-Christophe Saad-Dupuy 125f9ee838 Added support for custom ssl port 2013-10-07 12:30:40 +02:00
NumEricR 2287bf06f5 Sort themes alphabetically in config list 2013-10-05 11:08:38 +02:00
NumEricR 89812ec81c Remove useless filter on .git folder 2013-10-05 10:52:08 +02:00
Nicolas Lœuillet d47d2533ac change doc link 2013-10-03 19:03:52 +02:00
Nicolas Lœuillet 47baa1077e reopen #219 when archive last poched links from a page, redirect to an other page 2013-10-03 15:43:24 +02:00
Nicolas Lœuillet f0f7b94362 remove print_r 2013-10-03 14:53:08 +02:00
Nicolas Lœuillet 747c6698b6 Merge branch 'dev' of git://github.com/tcitworld/poche into tcitworld-dev 2013-10-03 14:51:20 +02:00
Nicolas Lœuillet 8f91e10faa preparing to 1.0.0 2013-10-03 14:51:04 +02:00
Nicolas Lœuillet 6cd8af85da bug fix #227: Deleting element in archive redirect to home 2013-10-03 14:48:53 +02:00
Nicolas Lœuillet 34d67c835e bug fix #219: when archive last poched links from a page, redirect to an other page 2013-10-03 14:46:46 +02:00
Nicolas Lœuillet 7f17a38d35 change instructions messages 2013-10-03 14:23:03 +02:00
Nicolas Lœuillet 969a91a1e3 site_config is now embedded with poche 2013-10-03 13:48:58 +02:00
Thomas Citharel 4e5b04113d Changed Flattr Caching System
From md5(url) to the ID of an article. Easier and faster.
2013-09-27 11:11:45 +02:00
NumEricR 3cc22aab82 Avoid ".git" option in themes list of config page 2013-09-26 23:37:07 +02:00
Thomas Citharel be2b9055b9 Changed url's encryption from base64 to md5
Fixes Issue #243.
md5 hashes are only coded on 32 hexadecimal characters, so it won't make
too long file names.
2013-09-26 22:00:44 +02:00
Nicolas Lœuillet 92cd6e9af8 change import files constants 2013-09-21 21:44:49 +02:00
Nicolas Lœuillet 58ace4941e bug fix #229: theme not stored on updated poches 2013-09-21 14:37:53 +02:00
Nicolas Lœuillet 37527034ab unactivate debug 2013-09-21 14:18:28 +02:00
Nicolas Lœuillet 3408ed48ba fix bug #225: blank page on article page 2013-09-20 14:09:26 +02:00
Nicolas Lœuillet b8c67f8068 remove define.inc.php 2013-09-20 13:48:29 +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 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
NumEricR 1b2abab6dd Add lang attribute in html tag 2013-09-14 10:06:59 +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 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 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
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