Commits

Branch selector

 master

User selector

All users

All time

Commit History

Commits on Dec 18, 2011

• Merge branch 'master' of github.com:johnezang/JSONKit

  johnezang

  committed
  0aff3de

  Copy full SHA for 0aff3de

• Updated README.md with benchmark information for NSJSONSerialization.

  johnezang

  committed
  2388b6f

  Copy full SHA for 2388b6f

Commits on Nov 17, 2011

• Merge pull request #58 from samsoffes/master

  Show description for e3f9017
  johnezang

  committed
  e3f9017

  Copy full SHA for e3f9017

• Changed cast to NSDictionary per John's request

  soffes

  committed
  395ab9a

  Copy full SHA for 395ab9a

• Surpress "multiple methods named" error

  Show description for c494f8d
  soffes

  committed
  c494f8d

  Copy full SHA for c494f8d

Commits on Sep 23, 2011

• Fixes issues #9, #15, #40, aka "crashes on 64-bit Lion / 10.7 ABI".

  Show description for c2ef692
  johnezang

  committed
  c2ef692

  Copy full SHA for c2ef692

• Merge pull request #46 from jparise/cache-collisions

  Show description for 660546f
  johnezang

  committed
  660546f

  Copy full SHA for 660546f

Commits on Sep 22, 2011

• Merge pull request #50 from atnan/fixclang2errors

  Show description for 6d3938e
  johnezang

  committed
  6d3938e

  Copy full SHA for 6d3938e

• Fix ambiguous method (initWithObjects:count:) compilation errors under Clang 3.0.

  atnan

  committed
  3624e0f

  Copy full SHA for 3624e0f

Commits on Aug 31, 2011

• Use memcmp() instead of strncmp() to compare cache buckets.

  Show description for c34c374
  jparise

  committed
  c34c374

  Copy full SHA for c34c374

Commits on Jun 16, 2011

• Added note about Automatic Reference Counting (ARC) to README.md and some preprocessor-foo to JSONKit.m to check if JSONKit is being compiled with ARC / `-fobjc-arc` and #error if it is.

  johnezang

  committed
  c2146ff

  Copy full SHA for c2146ff

Commits on Jun 5, 2011

• Minor tweak to the minor tweak.

  johnezang

  committed
  4656c2d

  Copy full SHA for 4656c2d

• Minor tweak.

  johnezang

  committed
  601588e

  Copy full SHA for 601588e

• Added "JKSerializeOptionEscapeForwardSlashes". Changed a number of <table> constructions to the easier Markdown extra tables to see if the new github markdown processor accepts them. Also changed…

  Show description for ac07028
  johnezang

  committed
  ac07028

  Copy full SHA for ac07028

Commits on Jun 3, 2011

• Fixes issue gh-29, license descrepency between README.md and JSONKit.[hm].

  johnezang

  committed
  df39818

  Copy full SHA for df39818

Commits on May 22, 2011

• Fix typo.

  johnezang

  committed
  2efa7e6

  Copy full SHA for 2efa7e6

Commits on May 21, 2011

• Moved the +load logic from JSONDecoder in to jk_collectionClassLoadTimeInitialization(). Missed the JSONDecoder +load stuff on the last commit. Related to issue #23.

  johnezang

  committed
  cab1ea8

  Copy full SHA for cab1ea8

• Added cocoanetics JSON comparison.

  johnezang

  committed
  353b124

  Copy full SHA for 353b124

• Workarounds for issue #19 (the clang stuff) and issue #23. For issue #23, the code in the collection classes `+load` was removed and placed in a function with the `__attribute__ ((constructor))` a…

  Show description for f403357
  johnezang

  committed
  f403357

  Copy full SHA for f403357

Commits on May 5, 2011

• Merge pull request #22 from jordanbreeding/master

  Show description for 7e4d3ec
  johnezang

  committed
  7e4d3ec

  Copy full SHA for 7e4d3ec

Commits on May 4, 2011

• Pacify Xcode 4.1.

  

  Jordan Breeding

  committed
  0ef031d

  Copy full SHA for 0ef031d

Commits on May 2, 2011

• Adds a serializing option to backslash escape forward slashes. This is for issue #21.

  johnezang

  committed
  b8359c6

  Copy full SHA for b8359c6

Commits on Apr 25, 2011

• Change a NSException from exceptionWithName: to raise:. Closes #20.

  johnezang

  committed
  e1cb174

  Copy full SHA for e1cb174

Commits on Apr 22, 2011

• Fixes a bug when removing items from a JKDictionary. Since JKDictionary is implemented using a hash table that uses linear probing, the removal function needs to "re-add" items that follow the rem…

  Show description for 862fa4d
  johnezang

  committed
  862fa4d

  Copy full SHA for 862fa4d

Commits on Mar 31, 2011

• When commiting the fix for hash % dictionary->capacity, some local, in progress edits made it in to the commit. This change backs them out.

  johnezang

  committed
  2e6ccf4

  Copy full SHA for 2e6ccf4

Commits on Mar 28, 2011

• Fixes a bug when trying to retrieve a key from a dictionary that contains no items (div by zero: (keyHash % dictionary->capacity))

  johnezang

  committed
  18a0a3a

  Copy full SHA for 18a0a3a

• Removed a comment line that got duplicated somehow when updating the license information.

  johnezang

  committed
  635005b

  Copy full SHA for 635005b

• Modified the JSONKit so that it is dual licensed under either the BSD or Apache v2.0 license. This was motivated by the discussion at https://github.com/facebook/three20/pull/465

  johnezang

  committed
  3c6ff50

  Copy full SHA for 3c6ff50

Commits on Mar 25, 2011

• More github markdown parsing hackery to CHANGELOG.md...

  johnezang

  committed
  1b123b6

  Copy full SHA for 1b123b6

• More github markdown parsing hackery to CHANGELOG.md...

  johnezang

  committed
  f8877a5

  Copy full SHA for f8877a5

• More github markdown parsing hackery to CHANGELOG.md...

  johnezang

  committed
  8bdc6bf

  Copy full SHA for 8bdc6bf

• Try to clean up githubs markdown parsing of *s in <pre> blocks... missed a few from the last round

  johnezang

  committed
  3da8086

  Copy full SHA for 3da8086

• Try to clean up githubs markdown parsing of *s in <pre> blocks...

  johnezang

  committed
  0395bf9

  Copy full SHA for 0395bf9

• Update CHANGELOG.md and include an example of the new unsupported class formatting feature.

  johnezang

  committed
  e06349e

  Copy full SHA for e06349e

• Two major changes and one minor change in this commit.

  Show description for daf18f3
  johnezang

  committed
  daf18f3

  Copy full SHA for daf18f3