aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* bump version4.4.1Mario Vavti2019-08-161-1/+1
* update changelogMario Vavti2019-08-161-0/+6
* show correct profile photo when previewing and editing profileszotlabs2019-08-161-1/+9
* illegal offset warning (prevents encrypted signatures from being used for enc...zotlabs2019-08-161-1/+1
* Merge branch '4.4RC'4.4Mario Vavti2019-08-1383-29701/+31305
|\
| * bump versionMario Vavti2019-08-131-1/+1
| * Merge branch 'dev' into 4.4RCMario Vavti2019-08-131-1/+3
| |\
| | * update changelogMario Vavti2019-08-131-1/+3
| * | Merge branch 'dev' into 4.4RCMario Vavti2019-08-131-3/+3
| |\|
| | * update directory serversMario Vavti2019-08-131-3/+3
| * | Merge branch 'dev' into 4.4RCMario Vavti2019-08-138-654/+634
| |\|
| | * 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
| | | |\ \ \
| | | * \ \ \ Merge remote-tracking branch 'upstream/dev' into devManuel Jiménez Friaza2019-02-1980-4382/+6177
| | | |\ \ \ \
| | | * \ \ \ \ Merge remote-tracking branch 'upstream/dev' into devManuel Jiménez Friaza2019-01-2089-632/+1323
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge remote-tracking branch 'upstream/dev' into devManuel Jiménez Friaza2018-12-1312-8/+90
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/dev' into devManuel Jiménez Friaza2018-12-0588-810/+3088
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Revision 1 doc/es-es/about/about.bbManuel Jiménez Friaza2018-11-261-14/+21
| * | | | | | | | | | Merge branch 'dev' into 4.4RCMario Vavti2019-08-111-1/+1
| |\| | | | | | | | |
| | * | | | | | | | | linkinfo: only allow to embed public itemsMario Vavti2019-08-111-1/+1
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge branch 'dev' into 4.4RCMario Vavti2019-08-111-12/+14
| |\| | | | | | | |