aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * 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 dev_mergezotlabs2017-09-1028-41/+291
|\|
| * 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
| | * | 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 cases...Mario Vavti2017-09-071-1/+1
| * | | 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 the...Mario Vavti2017-09-071-3/+10
| * | | 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 semicolonWaitman Gobble2017-09-061-1/+1
| |/ /
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-09-0618-41/+87
|\| |
| * | cards: remove double generic-content-wrapper and section titleMario Vavti2017-09-061-9/+4
| * | make cards likeableMario Vavti2017-09-061-1/+1
| |/
| * check code rights on cloud fileszotlabs2017-09-053-4/+4
| * typozotlabs2017-09-051-1/+1
| * provide sharing of cardszotlabs2017-09-056-14/+62
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-09-053-5/+6
| |\
| * | avoid a security patch and resultant compatibility issues; instead restrict t...zotlabs2017-09-052-3/+1
| * | remove period from characters allowed in username, as this will mess up URL b...zotlabs2017-09-052-6/+6
| * | some more prep work for Zot VI - some of this will need to be undone or at le...zotlabs2017-09-042-5/+13
| * | some preliminary work on Zot VIzotlabs2017-09-042-6/+19
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-09-045-33/+17
| |\ \
| * | | card embed improvedzotlabs2017-09-042-3/+8
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-09-053-5/+6
|\ \ \ \ | | |_|/ | |/| |