Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | update changelog | Mario Vavti | 2019-08-16 | 1 | -0/+6 |
| | | | (cherry picked from commit e5539c0d01c1be0b9235aee4aec38f7860cc6959) | ||||
* | show correct profile photo when previewing and editing profiles | zotlabs | 2019-08-16 | 1 | -1/+9 |
| | | | (cherry picked from commit 808baf203d8c7aa57d89a3d5412742a4c84934b6) | ||||
* | illegal offset warning (prevents encrypted signatures from being used for ↵ | zotlabs | 2019-08-16 | 1 | -1/+1 |
| | | | | | encrypted messages). Not fatal but can leak metadata. (cherry picked from commit feda23587c7e24dec0cfc8be9f2f444e009f967f) | ||||
* | Merge branch '4.4RC'4.4 | Mario Vavti | 2019-08-13 | 83 | -29701/+31305 |
|\ | |||||
| * | bump version | Mario Vavti | 2019-08-13 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'dev' into 4.4RC | Mario Vavti | 2019-08-13 | 1 | -1/+3 |
| |\ | |||||
| | * | update changelog | Mario Vavti | 2019-08-13 | 1 | -1/+3 |
| | | | |||||
| * | | Merge branch 'dev' into 4.4RC | Mario Vavti | 2019-08-13 | 1 | -3/+3 |
| |\| | |||||
| | * | update directory servers | Mario Vavti | 2019-08-13 | 1 | -3/+3 |
| | | | |||||
| * | | Merge branch 'dev' into 4.4RC | Mario Vavti | 2019-08-13 | 8 | -654/+634 |
| |\| | |||||
| | * | Merge branch 'dev_homeinstall_debian10' into 'dev' | Mario | 2019-08-13 | 2 | -111/+52 |
| | |\ | | | | | | | | | | | | | | | | | Changes: Debian 10, MariaDB, adminer See merge request hubzilla/core!1707 | ||||
| | | * | 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 |
| | |\ \ | | | |/ | | |/| | | | | | | | | | Add more Russian context help See merge request hubzilla/core!1708 | ||||
| | | * | Merge branch 'dev' into 'rudocs' | Max Kostikov | 2019-08-12 | 0 | -0/+0 |
| | | |\ | | | |/ | | |/| | | | | | # Conflicts: # doc/context/ru/network/help.html | ||||
| | * | | 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 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Add Russian context help and update translation See merge request hubzilla/core!1706 | ||||
| | | | * | 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 See merge request hubzilla/core!1705 | ||||
| | | * | 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 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge remote-tracking branch 'upstream/dev' into dev | Manuel Jiménez Friaza | 2019-02-19 | 80 | -4382/+6177 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge remote-tracking branch 'upstream/dev' into dev | Manuel Jiménez Friaza | 2019-01-20 | 89 | -632/+1323 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge remote-tracking branch 'upstream/dev' into dev | Manuel Jiménez Friaza | 2018-12-13 | 12 | -8/+90 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/dev' into dev | Manuel Jiménez Friaza | 2018-12-05 | 88 | -810/+3088 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Revision 1 doc/es-es/about/about.bb | Manuel Jiménez Friaza | 2018-11-26 | 1 | -14/+21 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'dev' into 4.4RC | Mario Vavti | 2019-08-11 | 1 | -1/+1 |
| |\| | | | | | | | | | |||||
| | * | | | | | | | | | linkinfo: only allow to embed public items | Mario Vavti | 2019-08-11 | 1 | -1/+1 |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge branch 'dev' into 4.4RC | Mario Vavti | 2019-08-11 | 1 | -12/+14 |
| |\| | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-08-10 | 1 | -12/+14 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve plink to share tag detection See merge request hubzilla/core!1704 |