Artifact
bd7c9b025602cdbe9a866dcf6ba14195551dac1ffe38c2eabdf86bb59780f73c:
- File
src/capabilities.c
-
2020-12-22 20:11:11
— part of check-in
[217b0d2548]
on branch chatroom-dev
— Begin trying to integrate the chatroom prototype into the Fossil core.
New code is in src/chat.c and src/chat.js. Add the new "C" capability
to enable access to chat. The new code compiles but is
not yet functional. (This is an incremental check-in.)
The original tools/chat.tcl Wapp script is still available for reference.
(user:
drh
size: 13647)
-
2020-12-23 18:27:12
— part of check-in
[e8ba89b168]
on branch trunk
— Merge the development of the Fossil chatroom onto trunk. This feature is
well isolated from the rest of the system and so we can safely continue
development on trunk, which is more convenient for testing.
(user:
drh
size: 13647)
-
2021-01-20 19:19:22
— part of check-in
[0e31c8d258]
on branch wiki-history
— Merge version-2.14
(user:
george
size: 13647)
-
2021-02-14 21:28:19
— part of check-in
[0516f4d3c8]
on branch ui-local-diff
— Brought graham's ui-local-diff branch up to date with respect to trunk.
This is not a simple merge, because it had to accommodate several
conflicting changes, so it needs to be re-checked for sanity before
being merged down to trunk. Also, some of the changes I made simply
reduce the size of the resulting diff relative to trunk and need to be
reverted; these are primarily 2-line splits of "else/if" so the
branch-specific change doesn't repeat the following "if" condition,
which is now the "else if" condition. I think this sort of thing aids
understanding of the diff, even though it breaks the style guidelines.
(user:
wyoung
size: 13647)
-
2021-03-01 07:37:26
— part of check-in
[ea28708f85]
on branch artifact-view-links
— Merged trunk changes in. Only needed to track my own rename of
branch_of_rid() to branch_of_ckin_rid()
(user:
wyoung
size: 13647)