Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add text/plain type to wiki | zotlabs | 2017-09-13 | 3 | -9/+19 |
| | |||||
* | make wiki page mimetype default to wiki mimetype (this was the original ↵ | zotlabs | 2017-09-13 | 2 | -2/+4 |
| | | | | intent but the wrong variable was used) | ||||
* | more zot6 | zotlabs | 2017-09-13 | 4 | -6/+26 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-09-13 | 2 | -37/+41 |
|\ | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-09-13 | 10 | -23/+54 |
| |\ | |||||
| * | | rename activity notifications links - one more | Mario Vavti | 2017-09-12 | 1 | -1/+1 |
| | | | |||||
| * | | rename activity notifications links | Mario Vavti | 2017-09-12 | 1 | -2/+2 |
| | | | |||||
| * | | hubzilla issue #855: fix for some problems with displaying selected theme ↵ | Sergey Lukin | 2017-09-12 | 1 | -34/+38 |
| | | | | | | | | | | | | after panel Settings->Display loading | ||||
* | | | Zot6: some things that need to be done ahead of time so we can turbocharge ↵ | zotlabs | 2017-09-13 | 4 | -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 ↵ | zotlabs | 2017-09-12 | 1 | -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 ↵ | zotlabs | 2017-09-12 | 5 | -12/+32 |
| | | | | | | | | purify and render it specifically. | ||||
* | | wiki mimetype | zotlabs | 2017-09-12 | 1 | -1/+1 |
| | | |||||
* | | wiki mimetype selection | zotlabs | 2017-09-12 | 5 | -9/+19 |
| | | |||||
* | | drop salmon until we improve performance | zotlabs | 2017-09-12 | 2 | -2/+3 |
|/ | |||||
* | typo in ldsigs | zotlabs | 2017-09-11 | 2 | -2/+14 |
| | |||||
* | regex was still broken | zotlabs | 2017-09-10 | 1 | -1/+1 |
| | |||||
* | fix regex | zotlabs | 2017-09-10 | 1 | -1/+1 |
| | |||||
* | remove item_thread_top from simple_update query - we're already fetching ↵ | zotlabs | 2017-09-10 | 2 | -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 dev | Mario Vavti | 2017-09-10 | 2 | -9/+5 |
|\ | |||||
| * | More content tab help removed in context help | Andrew Manning | 2017-09-09 | 1 | -3/+1 |
| | | |||||
| * | Update help.html | Andrew Manning | 2017-09-09 | 1 | -6/+4 |
| | | |||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-09-10 | 3 | -26/+10 |
|\ \ | |||||
| * | | owa cleanup | zotlabs | 2017-09-09 | 3 | -26/+10 |
| | | | |||||
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-09-09 | 2 | -10/+17 |
|\| | | |/ |/| | |||||
| * | owa: missed the set-observer stuff | zotlabs | 2017-09-08 | 2 | -10/+17 |
| | | |||||
* | | Added context help for apps and appman in English | Andrew Manning | 2017-09-09 | 4 | -1/+16 |
| | | |||||
* | | fix radius | Mario Vavti | 2017-09-08 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-09-08 | 18 | -19/+258 |
|\| | |||||
| * | improve the code block styling a wee bit | zotlabs | 2017-09-07 | 2 | -9/+3 |
| | | |||||
| * | provide root discovery for owa | zotlabs | 2017-09-07 | 1 | -4/+31 |
| | | |||||
| * | provide owa discovery | zotlabs | 2017-09-07 | 1 | -0/+7 |
| | | |||||
| * | initial testing success with owa | zotlabs | 2017-09-07 | 4 | -4/+7 |
| | | |||||
| * | there's the problem | zotlabs | 2017-09-07 | 1 | -1/+1 |
| | | |||||
| * | add logging | zotlabs | 2017-09-07 | 1 | -0/+3 |
| | | |||||
| * | testing owa | zotlabs | 2017-09-07 | 3 | -4/+4 |
| | | |||||
| * | owa - first commit | zotlabs | 2017-09-07 | 7 | -3/+186 |
| | | |||||
| * | markdown code blocks not preserving line breaks, removed a bootstrap ↵ | zotlabs | 2017-09-07 | 2 | -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 ↵ | zotlabs | 2017-09-06 | 1 | -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_merge | zotlabs | 2017-09-06 | 2 | -10/+5 |
| |\ | |||||
| * | | mastodon wraps oembed in an iframe - which we immediately purify our of ↵ | zotlabs | 2017-09-06 | 1 | -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. | zotlabs | 2017-09-06 | 1 | -0/+5 |
| | | | |||||
* | | | use $target_item[mid] to make item highlighting work with shortened mids | Mario Vavti | 2017-09-07 | 1 | -1/+1 |
| | | | |||||
* | | | use thread parent hash only for like and dislike activity. in all other ↵ | Mario Vavti | 2017-09-07 | 1 | -1/+1 |
| | | | | | | | | | | | | cases use item hash. this will catch more situations. | ||||
* | | | do not double encode already encoded mids | Mario Vavti | 2017-09-07 | 1 | -3/+5 |
| | | | |||||
* | | | typo | Mario Vavti | 2017-09-07 | 1 | -1/+1 |
| | | | |||||
* | | | fix an issue where some encoded mids were not found in /display allthough ↵ | Mario Vavti | 2017-09-07 | 1 | -3/+10 |
| | | | | | | | | | | | | they existed | ||||
* | | | remove semicolon from update query - this is probably trivial | Mario Vavti | 2017-09-07 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #852 from waitman/patch-1 | git-marijus | 2017-09-07 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | fix bogus semicolon | ||||
| * | | fix bogus semicolon | Waitman Gobble | 2017-09-06 | 1 | -1/+1 |
|/ / | | | | | Line 655 should have comma instead of semicolon | ||||
* | | cards: remove double generic-content-wrapper and section title | Mario Vavti | 2017-09-06 | 1 | -9/+4 |
| | |