aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |\ | | | | | | | | | | | | | | | | Patch 20181113b See merge request hubzilla/core!1395
| | | * 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
| | | | | | | | | | | | | | | | This reverts commit 35e66770be6ca93c9090cdab221e6c33a410a569.
| | * | Merge branch 'dev' into 'dev'Mario2018-11-142-28/+9
| | |\ \ | | | |/ | | |/| | | | | | | | | Remove unneccessary fetch_image_from_url() function See merge request hubzilla/core!1393
| | | * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New strings in Spanish translation See merge request hubzilla/core!1349 (cherry picked from commit df449e7bfeb529c858007c7145f5587e87d87aa6) 802a7ff3 New strings in Spanish translation
| * | | | | | for whatever reason there were two of thesezotlabs2018-10-2356-10173/+0
| | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 7ed197f46b189601ac043f4bfeab41204a43488b)
| * | | | | | version 3.8.13.8.1Mario2018-10-211-1/+1
| | | | | | |
| * | | | | | changelog for 3.8.1Mario Vavti2018-10-211-0/+6
| | | | | | | | | | | | | | | | | | | | | (cherry picked from commit ea850e58d219a756189532bbb3e9ec8d85e9ba6a)
| * | | | | | fix ellipsis for too long nav bannerMario Vavti2018-10-211-0/+5
| | | | | | | | | | | | | | | | | | | | | (cherry picked from commit a61ce45a32fa07249ee46160fd56ec08e67df601)
| * | | | | | fix wrong value being used for menu_idmike2018-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | (cherry picked from commit fdb7c115a7504e431d9dd35af4901ef50367c67b)
| * | | | | | disable blueimp demo serverzotlabs2018-10-211-15/+0
| | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 7c49f227022ccbfe020121029da94373765abd67)
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 2583270774e2dfe434f7dc099d6ac154fef240dd)
| | * | | | | | strings and bump apd versions to version 2Mario Vavti2018-10-1940-470/+519
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 4aed866d69b46e57439b4b9e60301c93f0104995)