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

23 Commits

Author SHA1 Message Date
Nicolas Lœuillet
07a5909d73 Merge branch 'dev' of github.com:inthepoche/poche into dev 2013-08-25 20:10:34 +02:00
Nicolas Lœuillet
fccd59e2e3 fix display message for import 2013-08-25 20:08:07 +02:00
NumEricR
e6ba035911 Add bookmarklet id in config page 2013-08-25 16:57:37 +02:00
NumEricR
a4990dd294 Externalize bookmarklet style 2013-08-25 16:42:04 +02:00
EliasZ
db4767e22b config template its import section reflects defines 2013-08-24 16:03:49 +02:00
Nicolas Lœuillet
38b418b7d6 resolve conflicts 2013-08-23 23:18:36 +02:00
Nicolas Frandeboeuf
fd99a8c02d Revert "Add SHAARLI support to view template"
This reverts commit 0269cd8213.
2013-08-23 23:09:43 +02:00
nicofrand
0269cd8213 Add SHAARLI support to view template 2013-08-23 23:05:45 +02:00
nicofrand
cb844c4238 Restore config modifications related to #162 2013-08-23 22:52:37 +02:00
nicofrand
258d7032bb Clean up the templates markup 2013-08-23 22:38:14 +02:00
Nicolas Frandeboeuf
f3e4f109a3 Revert "Clean markup in templates"
This reverts commit 8413a63f7d.
2013-08-23 22:23:55 +02:00
Nicolas Frandeboeuf
8413a63f7d Clean markup in templates 2013-08-23 22:20:04 +02:00
Nicolas Lœuillet
3008e36a3e fix bug #162 links to firefox / chrome / android apps 2013-08-23 22:01:17 +02:00
Nicolas Lœuillet
56ab22d02c only display latest dev version if DEBUG is on 2013-08-09 13:05:35 +02:00
Nicolas Lœuillet
6a361945ea new design, pagination & more 2013-08-05 21:56:32 +02:00
Nicolas Lœuillet
4d0e254491 link to download poche when update available 2013-08-05 12:39:24 +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
a62788c61e #100: welcome to you, instapaper users 2013-08-05 09:43:33 +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
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