Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\ | |||||
| * | 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 |
| | | |||||
* | | 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 |
|/ | |||||
* | 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 |
| | |||||
* | validate the security context | zotlabs | 2017-09-03 | 3 | -3/+11 |
| | |||||
* | paths in xchan_addr no longer means RSS specifically but could be activitypub | zotlabs | 2017-09-03 | 2 | -4/+1 |
| | |||||
* | sign zot-info packets with httpsignatures | zotlabs | 2017-09-03 | 1 | -1/+28 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-09-03 | 15 | -20/+58 |
|\ | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-09-03 | 3 | -6/+1 |
| |\ | |||||
| * | | this fixes an issue where in /channel/membername?mid=some_mid updates did ↵ | Mario Vavti | 2017-09-03 | 1 | -1/+1 |
| | | | | | | | | | | | | not work when static updates were enabled. since in the current situation we always get a top-level-post mid, item_thread_top = 0 in the query will never return a result. change it to item_thread_top = 1 | ||||
| * | | introduce item_normal_update(). the differnce to item_normal() is that we do ↵ | Mario Vavti | 2017-09-03 | 5 | -7/+17 |
| | | | | | | | | | | | | not query for item_deleted = 0 and therefor can find deleted likes which allows us to update our unlikes on the fly if static page update is enabled | ||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-09-02 | 3 | -1/+6 |
| |\ \ | |||||
| * | | | add combined index for item.uid and item.item_unseen. this speeds up ↵ | Mario Vavti | 2017-09-01 | 7 | -11/+27 |
| | | | | | | | | | | | | | | | | notifications by a magnitude. | ||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-09-01 | 2 | -1/+9 |
| |\ \ \ | |||||
| | * \ \ | Merge pull request #850 from anaqreon/doco | git-marijus | 2017-09-01 | 2 | -1/+9 |
| | |\ \ \ | | | | | | | | | | | | | Fix the multiple table of content bug | ||||
| | | * \ \ | Merge remote-tracking branch 'upstream/dev' into doco | Andrew Manning | 2017-08-27 | 12 | -118/+7142 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge remote-tracking branch 'upstream/dev' into doco | Andrew Manning | 2017-08-25 | 4 | -39/+8 |
| | | |\ \ \ \ | |||||
| | | * | | | | | Removed duplicated table of contents (TOC) in Help pages by breaking ↵ | Andrew Manning | 2017-08-25 | 2 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hierarchical TOC loading. | ||||
| * | | | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-09-01 | 7 | -49/+210 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | changelog | git-marijus | 2017-08-31 | 1 | -0/+4 |
| | | | | | | | | |||||
* | | | | | | | | only validate headers that aren't "spoofable", which will be somewhat ↵ | zotlabs | 2017-09-03 | 1 | -3/+8 |
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | implementation dependent. | ||||
* | | | | | | | Reviewed. This is OK. | zotlabs | 2017-09-03 | 3 | -6/+1 |
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "may be exploitable in current form - awaiting review" This reverts commit 7bff60edacd68ef3dccf6f956e9c57092919950a. | ||||
* | | | | | | may be exploitable in current form - awaiting review | zotlabs | 2017-09-02 | 3 | -1/+6 |
| |/ / / / |/| | | | | |||||
* | | | | | cut down on a few extraneous gprobe processes | zotlabs | 2017-08-31 | 2 | -2/+4 |
| | | | | | |||||
* | | | | | some changes after testing server-to-server magic auth | zotlabs | 2017-08-31 | 4 | -22/+36 |
| | | | | | |||||
* | | | | | add server-to-server magic auth to dav and cdav controllers | zotlabs | 2017-08-31 | 3 | -29/+120 |
| | | | | | |||||
* | | | | | server to server magic auth | zotlabs | 2017-08-31 | 1 | -2/+50 |
| | | | | | |||||
* | | | | | simplify api_auth | zotlabs | 2017-08-31 | 1 | -15/+9 |
| | | | | |