aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authormarijus <mario@localhost.localdomain>2014-01-30 00:08:40 +0100
committermarijus <mario@localhost.localdomain>2014-01-30 00:08:40 +0100
commita58239b9a8d8c35fa0e0b916617fa53d1014da58 (patch)
tree4ebaf732d319efb80d9edebd941fb0be9e35cc06 /doc
parentb39475db86eca7b5e5615d377d8adc64e6a33056 (diff)
parentfe2b6f3dfb4a9473905dde49b7741a6c03699c23 (diff)
downloadvolse-hubzilla-a58239b9a8d8c35fa0e0b916617fa53d1014da58.tar.gz
volse-hubzilla-a58239b9a8d8c35fa0e0b916617fa53d1014da58.tar.bz2
volse-hubzilla-a58239b9a8d8c35fa0e0b916617fa53d1014da58.zip
Merge branch 'upstream'
Diffstat (limited to 'doc')
-rw-r--r--doc/To-Do-Code.md4
-rw-r--r--doc/bbcode.html6
2 files changed, 7 insertions, 3 deletions
diff --git a/doc/To-Do-Code.md b/doc/To-Do-Code.md
index 3baf08d40..5804801b4 100644
--- a/doc/To-Do-Code.md
+++ b/doc/To-Do-Code.md
@@ -17,7 +17,7 @@ We need much more than this, but here are areas where developers can help. Pleas
* (Advanced) create a UI for building Comanche pages
-* Help with WebDAV and file storage implementation, especially replacing the fugly Sabre web UI.
+* templatise and translate the Web interface to webDAV
* Extend WebDAV to provide desktop access to photo albums
@@ -25,7 +25,7 @@ We need much more than this, but here are areas where developers can help. Pleas
* service classes - account overview page showing resources consumed by channel. With special consideration this page can also be accessed at a meta level by the site admin to drill down on problematic accounts/channels.
-* Events module - bring back birthday reminders for friends, fix permissions on events, and provide JS translation support for the calendar overview
+* Events module - bring back birthday reminders for friends, fix permissions on events, and provide JS translation support for the calendar overview; integrate with calDAV
* Events module - event followups and RSVP
diff --git a/doc/bbcode.html b/doc/bbcode.html
index a24dd8b5d..d46f9d05a 100644
--- a/doc/bbcode.html
+++ b/doc/bbcode.html
@@ -1,5 +1,5 @@
<h3>BBcode reference</h3>
-<div style="font-size: 14px;">
+<div style="font-size: 14px; width=92%; max-width=1024px; display:block">
<br /><br />
<ul class="listdecimal" style="list-style-type: decimal;">
<li>[b]bold[/b] - <strong>bold</strong><br />
@@ -9,6 +9,10 @@
<li>[color=red]red[/color] - <span style="color: red;">red</span><br />
<li>[url=https://redmatrix.me]Red Matrix[/url] <a href="https://redmatrix.me">Red Matrix</a><br />
<li>[img]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] <img src="https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg" alt="Image/photo" /><br />
+<li>[img float=left]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] <img src="https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg" style="float:left;" alt="Image/photo" /><br />
+<div style="clear:both;"></div>
+<li>[img float=right]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] <img src="https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg" style="float:right;" alt="Image/photo" /><br />
+<div style="clear:both;"></div>
<li>[code]code[/code] <code>code</code><br />
<li>[quote]quote[/quote] <blockquote>quote</blockquote><br />
<li>[quote=Author]Author? Me? No, no, no...[/quote] <br /><strong class="author">Author wrote:</strong><blockquote>Author? Me? No, no, no...</blockquote><br />