aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'aff2' into 'dev'Mario2019-02-146-8/+91
|\
| * affinity slider as appphani002019-02-146-8/+91
|/
* Merge branch 'patch-20190212a' into 'dev'Mario2019-02-131-3/+6
|\
| * Only cascade privacy warning if thread parent has privacy concerns.M.Dent2019-02-131-5/+2
| * Fix: only first lock red with privacy_warningM.Dent2019-02-121-3/+9
|/
* Merge branch 'dev' into 'dev'Max Kostikov2019-02-122-545/+693
|\
| * Update hstrings.phpMax Kostikov2019-02-121-45/+72
| * Update hmessages.poMax Kostikov2019-02-121-500/+621
* | Merge branch 'fix-20190211a' into 'dev'Mario2019-02-121-2/+2
|\ \
| * | Get all listenersM.Dent2019-02-111-2/+2
|/ /
* | use ACTIVITY_SHARE to match the verbMario Vavti2019-02-081-1/+1
* | missing use AppMario Vavti2019-02-081-0/+1
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2019-02-0714-20/+81
|\ \
| * | exec updateInit() instead of notificationsUpdate() in jotShare()Mario Vavti2019-02-071-2/+1
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-02-078-57/+128
| |\ \
| * \ \ Merge remote-tracking branch 'mike/master' into devMario Vavti2019-02-062-13/+29
| |\ \ \
| * \ \ \ Merge branch 'viewsrc_update' into 'dev'Max Kostikov2019-02-041-2/+2
| |\ \ \ \
| | * | | | add the actual mid for debuging reasonsMario Vavti2019-02-031-2/+2
| * | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-02-0412-97/+139
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | update changelogMario Vavti2019-02-031-0/+10
| * | | | | cleanup logging and return if query returns empty resultMario Vavti2019-02-031-3/+6
| * | | | | do not overwrite $sql_extraMario Vavti2019-02-031-2/+4
| * | | | | Merge branch 'core_fixes' into 'dev'M. Dent2019-02-031-0/+1
| |\ \ \ \ \
| | * | | | | fix #1332Mario Vavti2019-02-021-0/+1
| |/ / / / /
| * | | | | Merge branch 'patch-20190201a' into 'dev'Mario2019-02-025-6/+41
| |\ \ \ \ \
| | * | | | | Add filter hooks and the ability to add buttons to the default status editorDM42.Net (Matt Dent)2019-02-015-6/+41
| * | | | | | Merge branch 'dev' into 'dev'M. Dent2019-02-011-1/+1
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Prevent Hubzilla usage for SEO backlinksMax Kostikov2019-02-011-1/+1
| * | | | | | Merge branch 'patch-20190130a' into 'dev'Mario2019-02-011-0/+11
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Set lock red and provide warning if a forum is tagged in the postM. Dent2019-02-011-0/+11
| |/ / / / /
| * | | | | Merge branch 'core_fixes' into 'dev'Max Kostikov2019-01-311-2/+2
| |\ \ \ \ \
| | * | | | | starring and filing is only supported for post item typeMario2019-01-311-2/+2
| |/ / / / /
| * | | | | Merge branch 'dev' into 'dev'Max Kostikov2019-01-312-4/+4
| |\| | | |
| | * | | | Update hstrings.phpMax Kostikov2019-01-311-2/+2
| | * | | | Update hmessages.poMax Kostikov2019-01-311-2/+2
* | | | | | disable repeat unless mid is a resolvable uri since this will do radically di...zotlabs2019-02-072-6/+5
* | | | | | automatically redirect repeat to share for posts with unresolvable message-id...zotlabs2019-02-071-3/+9
* | | | | | add missing zot6 conversation completion (required for message repeats)zotlabs2019-02-073-0/+216
* | | | | | fix mid generation for shareszotlabs2019-02-071-2/+2
| |_|_|_|/ |/| | | |
* | | | | fix verb for reshareszotlabs2019-02-061-1/+1
* | | | | more work on share/repeatzotlabs2019-02-061-1/+2
* | | | | work on repeat/share for Hubzillazotlabs2019-02-067-56/+126
| |_|_|/ |/| | |
* | | | allow conversation completion for new comments to expired posts, regardless o...zotlabs2019-02-052-13/+29
| |_|/ |/| |
* | | update tests for changes in handle_tags()zotlabs2019-02-031-13/+4
* | | fix linkify_tags() so it works with xchans across multiple protocols, also so...zotlabs2019-02-0311-84/+135
|/ /
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2019-01-306-198/+312
|\ \
| * \ Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-302-0/+39
| |\ \
| * | | clean up whitespace and remove superfluous semicolonMario Vavti2019-01-291-18/+20
| * | | Merge branch 'dev' into 'dev'Mario2019-01-291-15/+35
| |\ \ \
| | * | | Custom sessionhandler support, as requestedMark Nowiasz2019-01-291-15/+35