f85bfdf186
Merge branch 'dev' of git://github.com/mariroz/wallabag into mariroz-dev
2014-02-03 11:56:01 +01:00
cae70cdbdb
[fix] courgette theme: Old constant call, replaced by the new one.
2014-02-02 19:13:05 +01:00
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
6af66b1106
fix of bug #368 Endless redirects or user doesn't exist with basic authentication
2014-01-30 16:35:31 +02:00
f4fbfaa7cb
some fix to courgette theme
2014-01-28 11:19:06 +01:00
21f50d5a08
changed some poche with wallabag
2014-01-28 11:08:21 +01:00
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
3e0e7e1208
[fix] inthepoche.com => wallabag.org
2014-01-28 10:49:57 +01:00
b8fdd2d85f
[fix] change twitter account for sharing entry
2014-01-28 10:37:37 +01:00
c95b78a8ce
poche is dead, welcome wallabag
2014-01-28 10:36:04 +01:00
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
d1d3498b62
[fix] Stops multiplication, in database, of a same user config item (error of variable name).
2014-01-20 00:44:51 +01:00
f878daeb8b
add basic auth in file_get_contents for content extraction when user use basic auth
2014-01-12 17:08:52 +01:00
9ba98a0abe
[add] display token and user id
2014-01-12 17:06:52 +01:00
1cecaa7926
[add] display token and user id
2014-01-10 16:33:10 +01:00
2744d07d71
Merge branch 'dev' of https://github.com/inthepoche/poche into dev
2014-01-08 11:28:53 +01:00
5ed8050791
[add] courgette theme
2014-01-08 11:28:46 +01:00
c3b261e321
Merge pull request #391 from Newinx/master
...
Correction de bugs dans le schema mysql
2014-01-07 23:22:32 -08:00
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
8905191413
[add] import from poche, thank you @tsadiq #388
2014-01-07 20:21:43 +01:00
b4b22940df
Merge pull request #387 from inthepoche/dev
...
poche 1.3.1
2014-01-07 04:20:23 -08:00
e1cf0fda27
[add] user_agent in file_get_contents
2014-01-07 13:15:43 +01:00
f41d00ed8a
Merge branch 'dev' of https://github.com/inthepoche/poche into dev
2014-01-07 13:13:30 +01:00
d866e8be91
[change] poche logo is now at SVG format, see #373
2014-01-07 13:13:24 +01:00
be4c8197eb
Merge pull request #381 from tcitworld/dev
...
Flattr Class : Bug 359
2014-01-06 10:07:29 -08:00
fcb5fd27e2
[change] update poche version in compatibility test file
2014-01-06 08:32:28 +01:00
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
a562e3905a
Create sqlite table tags_entries only if not already exists
2014-01-05 15:03:05 +01:00
607e12b4f2
Fixes bug 359
2014-01-04 21:50:08 +01:00
7f66783976
Merge pull request #1 from inthepoche/dev
...
Dev
2014-01-04 12:30:31 -08:00
2abcccb371
Merge branch 'dev' of https://github.com/inthepoche/poche into dev
2014-01-03 15:18:32 +01:00
9bc32632af
[fix] #375 Readability.com changed its export format
2014-01-03 15:18:13 +01:00
52e3f58c72
Merge pull request #380 from F1reF0x/dev
...
Change Permissions in pochePictures.php
2014-01-03 02:20:40 -08:00
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
4d058d4824
[fix] code display when printing a page was buggy
2014-01-03 10:33:01 +01:00
cb4fba5a33
[del] remove inthepoche.com config file, website has changed
2014-01-03 10:22:12 +01:00
4a84d94e91
[add] config file for interviewmagazine.com
2014-01-03 10:21:18 +01:00
0b57c6825a
[fix] bugs #374 and #376 - encoding in rss
2014-01-03 10:15:05 +01:00
529db4861d
Merge branch 'dev' of https://github.com/inthepoche/poche into dev
2014-01-03 10:06:33 +01:00
9de34d4e84
[fix] error in query to get entries and tags
2014-01-03 10:06:26 +01:00
d7ad5d6560
Merge pull request #379 from williamtheaker/dev
...
Minor changes to tag edit and config pages
2014-01-02 21:54:50 -08:00
aeea7c6af0
Updated config page
2014-01-02 21:15:41 -05:00
b1bfd4cb0c
Updated tag edit page
2014-01-02 21:04:56 -05:00
2eb111a300
Merge pull request #370 from DmitrySandalov/dev
...
docs link, typos
2013-12-28 05:04:45 -08:00
76e487cd7e
docs link, typos
2013-12-28 11:47:10 +04:00
60fc4f4b1a
Merge pull request #363 from inthepoche/dev
...
poche 1.3.0
2013-12-23 02:28:56 -08:00
da5fc42f61
[fix] bug with queries when postgresql is used
2013-12-23 11:23:12 +01:00
1151e9cc8f
[add] availability to regenerate feed token
2013-12-23 11:01:41 +01:00
dfde415198
[change] install doc
2013-12-23 10:45:16 +01:00
e2b83a8298
[change] 1.3, let's rock baby
2013-12-23 10:44:22 +01:00
