| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-11-07 | 2 | -4/+37 |
| |\ | |||||
| | * | Merge branch 'patch-20181028a' into 'dev' | Mario | 2018-11-05 | 2 | -4/+37 |
| | |\ | | | | | | | | | | | | | Add timestamp to pconfig See merge request hubzilla/core!1355 | ||||
| | | * | strpos needs to test with ===0 not ==0 | M.Dent | 2018-11-01 | 1 | -3/+3 |
| | | | | |||||
| | | * | Add timestamp and associated logic to pconfig | M.Dent | 2018-10-28 | 2 | -4/+37 |
| | | | | |||||
| * | | | signature issue | zotlabs | 2018-11-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | these changes needed to ensure cloning/syncing works in the future to ↵ | zotlabs | 2018-11-05 | 2 | -44/+94 |
| |/ / | | | | | | | non-zot6 enabled servers after the (coming) zot6 schema updates. This should probably be on a fast track to master branch | ||||
| * | | Fix wrong image resize for some external images | Max Kostikov | 2018-11-01 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-10-31 | 1 | -1/+6 |
| |\ \ | |||||
| | * \ | Merge branch 'patch-20' into 'dev' | Mario | 2018-10-31 | 1 | -1/+6 |
| | |\ \ | | | | | | | | | | | | | | | | | Beautiful embedding for Hubzilla links See merge request hubzilla/core!1360 | ||||
| | | * | | Update oembed.php | Max Kostikov | 2018-10-30 | 1 | -1/+5 |
| | | | | | |||||
| | | * | | Beautiful embedding for Hubzilla links | Max Kostikov | 2018-10-30 | 1 | -1/+2 |
| | | |/ | |||||
| * | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-10-30 | 1 | -12/+14 |
| |\| | | |||||
| | * | | fix markdown tests | Mario Vavti | 2018-10-30 | 1 | -1/+2 |
| | | | | |||||
| | * | | really fix html2markdown() - when using environment, we must set the defaults | Mario Vavti | 2018-10-30 | 1 | -5/+13 |
| | | | | |||||
| | * | | fix html2markdown() and re-enable previously failing tests | Mario Vavti | 2018-10-30 | 1 | -9/+2 |
| | |/ | |||||
| * | | typo | zotlabs | 2018-10-30 | 1 | -1/+1 |
| | | | |||||
| * | | issue syncing the channel_primary setting which shows up as a wrong count on ↵ | zotlabs | 2018-10-30 | 2 | -19/+17 |
| |/ | | | | the admin summary page | ||||
| * | 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 |
| | | | |||||
| * | | 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 '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 |
| | |\ \ | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |