aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devgit-marijus2017-09-159-19/+111
|\ \
| * | typocheckzotlabs2017-09-141-1/+1
| * | provide a hook for importing a channel photo at channel creation timezotlabs2017-09-142-0/+42
| * | wiki: lock mimetypezotlabs2017-09-146-9/+32
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-09-142-25/+26
| |\ \
| * | | bring back wiki downloadzotlabs2017-09-143-9/+37
* | | | some work on wiki aclgit-marijus2017-09-153-2/+65
| |/ / |/| |
* | | wiki: do not suggest bbcode if mimetype is text/plainMario Vavti2017-09-141-0/+2
* | | use the hubzilla iconsMario Vavti2017-09-141-2/+2
* | | hubzilla issue #858: Fix: Shortcut icon is not dysplayed when Admin or Channe...Sergey Lukin2017-09-141-23/+22
|/ /
* | add text/plain type to wikizotlabs2017-09-133-9/+19
* | make wiki page mimetype default to wiki mimetype (this was the original inten...zotlabs2017-09-132-2/+4
* | more zot6zotlabs2017-09-134-6/+26
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-09-132-37/+41
|\ \
| * \ Merge remote-tracking branch 'mike/master' into devMario Vavti2017-09-1310-23/+54
| |\ \
| * | | rename activity notifications links - one moreMario Vavti2017-09-121-1/+1
| * | | rename activity notifications linksMario Vavti2017-09-121-2/+2
| * | | hubzilla issue #855: fix for some problems with displaying selected theme aft...Sergey Lukin2017-09-121-34/+38
* | | | Zot6: some things that need to be done ahead of time so we can turbocharge th...zotlabs2017-09-134-24/+57
| |/ / |/| |
* | | add option to mimetype selector so you can change the element name in case yo...zotlabs2017-09-121-2/+2
* | | wiki mimetype selection. We can add text/plain as soon as we add code to puri...zotlabs2017-09-125-12/+32
* | | wiki mimetypezotlabs2017-09-121-1/+1
* | | wiki mimetype selectionzotlabs2017-09-125-9/+19
* | | drop salmon until we improve performancezotlabs2017-09-122-2/+3
|/ /
* | typo in ldsigszotlabs2017-09-112-2/+14
* | regex was still brokenzotlabs2017-09-101-1/+1
* | fix regexzotlabs2017-09-101-1/+1
* | remove item_thread_top from simple_update query - we're already fetching dist...zotlabs2017-09-102-2/+3
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-09-102-9/+5
|\ \
| * | More content tab help removed in context helpAndrew Manning2017-09-091-3/+1
| * | Update help.htmlAndrew Manning2017-09-091-6/+4
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-09-103-26/+10
|\ \ \
| * | | owa cleanupzotlabs2017-09-093-26/+10
* | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-09-092-10/+17
|\| | | | |/ / |/| |
| * | owa: missed the set-observer stuffzotlabs2017-09-082-10/+17
* | | Added context help for apps and appman in EnglishAndrew Manning2017-09-094-1/+16
* | | fix radiusMario Vavti2017-09-081-1/+1
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-09-0818-19/+258
|\| |
| * | improve the code block styling a wee bitzotlabs2017-09-072-9/+3
| * | provide root discovery for owazotlabs2017-09-071-4/+31
| * | provide owa discoveryzotlabs2017-09-071-0/+7
| * | initial testing success with owazotlabs2017-09-074-4/+7
| * | there's the problemzotlabs2017-09-071-1/+1
| * | add loggingzotlabs2017-09-071-0/+3
| * | testing owazotlabs2017-09-073-4/+4
| * | owa - first commitzotlabs2017-09-077-3/+186
| * | markdown code blocks not preserving line breaks, removed a bootstrap over-rid...zotlabs2017-09-072-4/+10
| * | use array_key_exists() instead of x() in this case as the latter fails on an ...zotlabs2017-09-061-3/+3
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-09-062-10/+5
| |\ \
| * | | mastodon wraps oembed in an iframe - which we immediately purify our of exist...zotlabs2017-09-061-0/+11