1
0
mirror of https://github.com/moparisthebest/wallabag synced 2024-11-11 03:45:09 -05:00
Commit Graph

266 Commits

Author SHA1 Message Date
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
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
NumEricR
7f9f5281e5 Add number of results next to pager 2013-08-28 21:23:26 +02:00
NumEricR
3eb049036e Add warning message when there is no entry in current view 2013-08-27 16:03:50 +02:00
NumEricR
093f1efb21 Update comment 2013-08-27 16:03:50 +02:00
Nicolas Lœuillet
7d1778bbd2 config file for tldp.org 2013-08-27 12:52:35 +02:00
Nicolas Lœuillet
5ebf6eeca1 add configuration to parse bfmtv.com 2013-08-27 11:05:57 +02:00
Nicolas Lœuillet
6fb4600334 fix bug #186: content was empty when enabling downloading pictures 2013-08-26 17:38:01 +02:00
Nicolas Lœuillet
ec3972361d poche now uses Full Text RSS to fetch content 2013-08-25 20:10:23 +02:00
Nicolas Lœuillet
d7c2f0cc47 fix bug #175 IP addresses do not appear in view original 2013-08-25 08:01:18 +02:00
Nicolas Lœuillet
217bacc663 Merge pull request #173 from EliasZ/dev
Graceful error-handling with imports and defining where import files are stored
2013-08-24 22:42:37 -07:00
nicofrand
149df445d6 Add IPv4 url support (and others beginning by a digit) 2013-08-24 16:50:28 +02:00
nicofrand
38b95e7be9 Add IPv4 url support (and others beginning by a digit) 2013-08-24 16:31:22 +02:00
EliasZ
66b6a3b5e2 graceful error-handling with imports, define where import files are stored 2013-08-24 15:59:51 +02:00
nicofrand
7374ff30ef Add IPv4 url support (and others beginning by a digit) 2013-08-24 11:10:07 +02:00
Nicolas Lœuillet
679b6b85ad preparing to beta4 2013-08-23 22:43:16 +02:00
Nicolas Lœuillet
6d7defc87c new messages when update / install 2013-08-23 22:24:41 +02:00
Nicolas Lœuillet
b64a882696 notice with poche_version undefined' 2013-08-23 21:30:55 +02:00
Nicolas Lœuillet
70c39d1618 tabs2spaces 2013-08-23 21:07:32 +02:00
Nicolas Lœuillet
1e0f9166cc set shaarli to false 2013-08-23 19:49:17 +02:00
Nicolas Lœuillet
8340fedd64 fix bug #150 Add support of text files by setting a default title 2013-08-23 18:29:36 +02:00
Nicolas Frandeboeuf
57c91e427d Merge branch 'dev' of https://github.com/nicofrand/poche into dev 2013-08-22 00:57:11 +02:00
Nicolas Frandeboeuf
2bf93dc034 Fix #149 2013-08-22 00:49:23 +02:00
Nicolas Lœuillet
746f93c290 fix bug #148 Use of undefined constant POCHE_VERSION 2013-08-20 11:23:32 +02:00
Nicolas Lœuillet
abed0f2122 some precisons in updating poche 2013-08-16 20:40:31 +02:00
Nicolas Lœuillet
bb5a7d9ede updating script 2013-08-16 20:19:31 +02:00
Nicolas Lœuillet
0b05568c9f fix #138: change pattern to parse url with # 2013-08-15 11:46:40 +02:00
Nicolas Lœuillet
c0d321c1bf #136 error during readability import 2013-08-15 11:29:28 +02:00
Nicolas Lœuillet
4a2912880f more verif while installing 2013-08-15 10:54:14 +02:00
Nicolas Lœuillet
cd03b575df error msg when install folder exists 2013-08-12 14:27:51 +02:00
Nicolas Lœuillet
6a9e4bfc90 version number 2013-08-11 21:04:04 +02:00
Nicolas Lœuillet
b58e261db9 bug in downloading pictures : article content wasn't updated anymore 2013-08-09 23:30:20 +02:00
Nicolas Lœuillet
d8d1542e52 typo 2013-08-09 22:15:40 +02:00
Nicolas Lœuillet
6c15854448 Closed #111 : test of install folder moved before 2013-08-09 11:47:37 +02:00
Nicolas Lœuillet
d91787589b fix #113 - reading time 2013-08-09 08:25:16 +02:00
Nicolas Lœuillet
3d8bded89e debug false 2013-08-08 21:28:37 +02:00
Nicolas Lœuillet
5f9bff0f71 some urls weren't well parsed 2013-08-08 21:13:37 +02:00
Nicolas Lœuillet
a3436d4cba travis 2013-08-08 13:49:57 +02:00
Nicolas Lœuillet
07ee09f49a comments 2013-08-08 12:33:02 +02:00
Nicolas Lœuillet
ed06f04077 test if /install exists 2013-08-08 09:11:12 +02:00
Nicolas Lœuillet
77dea8a234 1.0 beta1 2013-08-07 20:05:14 +02:00
Nicolas Lœuillet
c7ec97ce98 cache to FALSE 2013-08-07 19:14:48 +02:00
Nicolas Lœuillet
b916bcfccc fixes for 1.0-beta 2013-08-07 19:14:28 +02:00
Nicolas Lœuillet
580d60b941 file to update from 0.x to 1.x \o/ 2013-08-07 15:46:17 +02:00
Nicolas Lœuillet
68857cea8c setup of storage 2013-08-07 14:38:58 +02:00
Nicolas Lœuillet
bc1ee8524e postgres 2013-08-07 14:24:07 +02:00
Nicolas Lœuillet
8d3275bee4 multi user 2013-08-06 15:51:48 +02:00
Nicolas Lœuillet
7ce7ec4c94 prepare to multi users 2013-08-06 14:18:03 +02:00
Nicolas Lœuillet
6fb3a2a185 move xsrf test 2013-08-05 22:50:00 +02:00
Nicolas Lœuillet
6a361945ea new design, pagination & more 2013-08-05 21:56:32 +02:00
Nicolas Lœuillet
55821e04c1 share email +twitter / class messages 2013-08-05 15:54:37 +02:00
Nicolas Lœuillet
3252078501 close #69: in the config page, you are notified of the release of a new version 2013-08-05 12:34:16 +02:00
Nicolas Lœuillet
7f959169b7 copy of poche.sqlite 2013-08-05 10:32:15 +02:00
Nicolas Lœuillet
a12832488d update poche.sqlite 2013-08-05 10:03:59 +02:00
Nicolas Lœuillet
a62788c61e #100: welcome to you, instapaper users 2013-08-05 09:43:33 +02:00
Nicolas Lœuillet
3208d538a7 mysql support 2013-08-05 08:54:42 +02:00
Nicolas Lœuillet
63c35580c7 twig implementation 2013-08-04 22:35:08 +02:00
Nicolas Lœuillet
c765c3679f import in poche and not in an external file 2013-08-04 21:42:46 +02:00
Nicolas Lœuillet
eb1af59219 refactoring 2013-08-04 20:58:31 +02:00
Nicolas Lœuillet
3ba5f81b7b twig implementation 2013-08-04 18:07:41 +02:00
Nicolas Lœuillet
4f5b44bd3b twig implementation 2013-08-03 19:26:54 +02:00
Nicolas Lœuillet
2b840e0cfb twig implementation 2013-08-03 08:57:35 +02:00
Nicolas Lœuillet
8cbb2a8802 twig implementation 2013-08-03 08:25:11 +02:00
Nicolas Lœuillet
afe60d614b remove file 2013-08-03 08:05:02 +02:00
Nicolas Lœuillet
161395d709 mv pochetool pochetools 2013-08-02 23:04:24 +02:00
Nicolas Lœuillet
5ffe5cf541 rename pocheTool -> pocheTools 2013-08-02 23:00:57 +02:00
Nicolas Lœuillet
8069e235fd move Twig in 3rdparty 2013-08-02 22:43:56 +02:00
Nicolas Lœuillet
a4565e88ed add Twig & refactor poche 2013-08-02 22:40:51 +02:00
Nicolas Lœuillet
f6c9baab3e rename myTool -> pocheTool and delete some stuff 2013-08-02 21:40:29 +02:00
Nicolas Lœuillet
408f3df28e URL is now encoded 2013-08-02 11:48:57 +02:00
Nicolas Lœuillet
2ee436eaa1 poche / pocket / bolsillo / Tasche & more 2013-08-02 10:39:03 +02:00
Nicolas Lœuillet
4d8bcc0c6b set demo mode to false 2013-07-31 19:58:14 +02:00
Nicolas Lœuillet
538cdfa883 fix #70: if demo mode, fields are filled 2013-07-31 19:37:14 +02:00
Nicolas Lœuillet
3db95a85de update external libs 2013-07-31 19:09:06 +02:00
Nicolas Lœuillet
6499b26ae8 demo mode (you can't update password in demo mode 2013-06-01 08:29:37 +02:00
Nicolas Lœuillet
aa8c9f2a32 Installation mode 2013-05-31 22:55:52 +02:00
nicosomb
baa8617364 update JSLikeHTMLElement 2013-04-24 08:27:55 +02:00
nicosomb
494e21b4da add tidy call to clean html output 2013-04-23 16:03:52 +02:00
nicosomb
0ace6cab0b Fix #47 - update Readability class (thx to http://code.fivefilters.org/php-readability/) 2013-04-23 15:57:23 +02:00
nicosomb
c1c9f252f7 display flash message in article view 2013-04-23 15:37:03 +02:00
nicosomb
2987031bc3 Fixed #73 - Can't Poch url with special caracter 2013-04-23 15:25:12 +02:00
nicosomb
3e7188185d Merge branch 'memiks-gestion_erreur_readability' into dev 2013-04-23 15:19:33 +02:00
memiks
cdcc8d2533 Remove debug on Readability output 2013-04-23 08:09:54 -05:00
memiks
ae9571694f Correction erreur sur le Self 2013-04-23 07:29:16 -05:00
memiks
4ddbd26787 Ajout du global msg et gestion du retour dans Readability 2013-04-23 07:22:19 -05:00
nicosomb
29c6fd4607 messages d'erreur si pas possible d'ajouter ou de supprimer un lien 2013-04-23 09:38:57 +02:00
nicosomb
69ca1455d1 v0.2.1 2013-04-23 08:08:42 +02:00
nicosomb
f0070a15e4 flash messages pour indiquer qu'une action s'est bien effectuée ou qu'il y a eu une erreur 2013-04-21 19:32:19 +02:00
nicosomb
6f87a19714 Fixed #64 - nettoyage de MyTool 2013-04-21 18:42:20 +02:00
nicosomb
44e77bfa24 Fixed #55 - export des données au format json 2013-04-21 18:09:25 +02:00
nicosomb
016989b79a contenu de la page de config 2013-04-21 13:11:14 +02:00
nicosomb
2cd263e0bd ajout d'url qui déconnait 2013-04-20 10:05:42 +02:00
nicosomb
682536a9e7 suppression fichier db.php 2013-04-19 15:47:20 +02:00
nicosomb
14890de35a création d'une classe store() pour gérer tout type de stockage : sqlite, file, mysql, etc. 2013-04-19 15:46:04 +02:00
nicosomb
ff4d8c8c1e tag 0.11 2013-04-19 13:38:16 +02:00
nicosomb
bf18db78b3 stockage de la version dans la config 2013-04-19 13:37:38 +02:00
nicosomb
a1953dff8f tout est recentré sur index.php 2013-04-19 11:41:12 +02:00
nicosomb
e4d2565e05 #4 - ajout système de connexion (login poche mot de passe poche pour l'instant) 2013-04-18 15:39:34 +02:00
nicosomb
d06f30ef93 Fixed #54 - récupération de l'id améliorée et utilisation de action_to_do() pour l'insertion dans l'import pocket 2013-04-18 10:15:46 +02:00
nicosomb
64458521c3 possibilité de désactiver la récupération des images d'un article 2013-04-18 09:43:08 +02:00
nicosomb
cb1348bc5c Fixed #53 - on ne passait pas d'id pour la création du répertoire d'images lors de l'import pocket 2013-04-18 08:25:15 +02:00
nicosomb
f0fc50119b Fixed #49 - test si non vide 2013-04-18 08:15:34 +02:00
nicosomb
07a192525d Fixed #44 - appel récursif de remove_directory() 2013-04-18 08:13:11 +02:00
nicosomb
d178419c66 README, CREDITS & chmod 2013-04-17 15:32:57 +02:00
nicosomb
1c182b6c9d téléchargement des images d'un article 2013-04-17 15:11:57 +02:00
nicosomb
4456315b21 les liens sont maintenant transformés en note de bas de page 2013-04-17 14:12:54 +02:00