Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | Revert "Filter search box before display" | DM42.Net (Matt Dent) | 2018-11-13 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 35e66770be6ca93c9090cdab221e6c33a410a569. | |||||
| | * | | | Merge branch 'dev' into 'dev' | Mario | 2018-11-14 | 2 | -28/+9 | |
| | |\ \ \ | | | |/ / | | |/| / | | | |/ | | | | | Remove unneccessary fetch_image_from_url() function See merge request hubzilla/core!1393 | |||||
| | | * | Update Photo.php | Max Kostikov | 2018-11-13 | 1 | -4/+4 | |
| | | | | ||||||
| | | * | Remove uneccessary include/photos.php | Max Kostikov | 2018-11-13 | 1 | -1/+0 | |
| | | | | ||||||
| | | * | Text formatting in Photo.php | Max Kostikov | 2018-11-13 | 1 | -2/+2 | |
| | | | | ||||||
| | | * | Replace fetch_image_from_url() with z_fetch_url() | Max Kostikov | 2018-11-13 | 1 | -6/+8 | |
| | | | | ||||||
| | | * | Remove fetch_image_from_url() because of functions duplicate | Max Kostikov | 2018-11-13 | 1 | -20/+0 | |
| | | | | ||||||
| * | | | version 3.8.33.8.3 | Mario Vavti | 2018-11-05 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | update changelog | Mario Vavti | 2018-11-05 | 1 | -0/+14 | |
| | | | | ||||||
| * | | | update linkinfo from dev | Mario Vavti | 2018-11-05 | 1 | -7/+30 | |
| | | | | ||||||
| * | | | Merge branch 'dev' | Mario Vavti | 2018-11-05 | 316 | -5295/+6481 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge branch 'dev'3.8.2 | Mario Vavti | 2018-10-29 | 1 | -0/+22 | |
| |\ \ \ \ | ||||||
| * | | | | | merge Zotlabs/Access/PermissionLimits.php from dev | Mario Vavti | 2018-10-29 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | merge view/fr/hmessages.po from dev | Mario Vavti | 2018-10-29 | 1 | -50/+2 | |
| | | | | | | ||||||
| * | | | | | merge view/ru/hstrings.php from dev | Mario Vavti | 2018-10-29 | 1 | -5/+1 | |
| | | | | | | ||||||
| * | | | | | merge view/ru/hmessages.po from dev | Mario Vavti | 2018-10-29 | 1 | -19/+19 | |
| | | | | | | ||||||
| * | | | | | merge view/it/hstrings.php from dev | Mario Vavti | 2018-10-29 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | merge view/it/hmessages.po from dev | Mario Vavti | 2018-10-29 | 1 | -41/+39 | |
| | | | | | | ||||||
| * | | | | | merge view/es-es/hstrings.php from dev | Mario Vavti | 2018-10-29 | 1 | -2/+0 | |
| | | | | | | ||||||
| * | | | | | merge view/es-es/hmessages.po from dev | Mario Vavti | 2018-10-29 | 1 | -37/+30 | |
| | | | | | | ||||||
| * | | | | | merge util/zotsh/zotsh.py from dev | Mario Vavti | 2018-10-29 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | merge util/update_theme_repo from dev | Mario Vavti | 2018-10-29 | 1 | -1/+0 | |
| | | | | | | ||||||
| * | | | | | merge util/update_autoloader from dev | Mario Vavti | 2018-10-29 | 1 | -3/+0 | |
| | | | | | | ||||||
| * | | | | | merge util/hmessages.po from dev | Mario Vavti | 2018-10-29 | 1 | -73/+14 | |
| | | | | | | ||||||
| * | | | | | merge install/schema_postgres.sql from dev | Mario Vavti | 2018-10-29 | 1 | -148/+148 | |
| | | | | | | ||||||
| * | | | | | merge include/zot.php from dev | Mario Vavti | 2018-10-29 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | merge include/nav.php from dev | Mario Vavti | 2018-10-29 | 1 | -1/+0 | |
| | | | | | | ||||||
| * | | | | | merge include/import.php from dev | Mario Vavti | 2018-10-29 | 1 | -1/+0 | |
| | | | | | | ||||||
| * | | | | | merge include/connections.php from dev | Mario Vavti | 2018-10-29 | 1 | -2/+0 | |
| | | | | | | ||||||
| * | | | | | merge Zotlabs/Widget/Wiki_pages.php from dev | Mario Vavti | 2018-10-29 | 1 | -2/+0 | |
| | | | | | | ||||||
| * | | | | | merge Zotlabs/Module/Photo.php from dev | Mario Vavti | 2018-10-29 | 1 | -12/+0 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'dev' | Mario Vavti | 2018-10-29 | 38 | -749/+1141 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Merge branch 'dev' into 'dev' | Mario | 2018-10-26 | 2 | -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 these | zotlabs | 2018-10-23 | 56 | -10173/+0 | |
| | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 7ed197f46b189601ac043f4bfeab41204a43488b) | |||||
| * | | | | | | version 3.8.13.8.1 | Mario | 2018-10-21 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | changelog for 3.8.1 | Mario Vavti | 2018-10-21 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit ea850e58d219a756189532bbb3e9ec8d85e9ba6a) | |||||
| * | | | | | | fix ellipsis for too long nav banner | Mario Vavti | 2018-10-21 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit a61ce45a32fa07249ee46160fd56ec08e67df601) | |||||
| * | | | | | | fix wrong value being used for menu_id | mike | 2018-10-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit fdb7c115a7504e431d9dd35af4901ef50367c67b) | |||||
| * | | | | | | disable blueimp demo server | zotlabs | 2018-10-21 | 1 | -15/+0 | |
| | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 7c49f227022ccbfe020121029da94373765abd67) | |||||
| * | | | | | | Merge branch '3.8RC'3.8 | Mario Vavti | 2018-10-19 | 862 | -25448/+94389 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | version 3.8 | Mario Vavti | 2018-10-19 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | optimize autoload | Mario Vavti | 2018-10-19 | 2 | -0/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 2583270774e2dfe434f7dc099d6ac154fef240dd) | |||||
| | * | | | | | | strings and bump apd versions to version 2 | Mario Vavti | 2018-10-19 | 40 | -470/+519 | |
| | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 4aed866d69b46e57439b4b9e60301c93f0104995) | |||||
| | * | | | | | | Merge branch 'patch-18' into 'dev' | Mario | 2018-10-19 | 2 | -10/+47 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Russian translation for upgrade plugin added See merge request hubzilla/core!1344 (cherry picked from commit c044ff34449b10acd072795a02b79d74706c9ca7) ac2b6bcc Russian translation for upgrade plugin added 6e758423 Update hstrings.php | |||||
| | * | | | | | | Merge branch 'dev' into 'dev' | Mario | 2018-10-18 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix template root redirection See merge request hubzilla/core!1343 (cherry picked from commit e9471124c00a41bcdd3abe7f1d858b51e5209ca3) 442d1cb4 Fix template root redirection | |||||
| | * | | | | | | complete changelog | Mario Vavti | 2018-10-17 | 1 | -2/+34 | |
| | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit fa91e2a60cce1f436b0bec946f4e147bca5752d0) | |||||
| | * | | | | | | improve posting to mod pconfig via ajax | Mario Vavti | 2018-10-16 | 1 | -5/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit ae875734e270dbe9840e87f07aa10f11a1af1d89) | |||||
| | * | | | | | | Merge branch 'fix-master-rate-limiter' into 'dev' | Mario | 2018-10-16 | 1 | -2/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix master rate limiter See merge request hubzilla/core!1341 (cherry picked from commit e38e85572e148e1cf684810f6435001b32d8c7fc) 49eff772 Fix worker age calculation be30dc9e Move logger to debug/all b6a9be88 Delete duplicate queue items | |||||
| | * | | | | | | Merge branch 'patch-17' into 'dev' | Mario | 2018-10-16 | 2 | -101/+116 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Russian translations to Newmember widget See merge request hubzilla/core!1339 (cherry picked from commit ed08eb07c63223d09011eab90709d8f3da44f549) 04edb741 Add Russian translations to Newmember widget d2d6f8c9 Update hstrings.php | |||||
| | * | | | | | | add missing features section to newmember widget | Mario Vavti | 2018-10-15 | 1 | -1/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 25a74f366460144d12287b51bdbdb48ebcadfb98) |