Commit Graph

105 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 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 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 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
EliasZ db4767e22b config template its import section reflects defines 2013-08-24 16:03:49 +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
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 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 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 d9afe1abd7 Merge branch 'dev' of github.com:inthepoche/poche into dev 2013-08-23 21:15:39 +02:00
Nicolas Lœuillet ffc966d72f fix bug #151: HTML entities in titles are encoded twice 2013-08-23 21:06:45 +02:00
NumEricR 4b4afc7322 Add textual content on tools links 2013-08-23 18:45:34 +02:00
NumEricR 29773c9729 Fix HTML code of tools lists 2013-08-23 18:10:42 +02:00
Nicolas Lœuillet a458cff25e Merge pull request #159 from NumEricR/css-cleanup
CSS clean up on style.css file
2013-08-23 08:34:58 -07:00
Nicolas Frandeboeuf 00e4700abb Fix #157 2013-08-23 13:45:46 +02:00
NumEricR 096fb74bf1 CSS clean up on style.css file
Syntax homogenization (spaces, lowercase for hexa, ...)
Code refactoring
Simplification of some selectors
Simplification of "0px" and hexa values
More detailed font stack
Add cursor pointer on ".bouton" elements
2013-08-23 12:12:05 +02:00
Nicolas Lœuillet 38330bfd65 fix bug #112 link to shaarli 2013-08-20 11:23:00 +02:00
Nicolas Lœuillet 2021fc614e close #137 : Mixed content alert in HTTPS 2013-08-15 11:31:28 +02:00
Nicolas Lœuillet 4a2912880f more verif while installing 2013-08-15 10:54:14 +02:00
Nicolas Lœuillet 15493df62d fixed #114 : minimum & maximum scale removed 2013-08-11 19:42:52 +02:00
Nicolas Lœuillet 82051a6a6a fixed #128: back to home after mark a link as read is fixed 2013-08-11 19:10:48 +02:00
Nicolas Lœuillet 5bf30b0060 layout 2013-08-10 22:17:00 +02:00
Nicolas Lœuillet baea9b6de5 new logo 2013-08-10 21:39:11 +02:00
Nicolas Lœuillet fa0483b361 closed #120: top link 2013-08-10 12:21:36 +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 d91787589b fix #113 - reading time 2013-08-09 08:25:16 +02:00
Nicolas Lœuillet b916bcfccc fixes for 1.0-beta 2013-08-07 19:14:28 +02:00
Nicolas Lœuillet bc1ee8524e postgres 2013-08-07 14:24:07 +02:00
Nicolas Lœuillet 7ce7ec4c94 prepare to multi users 2013-08-06 14:18:03 +02:00
Nicolas Lœuillet 17a9cb9608 minify bookmarklet js 2013-08-06 11:00:42 +02:00
Nicolas Lœuillet d28a7ca30f remove js 2013-08-05 21:59:21 +02:00
Nicolas Lœuillet 6a361945ea new design, pagination & more 2013-08-05 21:56:32 +02:00
Nicolas Lœuillet 55821e04c1 share email +twitter / class messages 2013-08-05 15:54:37 +02:00