aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into 'dev'Mario2018-10-262-443/+516
* for whatever reason there were two of thesezotlabs2018-10-2356-10173/+0
* version 3.8.13.8.1Mario2018-10-211-1/+1
* changelog for 3.8.1Mario Vavti2018-10-211-0/+6
* fix ellipsis for too long nav bannerMario Vavti2018-10-211-0/+5
* fix wrong value being used for menu_idmike2018-10-211-1/+1
* disable blueimp demo serverzotlabs2018-10-211-15/+0
* Merge branch '3.8RC'3.8Mario Vavti2018-10-19862-25448/+94389
|\
| * version 3.8Mario Vavti2018-10-191-1/+1
| * optimize autoloadMario Vavti2018-10-192-0/+6
| * strings and bump apd versions to version 2Mario Vavti2018-10-1940-470/+519
| * Merge branch 'patch-18' into 'dev'Mario2018-10-192-10/+47
| * Merge branch 'dev' into 'dev'Mario2018-10-181-1/+2
| * complete changelogMario Vavti2018-10-171-2/+34
| * improve posting to mod pconfig via ajaxMario Vavti2018-10-161-5/+9
| * Merge branch 'fix-master-rate-limiter' into 'dev'Mario2018-10-161-2/+9
| * Merge branch 'patch-17' into 'dev'Mario2018-10-162-101/+116
| * add missing features section to newmember widgetMario Vavti2018-10-151-1/+7
| * allow to undelete deleted base appsMario Vavti2018-10-151-2/+2
| * some changelog workMario Vavti2018-10-151-1/+68
| * fix wiki issue with wiki page links when using bbcodeMario Vavti2018-10-151-3/+2
| * update readme for master and dev branch buildstatusMario Vavti2018-10-151-1/+4
| * Merge branch 'dev' into 'dev'Mario2018-10-155-9/+92
| * Merge branch 'patch-16' into 'dev'Mario2018-10-153-8/+9
| * Merge branch 'patch-15' into 'dev'Mario2018-10-151-0/+1
| * another min version change to mitigate caching issues. we are now at 3.8RC2.2Mario2018-10-131-1/+1
| * Merge branch 'patch-14' into 'dev'Mario2018-10-135-27/+65
| * bump version to 3.8RC2.1 due to javascript changesMario2018-10-131-1/+1
| * Merge branch 'dev' into 3.8RCMario Vavti2018-10-134-65/+25
| |\
| | * Revert "Merge branch 'patch-11' into 'dev'"Mario Vavti2018-10-134-65/+25
| | * Merge branch 'patch-12' into 'dev'Mario2018-10-132-103/+138
| | |\
| | | * Update hmessages.poMax Kostikov2018-10-131-2/+2
| | | * Update hstrings.phpMax Kostikov2018-10-131-2/+2
| | | * Update hstrings.phpMax Kostikov2018-10-131-7/+27
| | | * New russian plurals for JavaScriptMax Kostikov2018-10-131-96/+111
| | |/
| * | Update hmessages.poMax Kostikov2018-10-131-2/+2
| * | Update hstrings.phpMax Kostikov2018-10-131-2/+2
| * | Update hstrings.phpMax Kostikov2018-10-131-7/+27
| * | New russian plurals for JavaScriptMax Kostikov2018-10-131-96/+111
| * | version 3.8RC2Mario Vavti2018-10-131-1/+1
| * | Merge branch 'dev' into 3.8RCMario Vavti2018-10-139-13622/+13807
| |\|
| | * bump versionMario Vavti2018-10-131-1/+1
| | * Merge branch 'dev' into 'dev'Mario2018-10-131-2/+3
| | |\
| | | * Fix order of assignment and get template file before returnZotSocial Admin2018-10-121-2/+3
| | * | Merge branch 'patch-11' into 'dev'Mario2018-10-134-25/+65
| | |\ \
| | | * | Update language.phpMax Kostikov2018-10-131-2/+1
| | | * | Update language.phpMax Kostikov2018-10-131-3/+4
| | | * | Update language.phpMax Kostikov2018-10-131-2/+2
| | | * | Update language.phpMax Kostikov2018-10-131-1/+1
| | | * | Update language.phpMax Kostikov2018-10-131-2/+1