moparisthebest/wallabag
1
0
Fork 0
mirror of https://github.com/moparisthebest/wallabag synced 2024-11-01 07:55:06 -04:00
Code Issues Releases Wiki Activity
1,022 Commits 13 Branches 34 Tags 42 MiB
7212386e98
Commit Graph

1022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
894c36ea32 what this f* F? 2013-10-07 14:00:45 +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
Nicolas Lœuillet
5eebe4e50d delete href 2013-10-07 13:06:10 +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
3352332f3f Merge branch 'dev' into custom_port 2013-10-07 12:39:29 +02:00
Nicolas Lœuillet
2621569200 missing } 2013-10-07 12:39:11 +02:00
Jean-Christophe Saad-Dupuy
93eed12505 Fixed typo 2013-10-07 12:31:46 +02:00
Jean-Christophe Saad-Dupuy
125f9ee838 Added support for custom ssl port 2013-10-07 12:30:40 +02:00
Nicolas Lœuillet
8df8eb6c95 Merge pull request #264 from jcsaaddupuy/dev 
Embeding jquery
 2013-10-07 00:31:42 -07:00
Nicolas Lœuillet
bf7516112f Embeded jquery 2.0.3 dependancie 2013-10-06 20:31:11 +02:00
Nicolas Lœuillet
5a26af476e Merge pull request #261 from NumEricR/toolbar-height 
Fix #255 : increase article toolbar height if necessary
 2013-10-06 11:07:24 -07: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
NumEricR
06fef43180 Fix #255 : increase article toolbar height if necessary 2013-10-05 10:51:25 +02:00
Nicolas Lœuillet
01e671f4d1 Merge pull request #256 from inthepoche/dev 
merge 1.0.0
 2013-10-03 10:14:54 -07:00
Nicolas Lœuillet
d47d2533ac change doc link 2013-10-03 19:03:52 +02:00
Nicolas Lœuillet
27a74816da change export link 2013-10-03 18:33:20 +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
07ae20eeed change reading time displaying 2013-10-03 14:17:45 +02:00
Nicolas Lœuillet
4cc3c2ac17 embed themes 2013-10-03 14:10:44 +02:00
Nicolas Lœuillet
66e074b43d remove themes 2013-10-03 14:09:58 +02:00
Nicolas Lœuillet
eb44ca4213 embed themes with poche 2013-10-03 14:06:20 +02:00
Nicolas Lœuillet
dfbbc14b33 remove themes 2013-10-03 14:05:50 +02:00
Nicolas Lœuillet
34bf601a56 change submodule & gitignore 2013-10-03 13:59:52 +02:00
Nicolas Lœuillet
969a91a1e3 site_config is now embedded with poche 2013-10-03 13:48:58 +02:00
Nicolas Lœuillet
fbe8e27568 Merge pull request #250 from NumEricR/dl-export 
Force download on poche export
 2013-10-03 01:52:07 -07:00
NumEricR
4ee705a79c Add .htaccess file to force download of poche export 2013-09-28 11:15:35 +02:00
Nicolas Lœuillet
8623a53200 Merge pull request #245 from NumEricR/themes-list 
Avoid ".git" option in themes list of config page
 2013-09-27 02:19:26 -07: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
88e1108f11 upgrading themes 2013-09-20 14:30:07 +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
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