aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* encrypted header issuezotlabs2018-11-141-1/+1
* extra loggingzotlabs2018-11-141-0/+4
* fix dreport linkzotlabs2018-11-142-3/+6
* change db update counterzotlabs2018-11-141-1/+1
* Merge branch 'master' into zvizotlabs2018-11-146-33/+33
|\
| * version 3.9.5Mario Vavti2018-11-141-1/+1
| * more changelog3.8.4Mario Vavti2018-11-141-0/+2
| * Merge branch 'dev'Mario Vavti2018-11-1433-424/+844
| |\
| | * changelog and versionMario Vavti2018-11-142-1/+19
| | * Merge branch 'patch-20181113b' into 'dev'Mario2018-11-142-3/+3
| | |\
| | | * Fix double escaping after xss fixDM42.Net (Matt Dent)2018-11-131-2/+2
| | | * Revert "Filter search box before display"DM42.Net (Matt Dent)2018-11-131-1/+1
| | * | Merge branch 'dev' into 'dev'Mario2018-11-142-28/+9
| | |\ \ | | | |/ | | |/|
| | | * Update Photo.phpMax Kostikov2018-11-131-4/+4
| | | * Remove uneccessary include/photos.php Max Kostikov2018-11-131-1/+0
| | | * Text formatting in Photo.phpMax Kostikov2018-11-131-2/+2
| | | * Replace fetch_image_from_url() with z_fetch_url()Max Kostikov2018-11-131-6/+8
| | | * Remove fetch_image_from_url() because of functions duplicateMax Kostikov2018-11-131-20/+0
| * | | version 3.8.33.8.3Mario Vavti2018-11-051-1/+1
| * | | update changelogMario Vavti2018-11-051-0/+14
| * | | update linkinfo from devMario Vavti2018-11-051-7/+30
| * | | Merge branch 'dev'Mario Vavti2018-11-05316-5295/+6481
| |\ \ \
| * \ \ \ Merge branch 'dev'3.8.2Mario Vavti2018-10-291-0/+22
| |\ \ \ \
| * | | | | merge Zotlabs/Access/PermissionLimits.php from devMario Vavti2018-10-291-1/+1
| * | | | | merge view/fr/hmessages.po from devMario Vavti2018-10-291-50/+2
| * | | | | merge view/ru/hstrings.php from devMario Vavti2018-10-291-5/+1
| * | | | | merge view/ru/hmessages.po from devMario Vavti2018-10-291-19/+19
| * | | | | merge view/it/hstrings.php from devMario Vavti2018-10-291-1/+1
| * | | | | merge view/it/hmessages.po from devMario Vavti2018-10-291-41/+39
| * | | | | merge view/es-es/hstrings.php from devMario Vavti2018-10-291-2/+0
| * | | | | merge view/es-es/hmessages.po from devMario Vavti2018-10-291-37/+30
| * | | | | merge util/zotsh/zotsh.py from devMario Vavti2018-10-291-2/+2
| * | | | | merge util/update_theme_repo from devMario Vavti2018-10-291-1/+0
| * | | | | merge util/update_autoloader from devMario Vavti2018-10-291-3/+0
| * | | | | merge util/hmessages.po from devMario Vavti2018-10-291-73/+14
| * | | | | merge install/schema_postgres.sql from devMario Vavti2018-10-291-148/+148
| * | | | | merge include/zot.php from devMario Vavti2018-10-291-1/+1
| * | | | | merge include/nav.php from devMario Vavti2018-10-291-1/+0
| * | | | | merge include/import.php from devMario Vavti2018-10-291-1/+0
| * | | | | merge include/connections.php from devMario Vavti2018-10-291-2/+0
| * | | | | merge Zotlabs/Widget/Wiki_pages.php from devMario Vavti2018-10-291-2/+0
| * | | | | merge Zotlabs/Module/Photo.php from devMario Vavti2018-10-291-12/+0
| * | | | | Merge branch 'dev'Mario Vavti2018-10-2938-749/+1141
| |\ \ \ \ \
| * | | | | | 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