aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* issues with image import to zot6 - wrong mid. Also label source project of zo...zotlabs2019-08-222-2/+2
* Merge branch 'dev' into 'dev'Max Kostikov2019-08-222-2/+2
|\
| * Merge branch 'dev' of https://framagit.org/zot/core into devzotlabs2019-08-2112-553/+591
| |\
| * | possible for DB to return hublocs with no sitekeyzotlabs2019-08-212-2/+2
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-08-221-2/+2
|\ \ \
| * | | Fix attach permissions sync for clonned channelMax Kostikov2019-08-221-2/+2
* | | | Merge branch 'dev' into 'dev'Max Kostikov2019-08-221-0/+3
|\| | |
| * | | Fix spoiler displaying while convert BBcode to markdownMax Kostikov2019-08-221-0/+3
|/ / /
* | | update changelogMario Vavti2019-08-161-0/+6
* | | Merge branch 'dev' into 'dev'Mario2019-08-1612-553/+591
|\ \ \ | |/ / |/| / | |/
| * support "bearcaps" in Activity libraryzotlabs2019-08-151-0/+19
| * show correct profile photo when previewing and editing profileszotlabs2019-08-151-1/+9
| * fix bitrot in util/zotshzotlabs2019-08-1510-551/+546
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-08-150-0/+0
| |\ | |/ |/|
* | Merge branch 'dev' into 'dev'Max Kostikov2019-08-141-1/+1
|\ \
| | * zot6 compatibility: when posting from a non-primary clone the actor->id is th...zotlabs2019-08-141-1/+17
| |/
| * illegal offset warning (prevents encrypted signatures from being used for enc...zotlabs2019-08-131-1/+1
|/
* update changelogMario Vavti2019-08-131-1/+3
* update directory serversMario Vavti2019-08-131-3/+3
* Merge branch 'dev_homeinstall_debian10' into 'dev'Mario2019-08-132-111/+52
|\
| * Changes: Debian 10, MariaDB, adminerOJ Random2019-08-122-111/+52
* | Merge branch 'rudocs' into 'dev'Max Kostikov2019-08-123-4/+10
|\ \ | |/ |/|
| * Merge branch 'dev' into 'rudocs'Max Kostikov2019-08-120-0/+0
| |\ | |/ |/|
* | Update help.htmlMax Kostikov2019-08-121-1/+1
* | Update help.htmlMax Kostikov2019-08-121-1/+1
* | Merge branch 'rudocs' into 'dev'Max Kostikov2019-08-124-55/+65
|\ \
| | * Delete .gitkeepMax Kostikov2019-08-121-0/+0
| | * Delete .gitkeepMax Kostikov2019-08-121-0/+0
| | * Update help.htmlMax Kostikov2019-08-121-1/+1
| | * Update help.htmlMax Kostikov2019-08-121-1/+0
| | * Update help.htmlMax Kostikov2019-08-121-4/+3
| | * Add Russian context help for ConnectionsMax Kostikov2019-08-121-0/+8
| | * Add new directoryMax Kostikov2019-08-121-0/+0
| | * Update help.htmlMax Kostikov2019-08-121-1/+1
| | * Update help.htmlMax Kostikov2019-08-121-1/+1
| |/
| * Update help.htmlMax Kostikov2019-08-121-1/+1
| * Update help.htmlMax Kostikov2019-08-121-2/+2
| * Update hstrings.phpMax Kostikov2019-08-121-27/+27
| * Update hmessages.poMax Kostikov2019-08-121-28/+28
| * Add Russian context help for network pageMax Kostikov2019-08-121-0/+10
| * Add new directoryMax Kostikov2019-08-121-0/+0
|/
* Merge branch 'dev' into 'dev'Max Kostikov2019-08-122-488/+511
|\
| * Updated Spanish translationManuel Jiménez Friaza2019-08-112-488/+511
| * Merge remote-tracking branch 'upstream/dev' into devManuel Jiménez Friaza2019-08-11114-47354/+31617
| |\
| * | Updated Spanish translationManuel Jiménez Friaza2019-05-193-1307/+1485
| * | Merge remote-tracking branch 'upstream/dev' into devManuel Jiménez Friaza2019-05-19845-45775/+78694
| |\ \
| * | | Quickfix es-es/hstrings.phpManuel Jiménez Friaza2019-02-211-1/+1
| * | | Fix es-es/hstrings.phpManuel Jiménez Friaza2019-02-211-1/+1
| * | | Update Spanish translationManuel Jiménez Friaza2019-02-212-1646/+1994
| * | | Merge remote-tracking branch 'upstream/dev' into devManuel Jiménez Friaza2019-02-2111-14105/+14291
| |\ \ \