Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-09-13 | 1 | -3/+3 |
|\ | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-09-13 | 2 | -5/+5 |
| |\ | |||||
| * | | 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 |
| | | | |||||
* | | | Zot6: some things that need to be done ahead of time so we can turbocharge ↵ | zotlabs | 2017-09-13 | 1 | -11/+35 |
| |/ |/| | | | | | 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 | zotlabs | 2017-09-12 | 1 | -3/+3 |
| | | |||||
* | | drop salmon until we improve performance | zotlabs | 2017-09-12 | 1 | -1/+1 |
|/ | |||||
* | regex was still broken | zotlabs | 2017-09-10 | 1 | -1/+1 |
| | |||||
* | fix regex | zotlabs | 2017-09-10 | 1 | -1/+1 |
| | |||||
* | owa cleanup | zotlabs | 2017-09-09 | 1 | -2/+3 |
| | |||||
* | owa: missed the set-observer stuff | zotlabs | 2017-09-08 | 1 | -1/+8 |
| | |||||
* | initial testing success with owa | zotlabs | 2017-09-07 | 1 | -1/+4 |
| | |||||
* | testing owa | zotlabs | 2017-09-07 | 3 | -4/+4 |
| | |||||
* | owa - first commit | zotlabs | 2017-09-07 | 1 | -0/+66 |
| | |||||
* | 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 | ||||
* | 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 |
| | |||||
* | provide sharing of cards | zotlabs | 2017-09-05 | 1 | -0/+1 |
| | |||||
* | avoid a security patch and resultant compatibility issues; instead restrict ↵ | zotlabs | 2017-09-05 | 1 | -2/+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. | ||||
* | card embed improved | zotlabs | 2017-09-04 | 1 | -1/+6 |
| | |||||
* | validate the security context | zotlabs | 2017-09-03 | 1 | -0/+1 |
| | |||||
* | paths in xchan_addr no longer means RSS specifically but could be activitypub | zotlabs | 2017-09-03 | 1 | -3/+0 |
| | |||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-09-03 | 1 | -2/+1 |
|\ | |||||
| * | Reviewed. This is OK. | zotlabs | 2017-09-03 | 1 | -2/+1 |
| | | | | | | | | | | | | Revert "may be exploitable in current form - awaiting review" This reverts commit 7bff60edacd68ef3dccf6f956e9c57092919950a. | ||||
* | | introduce item_normal_update(). the differnce to item_normal() is that we do ↵ | Mario Vavti | 2017-09-03 | 1 | -0/+6 |
| | | | | | | | | 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 | 1 | -1/+2 |
|\| | |||||
| * | may be exploitable in current form - awaiting review | zotlabs | 2017-09-02 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-09-01 | 1 | -1/+7 |
|\ \ | |/ |/| | |||||
| * | Merge pull request #850 from anaqreon/doco | git-marijus | 2017-09-01 | 1 | -1/+7 |
| |\ | | | | | | | Fix the multiple table of content bug | ||||
| | * | Merge remote-tracking branch 'upstream/dev' into doco | Andrew Manning | 2017-08-27 | 2 | -3/+10 |
| | |\ | |||||
| | * \ | Merge remote-tracking branch 'upstream/dev' into doco | Andrew Manning | 2017-08-25 | 1 | -18/+1 |
| | |\ \ | |||||
| | * | | | Removed duplicated table of contents (TOC) in Help pages by breaking ↵ | Andrew Manning | 2017-08-25 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | hierarchical TOC loading. | ||||
* | | | | | cut down on a few extraneous gprobe processes | zotlabs | 2017-08-31 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | some changes after testing server-to-server magic auth | zotlabs | 2017-08-31 | 1 | -8/+11 |
| | | | | | |||||
* | | | | | add server-to-server magic auth to dav and cdav controllers | zotlabs | 2017-08-31 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | server to server magic auth | zotlabs | 2017-08-31 | 1 | -2/+50 |
| | | | | | |||||
* | | | | | simplify api_auth | zotlabs | 2017-08-31 | 1 | -15/+9 |
|/ / / / | |||||
* | | | | check input is hex before sending it to hex2bin | zotlabs | 2017-08-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | issue with mentions and xchans with @ or / | zotlabs | 2017-08-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | use iso 8601 "Zulu" for log timestamps so it can be easily processed with ↵ | zotlabs | 2017-08-29 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | fail2ban | ||||
* | | | | escape 'http' inside code blocks so it doesn't trigger an oembed | zotlabs | 2017-08-29 | 2 | -0/+5 |
| |_|/ |/| | | |||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-08-24 | 2 | -28/+53 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge pull request #849 from anaqreon/doco | git-marijus | 2017-08-24 | 1 | -1/+24 |
| |\| | | | | | | | Added language selector menu for Help pages | ||||
| | * | Merge remote-tracking branch 'upstream/dev' into doco | Andrew Manning | 2017-08-24 | 8 | -6/+195 |
| | |\ | |||||
| | * | | Added language selector menu for Help pages | Andrew Manning | 2017-08-24 | 1 | -1/+24 |
| | | | | |||||
| * | | | ditch discover tab in favour of the public stream app | git-marijus | 2017-08-24 | 1 | -18/+1 |
| | |/ | |/| | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-08-24 | 8 | -6/+195 |
| |\ \ | | |/ | |/| | |||||
| * | | Fixed incorrect language path when choosing the language from browser preference | Andrew Manning | 2017-08-24 | 1 | -1/+1 |
| | | |