History: src/json_diff.c — Fossil SCM

Sync with trunk.

florian 759782533… 2024-01-22 13:40

Sync with trunk.

florian f05b04a62… 2024-01-22 13:39

Merge trunk into markdown-tagrefs branch and resolve conflict.

stephan fdd3fe21c… 2023-06-03 08:59

Merge updates from trunk.

mistachkin e3df21cdf… 2023-05-21 03:37

Brought the ui-local-diff branch up to date relative to trunk. It isn't a simple merge, primarily …

wyoung 76fa16576… 2023-01-24 03:29

Add /json/settings/get and set APIs, per discussion in [forum:04b7159d63d4abe4|forum post 04b7159d6…

stephan a80f27485… 2023-01-23 00:12

Add missing 'void' to no-arg function decls and impls throughout the JSON API. (In my defense: the …

stephan 632dfd26d… 2023-01-19 01:01

Merge updates from trunk.

mistachkin 6f3640a71… 2022-10-17 01:02

Merge in trunk (release 2.17)

george c1868b9f8… 2021-10-09 20:13

Merge in trunk (release 2.17)

george a33f616e6… 2021-10-09 20:05

Merge in trunk (release 2.17)

george 315351f4a… 2021-10-09 19:50

Merge in trunk (release 2.17)

george 56e2d3ad6… 2021-10-09 19:31

json API: removed reference to recently-removed DIFF_CONTEXT_MASK.

stephan 0c496d8ad… 2021-09-07 21:12

Internally, use the new DiffConfig object to pass around diff settings, rather than the legacy u64 …

drh 1347a1ddb… 2021-09-06 22:26

Begin adding value that used to be function arguments into the DiffConfig object. This check-in de…

drh bdb4bfaa3… 2021-09-06 20:51

Merge from trunk.

ashepilko 19997e99c… 2018-08-02 08:32

Merge trunk

jan.nijtmans d15c1ba0f… 2017-08-31 01:59

merge trunk. Use new Win10 flag: SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE. See: [https://blogs…

jan.nijtmans 2999c7dc8… 2017-04-23 13:08

Merge trunk

jan.nijtmans 4bf7e4ef5… 2017-03-06 15:32

Merge cleanX

jan.nijtmans d73dcdd0a… 2017-02-14 19:23

merge trunk

jan.nijtmans 2ada986e1… 2017-02-06 23:31

Upgrade to openssl 1.1.0c. Merge trunk (up to fossil 1.37 release)

jan.nijtmans d0fbbd011… 2017-01-18 11:19

Remove some tabs and end-of-line whitespace

andygoth bf9669f55… 2016-11-07 01:29

Merge trunk

jan.nijtmans 1be2eb053… 2015-02-06 15:38

Workaround for recently introduced Cygwin bug: group permission is always set! This was the cause o…

jan.nijtmans d9dfe11d0… 2015-02-06 15:34

merge trunk

jan.nijtmans 9bc76f6a1… 2015-02-06 10:49

Restructure import.c, making it easier to compare with the new svn-import code. No change in functi…

jan.nijtmans 3209f0728… 2015-02-06 10:47

Merge all the latest trunk changes into the ipv6 branch.

drh d5f6e08c0… 2013-06-10 13:32

Merge with trunk - Remove reverse-proxying support which is already provided by --baseurl optio…

ashish 940b0b33c… 2013-04-21 08:08

merge trunk

jan.nijtmans d085eb9ac… 2013-02-27 11:26

merge trunk

jan.nijtmans ba3e82f18… 2013-01-24 10:53

merge trunk

jan.nijtmans a68dffbff… 2013-01-21 10:29

merge trunk

jan.nijtmans 6e9e6436a… 2013-01-11 12:28

Merge updates from trunk.

mistachkin a6647539f… 2013-01-07 17:33

Merge updates from trunk.

mistachkin 4f365f7b7… 2013-01-07 17:21

Updating from trunk. I've left some merge conflicts to solve (annotate, diff)

viriketo b5b8448ec… 2013-01-03 10:31

Enhance the diff logic so that it can suppress differences that do not match a regular expression. …

drh 97a7b924c… 2013-01-02 00:58

merge trunk

jan.nijtmans 26aa3eeab… 2012-09-04 06:52

Revert change [208d67675c]. The policy is to keep the Fossil source code ASCII even if Fossil itse…

drh c19f34cb6… 2012-08-31 20:46

Allow UTF-8 characters in sources. translate.exe will translate it to ASCII

jan.nijtmans 208d67675… 2012-08-29 19:41

merge trunk

jan.nijtmans c03780847… 2012-08-29 14:12

Allow UTF-8 characters in sources. translate.exe will translate it to ASCII

jan.nijtmans 9f6abc596… 2012-08-29 13:57

Allow UTF-8 characters in sources. translate.exe will translate it to ASCII

jan.nijtmans 9f6abc596… 2012-08-29 13:57

Updating from trunk to get the latest trunk fixes.

viriketo b7f3a32d4… 2012-04-04 16:20

Add vim modline everywhere

meeks a496d8e88… 2012-03-29 14:54

merge in trunk

meeks 150074d1d… 2012-03-29 14:48

Added --html|-h option to /json/diff to retrieve HTML-marked-up diffs.

stephan a15214e83… 2012-03-25 03:23

Merge latest changes from trunk.

ashish 7124f09f0… 2012-03-10 13:17

/json/diff now handles the no-diff case more gracefully.

stephan efbecda47… 2012-03-09 10:17

Merging from trunk. I manually solved the conflict widening the user name on annotate.

viriketo f201fbaea… 2012-03-01 22:30

Fossil SCM

src/json_diff.c

Keyboard Shortcuts