aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add text/plain type to wikizotlabs2017-09-133-9/+19
|
* make wiki page mimetype default to wiki mimetype (this was the original ↵zotlabs2017-09-132-2/+4
| | | | intent but the wrong variable was used)
* 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 ↵Sergey Lukin2017-09-121-34/+38
| | | | | | | | | | | | after panel Settings->Display loading
* | | Zot6: some things that need to be done ahead of time so we can turbocharge ↵zotlabs2017-09-134-24/+57
| |/ |/| | | | | the delivery engine and split off site records from channel records.
* | add option to mimetype selector so you can change the element name in case ↵zotlabs2017-09-121-2/+2
| | | | | | | | you end up with two of these suckers on the same page
* | wiki mimetype selection. We can add text/plain as soon as we add code to ↵zotlabs2017-09-125-12/+32
| | | | | | | | purify and render it specifically.
* | 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 ↵zotlabs2017-09-102-2/+3
| | | | distinct(parent) and this prevented comments from displaying after submission when remote-authed.
* 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 ↵zotlabs2017-09-072-4/+10
| | | | | | | | over-ride which fixes this, but also changed the style to pre-wrap to wrap the text rather than the default horizontal scroll
| * use array_key_exists() instead of x() in this case as the latter fails on an ↵zotlabs2017-09-061-3/+3
| | | | | | | | array that's empty and we unconditionally need to encode the array even if empty
| * 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 ↵zotlabs2017-09-061-0/+11
| | | | | | | | | | | | existence and what we really want to purify is the content. So strip away the iframe, fetch the content and purify that instead.
| * | ignore diaspora_meta column on item import.zotlabs2017-09-061-0/+5
| | |
* | | use $target_item[mid] to make item highlighting work with shortened midsMario Vavti2017-09-071-1/+1
| | |
* | | use thread parent hash only for like and dislike activity. in all other ↵Mario Vavti2017-09-071-1/+1
| | | | | | | | | | | | cases use item hash. this will catch more situations.
* | | do not double encode already encoded midsMario Vavti2017-09-071-3/+5
| | |
* | | typoMario Vavti2017-09-071-1/+1
| | |
* | | fix an issue where some encoded mids were not found in /display allthough ↵Mario Vavti2017-09-071-3/+10
| | | | | | | | | | | | they existed
* | | remove semicolon from update query - this is probably trivialMario Vavti2017-09-071-1/+1
| | |
* | | Merge pull request #852 from waitman/patch-1git-marijus2017-09-071-1/+1
|\ \ \ | |_|/ |/| | fix bogus semicolon
| * | fix bogus semicolonWaitman Gobble2017-09-061-1/+1
|/ / | | | | Line 655 should have comma instead of semicolon
* | cards: remove double generic-content-wrapper and section titleMario Vavti2017-09-061-9/+4
| |