Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: openresty/lua-cjson
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: onlyfeng/lua-cjson
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 17 commits
  • 1 file changed
  • 3 contributors

Commits on Mar 5, 2015

  1. Configuration menu
    Copy the full SHA
    f50a222 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2015

  1. encode integer for lua 5.3

    cloudwu committed Sep 1, 2015
    Configuration menu
    Copy the full SHA
    e02072c View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2015

  1. Compatible with lua 5.3.2

    cloudwu committed Dec 1, 2015
    Configuration menu
    Copy the full SHA
    f5ee43d View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2018

  1. Configuration menu
    Copy the full SHA
    b173f21 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4f7693f View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2018

  1. Configuration menu
    Copy the full SHA
    f5a5ccd View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2020

  1. Merge remote-tracking branch 'upstream/master'

    * upstream/master:
      feature: add option to disable forward slash escaping
    onlyfeng committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    b443add View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2020

  1. Merge remote-tracking branch 'upstream/master'

    * upstream/master: (22 commits)
      added -g by default.
      write sort_json, use it on perl tests to prevent hash table ordering failures
      run with gcc and clang
      ignore dtoa.c for cppcheck, don't share lua headers (breaks due to define)
      bring cppcheck back
      attempt to run openresty perl tests
      cmake doesn't support finding luajit, so skip it
      attempting to fix luajit cmake build
      use different header path for luajit make builds
      support error message testing for modern versions of lua
      add one_of testing to avoid hash table ordering causing test to fail
      make tests fail when they fail
      tell cmake where lua is
      use local lua for makefile build
      build after tests, so tests can do their own build test
      fail if tests are blocked
      see what happens if we run tests on github actions
      use macro instead of header defines for Lua 5.2+ support
      Lua 5.2+ maxn support
      Lua 5.2+ unpack support
      ...
    onlyfeng committed Sep 10, 2020
    Configuration menu
    Copy the full SHA
    bca3276 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2021

  1. Merge remote-tracking branch 'upstream/master'

    * upstream/master:
      bump version to 2.1.0.9
      Update CI (#68)
    onlyfeng committed Apr 22, 2021
    Configuration menu
    Copy the full SHA
    2ab3a07 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2021

  1. Configuration menu
    Copy the full SHA
    7be330e View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2021

  1. Configuration menu
    Copy the full SHA
    4a55f25 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2022

  1. Configuration menu
    Copy the full SHA
    223f84e View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2022

  1. Merge commit 'f50a2225b137700b7454c7b8da1266bb2329ddf1'

    * commit 'f50a2225b137700b7454c7b8da1266bb2329ddf1':
      Support lua 5.3 integer representation
    onlyfeng committed Nov 21, 2022
    Configuration menu
    Copy the full SHA
    afc512a View commit details
    Browse the repository at this point in the history
  2. Merge commit 'e02072ce28a5621725cbce23e32bbe3e38f0dcb3'

    * commit 'e02072ce28a5621725cbce23e32bbe3e38f0dcb3':
      encode integer for lua 5.3
    onlyfeng committed Nov 21, 2022
    Configuration menu
    Copy the full SHA
    dc7df68 View commit details
    Browse the repository at this point in the history
  3. Merge commit 'f5ee43d284d24c100bb11ecf286a04999bca6514'

    * commit 'f5ee43d284d24c100bb11ecf286a04999bca6514':
      Compatible with lua 5.3.2
    onlyfeng committed Nov 21, 2022
    Configuration menu
    Copy the full SHA
    dc04182 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2023

  1. Merge branch 'master' of https://github.com/openresty/lua-cjson

    * 'master' of https://github.com/openresty/lua-cjson:
      Add updated netlib dtoa.c from https://netlib.sandia.gov/fp/dtoa.c
      feature: Add option to skip invalid value types.
      optimization: add void to functions with no arguments to prevent compiler warning.
      bumped version to 2.1.0.11. (#86)
      add lua 5.4 to test suite
    onlyfeng committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    24d2810 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2023

  1. Merge branch 'master' of https://github.com/openresty/lua-cjson

    回滚 T_INTEGER 的合并支持 (保持和 upsteam/master 一致)
    onlyfeng committed May 12, 2023
    Configuration menu
    Copy the full SHA
    792975f View commit details
    Browse the repository at this point in the history
Loading