Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | 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 | |
| | | ||||||
* | | make cards likeable | Mario Vavti | 2017-09-06 | 1 | -1/+1 | |
|/ | ||||||
* | check code rights on cloud files | zotlabs | 2017-09-05 | 3 | -4/+4 | |
| | ||||||
* | typo | zotlabs | 2017-09-05 | 1 | -1/+1 | |
| | ||||||
* | provide sharing of cards | zotlabs | 2017-09-05 | 6 | -14/+62 | |
| | ||||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-09-05 | 3 | -5/+6 | |
|\ | ||||||
| * | 32 characters are often not enough to distinguish gnu-social mids - use the ↵ | Mario Vavti | 2017-09-05 | 3 | -5/+6 | |
| | | | | | | | | entire mid. in /display if we are not dealing with posts (eg likes) provide the thr_parent mid as bParam_mid so we can still adress the right post in javascript | |||||
* | | avoid a security patch and resultant compatibility issues; instead restrict ↵ | zotlabs | 2017-09-05 | 2 | -3/+1 | |
| | | | | | | | | the input characters we accept in token verification strings to hex digits. This will all be changing in the coming weeks/months anyway. | |||||
* | | remove period from characters allowed in username, as this will mess up URL ↵ | zotlabs | 2017-09-05 | 2 | -6/+6 | |
| | | | | | | | | based content-type negotiation. It was previously disallowed but permitted a month or two ago after seeing Diaspora started allowing it. It's OK if they have it, but we can't; as many of our urls are based on username and theirs are primarily based on uid. | |||||
* | | some more prep work for Zot VI - some of this will need to be undone or at ↵ | zotlabs | 2017-09-04 | 2 | -5/+13 | |
| | | | | | | | | least re-arranged later but we need to bootstrap a test environment. | |||||
* | | some preliminary work on Zot VI | zotlabs | 2017-09-04 | 2 | -6/+19 | |
| | | ||||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-09-04 | 5 | -33/+17 | |
|\| | ||||||
| * | Default Access Control List (ACL) -> Default Privacy Group and minor ↵ | Mario Vavti | 2017-09-04 | 2 | -3/+2 | |
| | | | | | | | | template fix | |||||
| * | remove logging | Mario Vavti | 2017-09-04 | 1 | -2/+0 | |
| | | ||||||
| * | whitespace | Mario Vavti | 2017-09-04 | 1 | -25/+13 | |
| | | ||||||
| * | fix the error reporting query in /display. we need item_deleted instead of ↵ | Mario Vavti | 2017-09-04 | 1 | -2/+1 | |
| | | | | | | | | item_flags and remove id = $item_hash from the query since we always provide the mid and never the id iirc | |||||
| * | remove hubzilla.nl from fallback directory servers | Mario Vavti | 2017-09-04 | 1 | -1/+1 | |
| | | ||||||
* | | card embed improved | zotlabs | 2017-09-04 | 2 | -3/+8 | |
|/ | ||||||
* | also error if no security context | zotlabs | 2017-09-03 | 1 | -0/+8 | |
| |