Commit graph

782 commits

Author SHA1 Message Date
Nicolas Lœuillet
58f6269f36 Merge pull request #439 from flolauck/master
Adding .htaccess files to prohibit access to critical directories, e.g., db/
2014-02-10 12:10:08 +01:00
Florian Lauck
3a68883ae9 Adding .htaccess files to prohibit access to critical directories, e.g., db/ 2014-02-10 08:58:21 +01:00
Nicolas Lœuillet
211ed48361 Merge pull request #435 from mariroz/dev
Polish and Ukrainian translations added. Russian - updated. Plust 2 smal...
2014-02-07 18:41:30 +01:00
Maryana Rozhankivska
c515ffec9c Polish and Ukrainian translations added. Russian - updated. Plust 2 small translation related fixes in code. 2014-02-07 17:49:27 +02:00
Nicolas Lœuillet
4e09039d2c Merge pull request #434 from thomaslebeau/theme-courgette
Theme courgette
2014-02-07 09:41:42 +01:00
Thomas LEBEAU
1e1e4e4eca [remove] fontello theme courgette 2014-02-07 00:08:58 +01:00
Thomas LEBEAU
c8265d95b0 [add] maj theme courgette : ajout tag 2014-02-07 00:07:54 +01:00
Nicolas Lœuillet
2e384abab6 Merge pull request #428 from mariroz/dev
all locale files re-compiled: fix of #416 Some language problems in the ...
2014-02-04 02:13:32 -08:00
Maryana Rozhankivska
736a4fb77e all locale files re-compiled: fix of #416 Some language problems in the french Config Page 2014-02-04 11:52:03 +02:00
Nicolas Lœuillet
38dafee05d Merge pull request #427 from wallabag/dev
changelog 1.4
2014-02-03 10:03:41 -08:00
nicosomb
fa0bfb775a [fix] #389 Empty article title (blank title tag) 2014-02-03 17:11:14 +01:00
Nicolas Lœuillet
445a1a1c8d [fix] Add support for X-Forwarded-Proto header field #413 2014-02-03 12:46:09 +01:00
Nicolas Lœuillet
1e1fd6f24d [add] link to test file when we install wallabag #392 2014-02-03 12:43:34 +01:00
Nicolas Lœuillet
a678f9df38 [fix] #421 Tables content in solarized themes unreadable 2014-02-03 12:34:28 +01:00
Nicolas Lœuillet
f85bfdf186 Merge branch 'dev' of git://github.com/mariroz/wallabag into mariroz-dev 2014-02-03 11:56:01 +01:00
Lonnytunes
cae70cdbdb [fix] courgette theme: Old constant call, replaced by the new one. 2014-02-02 19:13:05 +01:00
Lonnytunes
ebae8c8315 [del] courgette theme: Useless templates because they are identical to those of default theme and so inherited from it. 2014-02-02 19:10:35 +01:00
Maryana Rozhankivska
6af66b1106 fix of bug #368 Endless redirects or user doesn't exist with basic authentication 2014-01-30 16:35:31 +02:00
Nicolas Lœuillet
f355d2c87f poche -> wallabag 2014-01-28 13:47:15 +01:00
Nicolas Lœuillet
f4fbfaa7cb some fix to courgette theme 2014-01-28 11:19:06 +01:00
Nicolas Lœuillet
21f50d5a08 changed some poche with wallabag 2014-01-28 11:08:21 +01:00
Nicolas Lœuillet
1b539ba1ec Merge branch 'extraction-with-basic-auth' of git://github.com/aaa2000/poche into aaa2000-extraction-with-basic-auth 2014-01-28 10:56:57 +01:00
Nicolas Lœuillet
3e0e7e1208 [fix] inthepoche.com => wallabag.org 2014-01-28 10:49:57 +01:00
Nicolas Lœuillet
b8fdd2d85f [fix] change twitter account for sharing entry 2014-01-28 10:37:37 +01:00
Nicolas Lœuillet
c95b78a8ce poche is dead, welcome wallabag 2014-01-28 10:36:04 +01:00
Nicolas Lœuillet
3ae345b3d7 Merge pull request #410 from Lonnytunes/dev
Fix: stops multiplication, in database, of a same user config item
2014-01-21 04:46:14 -08:00
Lonnytunes
d1d3498b62 [fix] Stops multiplication, in database, of a same user config item (error of variable name). 2014-01-20 00:44:51 +01:00
adev
f878daeb8b add basic auth in file_get_contents for content extraction when user use basic auth 2014-01-12 17:08:52 +01:00
Nicolas Lœuillet
9ba98a0abe [add] display token and user id 2014-01-12 17:06:52 +01:00
Nicolas Lœuillet
1cecaa7926 [add] display token and user id 2014-01-10 16:33:10 +01:00
Nicolas Lœuillet
2744d07d71 Merge branch 'dev' of https://github.com/inthepoche/poche into dev 2014-01-08 11:28:53 +01:00
Nicolas Lœuillet
5ed8050791 [add] courgette theme 2014-01-08 11:28:46 +01:00
Nicolas Lœuillet
c3b261e321 Merge pull request #391 from Newinx/master
Correction de bugs dans le schema mysql
2014-01-07 23:22:32 -08:00
Pierre
9ffce01e0c Correction de bugs dans le schema mysql
- users/name type de int a varchar
	- valeurs par defaut ajoutees pour entries/is_read et is_fav
