 Mario Vavti
|
afffbb6487
|
go live with wiki mimetypes - you can now choose if a wiki will contain markdown or bb-code markup
|
2016-11-30 13:30:50 +01:00 |
|
|
Mario Vavti
|
53e4b55ea3
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-11-30 10:57:04 +01:00 |
|
 zotlabs
|
175ae58563
|
highlight
|
2016-11-29 14:27:55 -08:00 |
|
|
Mario Vavti
|
f32f7d2308
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-11-29 13:38:59 +01:00 |
|
|
zotlabs
|
3ed6d82367
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-11-29 02:57:58 -08:00 |
|
|
zotlabs
|
793047919d
|
missed this from the earlier checkin
|
2016-11-29 02:57:29 -08:00 |
|
|
Mario Vavti
|
6a786342f9
|
rename function
|
2016-11-29 10:46:04 +01:00 |
|
|
Mario Vavti
|
d184b3fa86
|
more work on wiki mimetypes
|
2016-11-29 10:33:46 +01:00 |
|
|
Mario Vavti
|
91e97468a0
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-11-29 10:13:47 +01:00 |
|
|
zotlabs
|
b66aeea384
|
minor re-arrange
|
2016-11-28 14:00:34 -08:00 |
|
|
Mario Vavti
|
f9b732482d
|
some basic work for implementing mimetypes for wikis
|
2016-11-28 15:24:49 +01:00 |
|
|
git-marijus
|
683a09781a
|
Merge pull request #602 from anaqreon/doco
Update context help content and context page element focus feature.
|
2016-11-28 13:44:41 +01:00 |
|
|
Mario Vavti
|
1ce4eda0b9
|
wiki: move delete page functionality to the widget
|
2016-11-28 11:29:10 +01:00 |
|
 Andrew Manning
|
678239424a
|
Integrating lots of member guide content
|
2016-11-27 16:46:24 -07:00 |
|
|
Andrew Manning
|
369dc295b1
|
Add some identity-aware parsing to HTML content using parseIdentityAwareHTML()
|
2016-11-27 14:48:06 -07:00 |
|
|
Andrew Manning
|
7470b1180e
|
Add ability to include page assets in documentation pages such as images. Updated Personal Channel tutorial to use local images using this new capability.
|
2016-11-27 13:43:07 -07:00 |
|
|
Mario Vavti
|
0ff24b6f21
|
whitespace and minor fixes
|
2016-11-23 13:49:24 +01:00 |
|
|
zotlabs
|
5c5d45f52b
|
missing plugins in zot-info
|
2016-11-22 16:33:00 -08:00 |
|
|
zotlabs
|
11b4d98f37
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-11-22 14:18:58 -08:00 |
|
|
zotlabs
|
6e016c439c
|
db update required for Zot2
|
2016-11-22 14:15:33 -08:00 |
|
|
Mario Vavti
|
9b5e6a1f7a
|
use plural since we can have more than one wiki
|
2016-11-22 15:27:26 +01:00 |
|
|
Mario Vavti
|
060982adb4
|
display wiki list on wiki landing page.
|
2016-11-22 11:30:04 +01:00 |
|
|
zotlabs
|
bc95b2fc77
|
wrong function
|
2016-11-21 14:38:02 -08:00 |
|
|
zotlabs
|
f926915e56
|
zot: specify crypto method
|
2016-11-20 21:18:38 -08:00 |
|
|
Mario Vavti
|
9d1443bbfe
|
move the remote user homebutton to the user menu. this way everything remote user related is in one place.
|
2016-11-20 15:38:36 +01:00 |
|
|
Mario Vavti
|
f4f3769225
|
fix #594
|
2016-11-20 14:15:13 +01:00 |
|
|
zotlabs
|
dda2ea8fed
|
Do not render maps for Diaspora destinations.
|
2016-11-19 14:16:38 -08:00 |
|
 Andrew Manning
