aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-09-131-3/+3
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2017-09-132-5/+5
| |\
| * | rename activity notifications links - one moreMario Vavti2017-09-121-1/+1
| * | rename activity notifications linksMario Vavti2017-09-121-2/+2
* | | Zot6: some things that need to be done ahead of time so we can turbocharge th...zotlabs2017-09-131-11/+35
| |/ |/|
* | add option to mimetype selector so you can change the element name in case yo...zotlabs2017-09-121-2/+2
* | wiki mimetype selectionzotlabs2017-09-121-3/+3
* | drop salmon until we improve performancezotlabs2017-09-121-1/+1
|/
* regex was still brokenzotlabs2017-09-101-1/+1
* fix regexzotlabs2017-09-101-1/+1
* owa cleanupzotlabs2017-09-091-2/+3
* owa: missed the set-observer stuffzotlabs2017-09-081-1/+8
* initial testing success with owazotlabs2017-09-071-1/+4
* testing owazotlabs2017-09-073-4/+4
* owa - first commitzotlabs2017-09-071-0/+66
* use array_key_exists() instead of x() in this case as the latter fails on an ...zotlabs2017-09-061-3/+3
* 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
* provide sharing of cardszotlabs2017-09-051-0/+1
* avoid a security patch and resultant compatibility issues; instead restrict t...zotlabs2017-09-051-2/+1
* remove period from characters allowed in username, as this will mess up URL b...zotlabs2017-09-052-6/+6
* card embed improvedzotlabs2017-09-041-1/+6
* validate the security contextzotlabs2017-09-031-0/+1
* paths in xchan_addr no longer means RSS specifically but could be activitypubzotlabs2017-09-031-3/+0
* Merge remote-tracking branch 'mike/master' into devMario Vavti2017-09-031-2/+1
|\
| * Reviewed. This is OK.zotlabs2017-09-031-2/+1
* | introduce item_normal_update(). the differnce to item_normal() is that we do ...Mario Vavti2017-09-031-0/+6
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-09-021-1/+2
|\|
| * may be exploitable in current form - awaiting reviewzotlabs2017-09-021-1/+2
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-09-011-1/+7
|\ \ | |/ |/|
| * Merge pull request #850 from anaqreon/docogit-marijus2017-09-011-1/+7
| |\
| | * Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2017-08-272-3/+10
| | |\
| | * \ Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2017-08-251-18/+1
| | |\ \
| | * | | Removed duplicated table of contents (TOC) in Help pages by breaking hierarch...Andrew Manning2017-08-251-1/+7
* | | | | cut down on a few extraneous gprobe processeszotlabs2017-08-311-1/+3
* | | | | some changes after testing server-to-server magic authzotlabs2017-08-311-8/+11
* | | | | add server-to-server magic auth to dav and cdav controllerszotlabs2017-08-311-1/+1
* | | | | server to server magic authzotlabs2017-08-311-2/+50
* | | | | simplify api_authzotlabs2017-08-311-15/+9
|/ / / /
* | | | check input is hex before sending it to hex2binzotlabs2017-08-301-1/+1
* | | | issue with mentions and xchans with @ or /zotlabs2017-08-301-1/+1
* | | | use iso 8601 "Zulu" for log timestamps so it can be easily processed with fai...zotlabs2017-08-291-3/+6
* | | | escape 'http' inside code blocks so it doesn't trigger an oembedzotlabs2017-08-292-0/+5
| |_|/ |/| |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-08-242-28/+53
|\ \ \ | | |/ | |/|
| * | Merge pull request #849 from anaqreon/docogit-marijus2017-08-241-1/+24
| |\|
| | * Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2017-08-248-6/+195
| | |\
| | * | Added language selector menu for Help pagesAndrew Manning2017-08-241-1/+24
| * | | ditch discover tab in favour of the public stream appgit-marijus2017-08-241-18/+1
| | |/ | |/|
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-08-248-6/+195
| |\ \ | | |/ | |/|
| * | Fixed incorrect language path when choosing the language from browser preferenceAndrew Manning2017-08-241-1/+1