Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | issues with image import to zot6 - wrong mid. Also label source project of zo... | zotlabs | 2019-08-22 | 2 | -2/+2 |
* | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-08-22 | 2 | -2/+2 |
|\ | |||||
| * | Merge branch 'dev' of https://framagit.org/zot/core into dev | zotlabs | 2019-08-21 | 12 | -553/+591 |
| |\ | |||||
| * | | possible for DB to return hublocs with no sitekey | zotlabs | 2019-08-21 | 2 | -2/+2 |
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-08-22 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Fix attach permissions sync for clonned channel | Max Kostikov | 2019-08-22 | 1 | -2/+2 |
* | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-08-22 | 1 | -0/+3 |
|\| | | | |||||
| * | | | Fix spoiler displaying while convert BBcode to markdown | Max Kostikov | 2019-08-22 | 1 | -0/+3 |
|/ / / | |||||
* | | | update changelog | Mario Vavti | 2019-08-16 | 1 | -0/+6 |
* | | | Merge branch 'dev' into 'dev' | Mario | 2019-08-16 | 12 | -553/+591 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | support "bearcaps" in Activity library | zotlabs | 2019-08-15 | 1 | -0/+19 |
| * | show correct profile photo when previewing and editing profiles | zotlabs | 2019-08-15 | 1 | -1/+9 |
| * | fix bitrot in util/zotsh | zotlabs | 2019-08-15 | 10 | -551/+546 |
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-08-15 | 0 | -0/+0 |
| |\ | |/ |/| | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-08-14 | 1 | -1/+1 |
|\ \ | |||||
| | * | zot6 compatibility: when posting from a non-primary clone the actor->id is th... | zotlabs | 2019-08-14 | 1 | -1/+17 |
| |/ | |||||
| * | illegal offset warning (prevents encrypted signatures from being used for enc... | zotlabs | 2019-08-13 | 1 | -1/+1 |
|/ | |||||
* | update changelog | Mario Vavti | 2019-08-13 | 1 | -1/+3 |
* | update directory servers | Mario Vavti | 2019-08-13 | 1 | -3/+3 |
* | Merge branch 'dev_homeinstall_debian10' into 'dev' | Mario | 2019-08-13 | 2 | -111/+52 |
|\ | |||||
| * | Changes: Debian 10, MariaDB, adminer | OJ Random | 2019-08-12 | 2 | -111/+52 |
* | | Merge branch 'rudocs' into 'dev' | Max Kostikov | 2019-08-12 | 3 | -4/+10 |
|\ \ | |/ |/| | |||||
| * | Merge branch 'dev' into 'rudocs' | Max Kostikov | 2019-08-12 | 0 | -0/+0 |
| |\ | |/ |/| | |||||
* | | Update help.html | Max Kostikov | 2019-08-12 | 1 | -1/+1 |
* | | Update help.html | Max Kostikov | 2019-08-12 | 1 | -1/+1 |
* | | Merge branch 'rudocs' into 'dev' | Max Kostikov | 2019-08-12 | 4 | -55/+65 |
|\ \ | |||||
| | * | Delete .gitkeep | Max Kostikov | 2019-08-12 | 1 | -0/+0 |
| | * | Delete .gitkeep | Max Kostikov | 2019-08-12 | 1 | -0/+0 |
| | * | Update help.html | Max Kostikov | 2019-08-12 | 1 | -1/+1 |
| | * | Update help.html | Max Kostikov | 2019-08-12 | 1 | -1/+0 |
| | * | Update help.html | Max Kostikov | 2019-08-12 | 1 | -4/+3 |
| | * | Add Russian context help for Connections | Max Kostikov | 2019-08-12 | 1 | -0/+8 |
| | * | Add new directory | Max Kostikov | 2019-08-12 | 1 | -0/+0 |
| | * | Update help.html | Max Kostikov | 2019-08-12 | 1 | -1/+1 |
| | * | Update help.html | Max Kostikov | 2019-08-12 | 1 | -1/+1 |
| |/ | |||||
| * | Update help.html | Max Kostikov | 2019-08-12 | 1 | -1/+1 |
| * | Update help.html | Max Kostikov | 2019-08-12 | 1 | -2/+2 |
| * | Update hstrings.php | Max Kostikov | 2019-08-12 | 1 | -27/+27 |
| * | Update hmessages.po | Max Kostikov | 2019-08-12 | 1 | -28/+28 |
| * | Add Russian context help for network page | Max Kostikov | 2019-08-12 | 1 | -0/+10 |
| * | Add new directory | Max Kostikov | 2019-08-12 | 1 | -0/+0 |
|/ | |||||
* | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-08-12 | 2 | -488/+511 |
|\ | |||||
| * | Updated Spanish translation | Manuel Jiménez Friaza | 2019-08-11 | 2 | -488/+511 |
| * | Merge remote-tracking branch 'upstream/dev' into dev | Manuel Jiménez Friaza | 2019-08-11 | 114 | -47354/+31617 |
| |\ | |||||
| * | | Updated Spanish translation | Manuel Jiménez Friaza | 2019-05-19 | 3 | -1307/+1485 |
| * | | Merge remote-tracking branch 'upstream/dev' into dev | Manuel Jiménez Friaza | 2019-05-19 | 845 | -45775/+78694 |
| |\ \ | |||||
| * | | | Quickfix es-es/hstrings.php | Manuel Jiménez Friaza | 2019-02-21 | 1 | -1/+1 |
| * | | | Fix es-es/hstrings.php | Manuel Jiménez Friaza | 2019-02-21 | 1 | -1/+1 |
| * | | | Update Spanish translation | Manuel Jiménez Friaza | 2019-02-21 | 2 | -1646/+1994 |
| * | | | Merge remote-tracking branch 'upstream/dev' into dev | Manuel Jiménez Friaza | 2019-02-21 | 11 | -14105/+14291 |
| |\ \ \ |