|
d24e867603
|
Move page list back out to the side menu, but with the new page form below the new page button like the new wiki form. Disable text editing if viewer lacks edit permission, and change the tab label to Source instead of Edit in that case.
|
2016-11-18 21:55:29 -05:00 |
|
|
Andrew Manning
|
d5c14a513d
|
Wiki pages display in tab to the left of the edit pane tab. Home is always first in the list.
|
2016-11-18 21:25:40 -05:00 |
|
|
Mario Vavti
|
3147b7c62b
|
revert simple checkbox
|
2016-11-18 14:15:01 +01:00 |
|
|
Mario Vavti
|
0ceb75ea09
|
add a simple checkbox template for use in widgets
|
2016-11-18 13:55:48 +01:00 |
|
|
zotlabs
|
3b6248cb64
|
dba_pdo: return false on q() DB error like the old driver did
|
2016-11-17 15:15:34 -08:00 |
|
|
Mario Vavti
|
0b0e0f8f43
|
wiki list fixes
|
2016-11-17 14:17:26 +01:00 |
|
|
Andrew Manning
|
20db8bbe2e
|
Highlight active wiki in list in preparation for removing active wiki name from content section header to make room for page list viewer
|
2016-11-17 05:58:26 -05:00 |
|
|
Andrew Manning
|
748c894450
|
Move new wiki dialog directly underneath new wiki button in wiki list widget
|
2016-11-16 20:16:46 -05:00 |
|
|
zotlabs
|
0e8b13841a
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-11-16 14:15:42 -08:00 |
|
|
zotlabs
|
4ce1cccc4a
|
export issue
|
2016-11-16 14:13:58 -08:00 |
|
|
zotlabs
|
91c803ff65
|
use item from DB for return value
|
2016-11-16 14:13:10 -08:00 |
|
|
zotlabs
|
7a17ee9f8c
|
export issue
|
2016-11-16 14:10:57 -08:00 |
|
|
Mario Vavti
|
1ad8f20bce
|
only turn [] and [x] into checkboxes if it is found inside a checklist
|
2016-11-16 20:49:58 +01:00 |
|
|
zotlabs
|
501bd814c3
|
wiki: simplify permission model, reduce duplicate calls to get the same channel info and permissions, return the owner permissions with the normal permission check (keeping all permission fetching in one place), rename the 'channel' variable to 'owner' in several places to identify this channel role more clearly as to the way it is being used in this module, update the deprecated call to proc_run (include/notifier) and make several notice messages translatable.
|
2016-11-15 18:43:26 -08:00 |
|
|
zotlabs
|
0f5a166cce
|
still a bit of wiki permission weirdness, this should catch the major ones
|
2016-11-15 02:12:30 -08:00 |
|
|
zotlabs
|
e0a702df76
|
wiki: permissions issues, untranslated strings in templates and some minor changes to provide a consistent UI with the rest of the app.
|
2016-11-15 00:50:31 -08:00 |
|
|
zotlabs
|
e990a35a91
|
xchan_fetch() returns a simplified structure
|
2016-11-14 21:06:58 -08:00 |
|
|
zotlabs
|
3e286f4f19
|
update api perm_allowed to return all perms if no perm specified
|
2016-11-14 20:59:10 -08:00 |
|
|
zotlabs
|
e0a83b4b94
|
API: add GET /api/z/1.0/perm_allowed
|
2016-11-14 20:50:55 -08:00 |
|
|
zotlabs
|
b9728a96ce
|
API: add GET /api/z/1.0/abconfig
|
2016-11-14 20:30:28 -08:00 |
|
|
zotlabs
|
9055d0910c
|
API: add GET api/z/1.0/abook
|
2016-11-14 17:47:44 -08:00 |
|
|
Mario Vavti
|
192df273cc
|
show wiki controls only to owner and whitespace fixes
|
2016-11-14 12:01:16 +01:00 |
|
|
zotlabs
|
cf5c803fe0
|
api: allow group member list to use a group name or id
|
2016-11-13 23:28:03 -08:00 |
|