| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 branch 'dev' | Mario Vavti | 2018-10-29 | 2 | -7/+16 |
| |\ | |||||
| | * | delivery chain linkage messed up if original post was edited | zotlabs | 2018-10-26 | 1 | -6/+15 |
| | | | |||||
| | * | refine stream filter and forum notification behaviour (mostly for ↵ | Mario Vavti | 2018-10-24 | 1 | -1/+1 |
| | | | | | | | | | performance). personal posts will be displayed in unthreaded mode and clicking a forum notification will show only the unseen items of the forum in unthreaded mode. group the filters in the widget - threaded at the top, unthreaded beneath. | ||||
| | * | Fix template root redirection | M.Dent | 2018-10-17 | 1 | -1/+2 |
| | | | |||||
| | * | Merge branch 'dev' into 'dev' | Mario | 2018-10-15 | 1 | -3/+4 |
| | |\ | | | | | | | | | | | | | Bring back some basic automated testing for PHP7.1 and mysql via gitlab-ci. See merge request hubzilla/core!1332 | ||||
| | | * | fix phpunit error with html2markdown test and temporary disable failing ↵ | git-marijus | 2018-10-13 | 1 | -3/+4 |
| | | | | | | | | | | | | | markdown test in connection with **bold** and _italic_ (it is not clear why they fail and the code appears to work as expected) | ||||
| | * | | Update language.php | Max Kostikov | 2018-10-14 | 1 | -1/+1 |
| | | | | |||||
| | * | | Update js_strings.php | Max Kostikov | 2018-10-13 | 1 | -5/+5 |
| | | | | |||||
| | * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -0/+26 |
| | | | | |||||
| | * | | Add date/time plurals translation in JavaScript | Max Kostikov | 2018-10-13 | 1 | -0/+9 |
| | | | | |||||
| * | | | Merge branch '3.8RC'3.8 | Mario Vavti | 2018-10-19 | 31 | -928/+1012 |
| |\ \ \ | |||||
| | * | | | 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 | ||||
| | * | | | Merge branch 'dev' into 'dev' | Mario | 2018-10-15 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring back some basic automated testing for PHP7.1 and mysql via gitlab-ci. See merge request hubzilla/core!1332 (cherry picked from commit c39de966df2ff28674697be77a527b2214afef42) b77acb3e add gitlab-ci.yml and phpunit.xml 22275f30 fix dba_pdoTest 0db047e5 fix phpunit error with html2markdown test and temporary disable failing markdown… | ||||
| | * | | | Merge branch 'patch-16' into 'dev' | Mario | 2018-10-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JS plurals displaying code cleanup See merge request hubzilla/core!1338 (cherry picked from commit 721461dd3e8cb6990ace54688ace953374506daf) b7280a44 JS plurals displaying code cleanup ab0e2f52 Update language.php f9c3b807 Update main.js ce52c27a Update main.js | ||||
| | * | | | Merge branch 'patch-14' into 'dev' | Mario | 2018-10-13 | 2 | -5/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add date/time plurals translation in JavaScript See merge request hubzilla/core!1336 (cherry picked from commit a2575059e2a068a67cd984888422265c6888f261) 5c0d3187 Add date/time plurals translation in JavaScript 729d0d53 Update language.php f68674b3 Update js_strings.tpl 3ac4337a Update main.js e96e3dc6 Update po2php.php 54bdf59d Update js_strings.php | ||||
| | * | | | Merge branch 'dev' into 3.8RC | Mario Vavti | 2018-10-13 | 2 | -42/+5 |
| | |\| | | |||||
| | | * | | Revert "Merge branch 'patch-11' into 'dev'" | Mario Vavti | 2018-10-13 | 2 | -42/+5 |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit e5184458530bb0394e12026c82ee89257115f690, reversing changes made to 8ce240b95c62f4b702b60977f63b0223a8ec0849. | ||||
| | * | | | Merge branch 'dev' into 3.8RC | Mario Vavti | 2018-10-13 | 3 | -8/+42 |
| | |\| | | |||||
| | | * | | Merge branch 'dev' into 'dev' | Mario | 2018-10-13 | 1 | -2/+3 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | Fix order of assignment and get template file before return See merge request hubzilla/core!1329 | ||||
| | | | * | | Fix order of assignment and get template file before return | ZotSocial Admin | 2018-10-12 | 1 | -2/+3 |
| | | | |/ | |||||
| | | * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -2/+1 |
| | | | | | |||||
| | | * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -3/+4 |
| | | | | | |||||
| | | * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -2/+2 |
| | | | | | |||||
| | | * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -2/+1 |
| | | | | | |||||
| | | * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -4/+2 |
| | | | | | |||||
| | | * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -5/+5 |
| | | | | | |||||
| | | * | | Update language.php | Max Kostikov | 2018-10-12 | 1 | -0/+31 |
| | | | | | |||||
| | | * | | Add plurals translation at browser side (JS) | Max Kostikov | 2018-10-12 | 1 | -5/+14 |
| | | |/ | |||||
| | | * | verify some edge case http signatures | zotlabs | 2018-10-11 | 1 | -0/+24 |
| | | | | |||||
| | | * | Merge branch 'dev' | zotlabs | 2018-10-08 | 4 | -11/+30 |
| | | |\ | |||||
| | | | * | Merge branch 'patch-2' into 'dev' | Mario | 2018-10-08 | 1 | -1/+3 |
| | | | |\ | | | | | | | | | | | | | | | | | | | | | Prevent links damage on foreign channel repost for cloned See merge request hubzilla/core!1307 | ||||
| | | | | * | Prevent links damage on foreign channel repost for cloned | Max Kostikov | 2018-10-05 | 1 | -1/+3 |
| | | | | | | |||||
| | | | * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-10-07 | 1 | -1/+1 |
| | | | |\ \ | |||||
| | | | * \ \ | Merge branch 'dev' into 'dev' | M. Dent | 2018-10-07 | 1 | -2/+3 |
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing else clause See merge request hubzilla/core!1317 | ||||
| | | | | * | | | Add missing else clause | M.Dent | 2018-10-06 | 1 | -2/+3 |
| | | | | | | | | |||||
| | | | * | | | | move profile assign selector to profile settings and personal menu selector ↵ | Mario Vavti | 2018-10-06 | 1 | -8/+19 |
| | | | |/ / / | | | | | | | | | | | | | | | | | | | to channel_home settings and get rid of misc channel settings section. | ||||
| | | | * | / | strings and force import_system_apps() on std_version change | Mario Vavti | 2018-10-06 | 1 | -0/+5 |
| | | | | |/ | | | |/| | |||||
| | | | * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-10-05 | 1 | -0/+6 |
| | | | |\ \ | |||||
| | | * | | | | whitespace | zotlabs | 2018-10-08 | 1 | -3/+0 |
| | | | |_|/ | | |/| | | |||||
| | | * | | | use hubloc_store_lowlevel to ensure all hubloc columns are initialised | zotlabs | 2018-10-06 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Merge branch 'dev' | zotlabs | 2018-10-04 | 15 | -231/+149 |
| | | |\| | | | | |/ | | |/| | |||||
| | | * | | do not propagate channel deletion for an already deleted channel. | zotlabs | 2018-10-02 | 1 | -0/+6 |
| | | | | | |||||
| | * | | | Fix order of assignment and get template file before return | ZotSocial Admin | 2018-10-13 | 1 | -2/+3 |
| | | | | | | | | | | | | | (cherry picked from commit 8ebcc4439b373e2127ac33c79e254bc53e8d9070) | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |