aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Zot/Finger: ignore deleted hublocszotlabs2018-08-212-2/+2
| * more code optimisationzotlabs2018-08-202-16/+20
* | Merge branch 'redbasic-addroomforfooter' into 'dev'Mario2018-08-221-0/+3
|\ \
| * | Fix jumpy sidebarsM.Dent2018-08-211-0/+3
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-215-90/+101
|\ \ \ | | |/ | |/|
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-08-204-59/+119
| |\ \
| * | | remove checkjs reloader from mod_display alsozotlabs2018-08-201-48/+42
| * | | Only show cover photos once per login session. After that they can get annoyi...zotlabs2018-08-201-0/+10
| * | | channel page performance improvement: don't use "checkjs" with an associated ...zotlabs2018-08-201-42/+44
| * | | hubzilla core issue #1262zotlabs2018-08-171-0/+1
| * | | Suppress duplicate info() messages. This was done long for notice(), but info...zotlabs2018-08-161-0/+4
* | | | Merge branch 'redbasic-addroomforfooter' into 'dev'Mario2018-08-212-2/+12
|\ \ \ \ | | |_|/ | |/| |
| * | | Add bottom margin on aside elements and main to allow for viewport footer.M.Dent2018-08-202-2/+12
| | |/ | |/|
* | | Merge branch 'dev' into 'dev'Mario2018-08-216-1851/+2442
|\ \ \
| * | | Update catalan translations for sstrings up to 18th July 2018fadelkon2018-08-206-1851/+2442
| |/ /
* / / Merge branch 'patch-17' into 'master'Mario2018-08-211-1/+2
|/ /
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-166-15/+587
|\|
| * missing fileszotlabs2018-08-152-0/+554
| * possible fixes for can_comment_on_post(), provide wiki_list on wiki sidebarzotlabs2018-08-154-15/+33
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-155-5/+48
|\|
| * more backporting for zot6zotlabs2018-08-142-0/+41
| * issue with mdpost addon and archive.org links which contain a full url as a p...zotlabs2018-08-134-5/+7
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-1412-67/+149
|\|
| * hubloc DB changes needed for z6zotlabs2018-08-135-2/+44
| * oidc cleanup and discoveryzotlabs2018-08-134-29/+39
| * minor oauth2 updates - renamed zot webbie to 'webfinger' and zothash to 'port...zotlabs2018-08-134-38/+68
* | Merge branch 'override-helpfiles' into 'dev'Mario2018-08-142-38/+63
|\ \
| * | Override helpfilesM. Dent2018-08-142-38/+63
|/ /
* | Merge branch 'add-template-overrides' into 'dev'Mario2018-08-133-21/+56
|\ \ | |/ |/|
| * Add support for overriding the default template location and individual templ...M.Dent2018-08-122-13/+45
| * Fix root not added to internationalized template searchM.Dent2018-08-121-8/+11
* | add table support to markdownzotlabs2018-08-121-2/+79
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-08-1211-28/+160
|\|
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-123-2/+18
| |\
| * \ Merge branch 'oauth2-ui-pr' into 'dev'Mario2018-08-122-9/+33
| |\ \
| | * | OAuth2 UI and settings updatesM.Dent2018-08-102-7/+30
| | * | Add user_id = local_channel() to the where clause of updatesM.Dent2018-08-101-2/+3
| * | | Merge branch 'oauth2' into 'dev'Mario2018-08-125-12/+81
| |\ \ \
| | * | | Fixes to OAuth2 connect-with-openid. Add zothash Claim. Add zotwebbie Claim.M.Dent2018-08-105-12/+81
| * | | | Merge branch 'patch-16' into 'dev'Mario2018-08-121-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add translation for missed stringMax Kostikov2018-08-101-1/+1
| |/ / /
| * | | revert debug comment from the last commitMario Vavti2018-08-091-1/+1
| * | | fix zid leaking to nonzot sites if markdown is enabledMario Vavti2018-08-091-3/+41
| * | | search form action for channel search needs the channel addressMario Vavti2018-08-091-1/+1
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-0923-1718/+8237
| |\ \ \
| * | | | update install.txtMario Vavti2018-08-081-1/+1
| * | | | Merge branch 'patch-15' into 'dev'Mario2018-08-081-3/+4
| |\ \ \ \
| | * | | | Add XMLreader in PHP requirementsMax Kostikov2018-08-031-3/+4
| |/ / / /
* | | | / make channel_remove less memory hungryzotlabs2018-08-121-1/+1
| |_|_|/ |/| | |
* | | | prevent json-ld bombing, turn off browser autocomplete on channel sources cre...zotlabs2018-08-113-2/+18
| |/ / |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 20:21:59 +0000