2014-01-07 22:55:48 +01:00
Nicolas Lœuillet
8905191413 [add] import from poche, thank you @tsadiq #388 2014-01-07 20:21:43 +01:00
Nicolas Lœuillet
b4b22940df Merge pull request #387 from inthepoche/dev
poche 1.3.1
2014-01-07 04:20:23 -08:00
Nicolas Lœuillet
e1cf0fda27 [add] user_agent in file_get_contents 2014-01-07 13:15:43 +01:00
Nicolas Lœuillet
f41d00ed8a Merge branch 'dev' of https://github.com/inthepoche/poche into dev 2014-01-07 13:13:30 +01:00
Nicolas Lœuillet
d866e8be91 [change] poche logo is now at SVG format, see #373 2014-01-07 13:13:24 +01:00
Nicolas Lœuillet
be4c8197eb Merge pull request #381 from tcitworld/dev
Flattr Class : Bug 359
2014-01-06 10:07:29 -08:00
Nicolas Lœuillet
fcb5fd27e2 [change] update poche version in compatibility test file 2014-01-06 08:32:28 +01:00
Nicolas Lœuillet
9c9b226589 Merge pull request #382 from aaa2000/table_tags_entries_already_exists
Create sqlite table tags_entries only if not already exists
2014-01-05 10:39:44 -08:00
adev
a562e3905a Create sqlite table tags_entries only if not already exists 2014-01-05 15:03:05 +01:00
Thomas Citharel
607e12b4f2 Fixes bug 359 2014-01-04 21:50:08 +01:00
tcitworld
7f66783976 Merge pull request #1 from inthepoche/dev
Dev
2014-01-04 12:30:31 -08:00
Nicolas Lœuillet
2abcccb371 Merge branch 'dev' of https://github.com/inthepoche/poche into dev 2014-01-03 15:18:32 +01:00
Nicolas Lœuillet
9bc32632af [fix] #375 Readability.com changed its export format 2014-01-03 15:18:13 +01:00
Nicolas Lœuillet
52e3f58c72 Merge pull request #380 from F1reF0x/dev
Change Permissions in pochePictures.php
2014-01-03 02:20:40 -08:00
FireFox
b5c1ed1227 Change Permissions in pochePictures.php
Stored Pictures are not accessible (on my server), when permission is set to 0705, but instead, when using 0755 (or for example to 0715) all is working as expected. So maybe it would be good, considering in changing the permission of created directories in the assets directory
2014-01-03 11:17:15 +01:00
Nicolas Lœuillet
4d058d4824 [fix] code display when printing a page was buggy 2014-01-03 10:33:01 +01:00