Commit graph

1265 commits

Author SHA1 Message Date
Nicolas Lœuillet
b6b36e1b5a fix bug #182: Wrong title on favorites and archives pages 2013-08-26 17:18:08 +02:00
Nicolas Lœuillet
c51be6b697 Merge pull request #181 from inthepoche/dev
beta4
2013-08-25 12:12:53 -07:00
Nicolas Lœuillet
063fc1a7ba changelog in update 2013-08-25 21:10:01 +02:00
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
ec3972361d poche now uses Full Text RSS to fetch content 2013-08-25 20:10:23 +02:00
Nicolas Lœuillet
fccd59e2e3 fix display message for import 2013-08-25 20:08:07 +02:00
Nicolas Lœuillet
eb16ab407b Merge pull request #180 from NumEricR/externalize-css
Externalize some CSS code
2013-08-25 08:04:51 -07:00
NumEricR
e6ba035911 Add bookmarklet id in config page 2013-08-25 16:57:37 +02:00
NumEricR
8e1ed353bb Externalize top link style 2013-08-25 16:42:04 +02:00
NumEricR
a4990dd294 Externalize bookmarklet style 2013-08-25 16:42:04 +02:00
Nicolas Lœuillet
b4f5c46ab0 doc updated 2013-08-25 13:04:03 +02:00
Nicolas Lœuillet
6fa7d08860 poche compatibility test file 2013-08-25 12:40:16 +02:00
Nicolas Lœuillet
3044b21eb6 title page in article view was wrong 2013-08-25 08:49:21 +02:00
Nicolas Lœuillet
d7e8dd590c links to original article were wrong 2013-08-25 08:43:22 +02:00
Nicolas Lœuillet
b66802446d contributing.md updated 2013-08-25 08:32:58 +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
27574abf46 README updated with languages 2013-08-25 08:00:51 +02:00
Nicolas Lœuillet
e6a8dd60af Merge pull request #169 from NumEricR/entries-height
Entries height with short description
2013-08-24 22:44:09 -07:00
Nicolas Lœuillet
1cbd70639c Merge pull request #170 from NumEricR/login-button
Login button
2013-08-24 22:43:16 -07: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
Nicolas Lœuillet
83954e711d Merge pull request #174 from nicofrand/dev
Add support for URLS with digits
2013-08-24 22:36:26 -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
db4767e22b config template its import section reflects defines 2013-08-24 16:03:49 +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
NumEricR
06cf8fb963 Fix login button wording 2013-08-24 10:27:33 +02:00
NumEricR
6a7d779024 Fix issue on entries' height 2013-08-24 09:56:59 +02:00
NumEricR
5ae45084dc CSS clean up again 2013-08-24 09:53:02 +02:00
Nicolas Lœuillet
38b418b7d6 resolve conflicts 2013-08-23 23:18:36 +02:00
nicofrand
fa5f9764ae Add SHAARLI support to view template 2013-08-23 23:11:34 +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
Nicolas Lœuillet
d29b3e5f9e changes in md files 2013-08-23 23:04:56 +02:00
nicofrand
cb844c4238 Restore config modifications related to #162 2013-08-23 22:52:37 +02:00
Nicolas Lœuillet
679b6b85ad preparing to beta4 2013-08-23 22:43:16 +02:00
nicofrand
258d7032bb Clean up the templates markup 2013-08-23 22:38:14 +02:00
Nicolas Lœuillet
6d7defc87c new messages when update / install 2013-08-23 22:24:41 +02:00
Nicolas Frandeboeuf
b548b2192c Clean markup 2013-08-23 22:24:11 +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
76beb27135 new default content in poche.sqlite 2013-08-23 22:12:37 +02:00
Nicolas Lœuillet
12c9c72984 text in shaarli link 2013-08-23 22:05:14 +02:00
Nicolas Lœuillet
cf9e886076 encode url to share with twitter / email / shaarli 2013-08-23 22:04:09 +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
b64a882696 notice with poche_version undefined' 2013-08-23 21:30:55 +02:00
Nicolas Lœuillet
8be8c44596 gitignore 2013-08-23 21:17:41 +02:00
Nicolas Lœuillet
b48fd706b7 assets directory 2013-08-23 21:16:37 +02:00
Nicolas Lœuillet
d9afe1abd7 Merge branch 'dev' of github.com:inthepoche/poche into dev 2013-08-23 21:15:39 +02:00
Nicolas Lœuillet
70c39d1618 tabs2spaces 2013-08-23 21:07:32 +02:00