| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'redbasic-addroomforfooter' into 'dev' | Mario | 2018-08-21 | 2 | -2/+12 |
| |\ | | | | | | | | | Add bottom margin on aside elements and main to allow for viewport footer. See merge request hubzilla/core!1259 | ||||
| | * | Add bottom margin on aside elements and main to allow for viewport footer. | M.Dent | 2018-08-20 | 2 | -2/+12 |
| | | | |||||
| * | | Merge branch 'dev' into 'dev' | Mario | 2018-08-21 | 6 | -1851/+2442 |
| |\ \ | | | | | | | | | | | | | Update catalan translations for sstrings up to 18th July 2018 See merge request hubzilla/core!1260 | ||||
| | * | | Update catalan translations for sstrings up to 18th July 2018 | fadelkon | 2018-08-20 | 6 | -1851/+2442 |
| | |/ | |||||
| * / | Merge branch 'patch-17' into 'master' | Mario | 2018-08-21 | 1 | -1/+2 |
| |/ | | | | | | | | | Add missed app 'Order Apps' See merge request hubzilla/core!1258 (cherry picked from commit 85aa4957414c98fb6f44c0c2b79ef9d198e963a7) 6086a70e Add missed app 'Order Apps' | ||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-16 | 6 | -15/+587 |
| |\ | |||||
| | * | missing files | zotlabs | 2018-08-15 | 2 | -0/+554 |
| | | | |||||
| | * | possible fixes for can_comment_on_post(), provide wiki_list on wiki sidebar | zotlabs | 2018-08-15 | 4 | -15/+33 |
| | | | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-15 | 5 | -5/+48 |
| |\| | |||||
| | * | more backporting for zot6 | zotlabs | 2018-08-14 | 2 | -0/+41 |
| | | | |||||
| | * | issue with mdpost addon and archive.org links which contain a full url as a ↵ | zotlabs | 2018-08-13 | 4 | -5/+7 |
| | | | | | | | | | path/query component | ||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-14 | 12 | -67/+149 |
| |\| | |||||
| | * | hubloc DB changes needed for z6 | zotlabs | 2018-08-13 | 5 | -2/+44 |
| | | | |||||
| | * | oidc cleanup and discovery | zotlabs | 2018-08-13 | 4 | -29/+39 |
| | | | |||||
| | * | minor oauth2 updates - renamed zot webbie to 'webfinger' and zothash to ↵ | zotlabs | 2018-08-13 | 4 | -38/+68 |
| | | | | | | | | | 'portable_id', fixed/simplified cgi auth mode | ||||
| * | | Merge branch 'override-helpfiles' into 'dev' | Mario | 2018-08-14 | 2 | -38/+63 |
| |\ \ | | | | | | | | | | | | | Override helpfiles See merge request hubzilla/core!1257 | ||||
| | * | | Override helpfiles | M. Dent | 2018-08-14 | 2 | -38/+63 |
| |/ / | |||||
| * | | Merge branch 'add-template-overrides' into 'dev' | Mario | 2018-08-13 | 3 | -21/+56 |
| |\ \ | |/ |/| | | | | | Add template overrides See merge request hubzilla/core!1256 | ||||
| | * | Add support for overriding the default template location and individual ↵ | M.Dent | 2018-08-12 | 2 | -13/+45 |
| | | | | | | | | | templates via .htconfig.php | ||||
| | * | Fix root not added to internationalized template search | M.Dent | 2018-08-12 | 1 | -8/+11 |
| | | | |||||
| * | | add table support to markdown | zotlabs | 2018-08-12 | 1 | -2/+79 |
| | | | |||||
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-08-12 | 11 | -28/+160 |
| |\| | |||||
| | * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-12 | 3 | -2/+18 |
| | |\ | |||||
| | * \ | Merge branch 'oauth2-ui-pr' into 'dev' | Mario | 2018-08-12 | 2 | -9/+33 |
| | |\ \ | | | | | | | | | | | | | | | | | Oauth2 ui pr See merge request hubzilla/core!1255 | ||||
| | | * | | OAuth2 UI and settings updates | M.Dent | 2018-08-10 | 2 | -7/+30 |
| | | | | | |||||
| | | * | | Add user_id = local_channel() to the where clause of updates | M.Dent | 2018-08-10 | 1 | -2/+3 |
| | | | | | |||||
| | * | | | Merge branch 'oauth2' into 'dev' | Mario | 2018-08-12 | 5 | -12/+81 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Fixes to OAuth2 connect-with-openid. Add zothash Claim. Add zotwebbie Claim. See merge request hubzilla/core!1254 | ||||
| | | * | | | Fixes to OAuth2 connect-with-openid. Add zothash Claim. Add zotwebbie Claim. | M.Dent | 2018-08-10 | 5 | -12/+81 |
| | | | | | | |||||
| | * | | | | Merge branch 'patch-16' into 'dev' | Mario | 2018-08-12 | 1 | -1/+1 |
| | |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Add translation for missed string See merge request hubzilla/core!1253 | ||||
| | | * | | | Add translation for missed string | Max Kostikov | 2018-08-10 | 1 | -1/+1 |
| | |/ / / | |||||
| | * | | | revert debug comment from the last commit | Mario Vavti | 2018-08-09 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | fix zid leaking to nonzot sites if markdown is enabled | Mario Vavti | 2018-08-09 | 1 | -3/+41 |
| | | | | | |||||
| | * | | | search form action for channel search needs the channel address | Mario Vavti | 2018-08-09 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-09 | 23 | -1718/+8237 |
| | |\ \ \ | |||||
| | * | | | | update install.txt | Mario Vavti | 2018-08-08 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge branch 'patch-15' into 'dev' | Mario | 2018-08-08 | 1 | -3/+4 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add XMLreader in PHP requirements See merge request hubzilla/core!1252 | ||||
| | | * | | | | Add XMLreader in PHP requirements | Max Kostikov | 2018-08-03 | 1 | -3/+4 |
| | |/ / / / | |||||
| * | | | / | make channel_remove less memory hungry | zotlabs | 2018-08-12 | 1 | -1/+1 |
| | |_|_|/ |/| | | | |||||
| * | | | | prevent json-ld bombing, turn off browser autocomplete on channel sources ↵ | zotlabs | 2018-08-11 | 3 | -2/+18 |
| | |/ / |/| | | | | | | | | creation | ||||
| * | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-08-06 | 5 | -16/+33 |
| |\| | | |||||
| | * | | Merge branch 'fixactivityorderwithfilters' into 'master' | Mario | 2018-08-02 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add GET for filtered forums See merge request hubzilla/core!1251 (cherry picked from commit 4e6539efec70027facb70233254e9b47f8e86c6d) ee1fde42 Add GET for filtered forums | ||||
| | * | | Merge branch 'dev' into 'dev' | Mario | 2018-07-31 | 5 | -16/+33 |
| | |\ \ | | | | | | | | | | | | | | | | | Update Spanish translation See merge request hubzilla/core!1249 | ||||
| | | * | | Update Spanish translation | Manuel Jiménez Friaza | 2018-07-30 | 5 | -16/+33 |
| | | | | | |||||
| | * | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-07-31 | 2 | -9/+14 |
| | |\| | | |||||
| * | | | | bring some Zot6 libraries and interfaces to red/hubzilla | zotlabs | 2018-08-06 | 13 | -0/+7764 |
| | | | | | |||||
| * | | | | create alter_pdl hook | zotlabs | 2018-08-05 | 1 | -2/+10 |
| | | | | | |||||
| * | | | | ability for addons to create .pdl files and load them automatically | zotlabs | 2018-08-04 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | add app_options field | zotlabs | 2018-08-02 | 7 | -12/+38 |
| | | | | | |||||
| * | | | | update certs | zotlabs | 2018-08-01 | 2 | -1704/+422 |
| | | | | | |||||
| * | | | | hubzilla core issue #1258 | zotlabs | 2018-08-01 | 1 | -0/+4 |
| | | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |