summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'release/4.1.0'v4.1.04.1.0Joel Fischer2016-03-308-41/+59
|\
| * Update version to 4.1.0Joel Fischer2016-03-305-8/+8
| * Fixed a typo in CHANGELOGrelease/4.1.0Joel Fischer2016-03-231-1/+1
| * Update CHANGELOG with 4.1.0 in progress detailsJoel Fischer2016-03-231-1/+20
| * Merge branch 'master' into developJoel Fischer2016-03-220-0/+0
| |\ | |/ |/|
* | Merge branch 'hotfix/issue_377'Joel Fischer2016-03-221-0/+33
|\ \
| | * Merge branch 'hotfix/issue_377' into developJoel Fischer2016-03-221-0/+33
| | |\ | | |/ | |/|
| * | use SDLGlobals versionhotfix/issue_377Justin Dickow2016-03-101-1/+1
| * | Sending application state to SDLJustin Dickow2016-03-101-0/+33
| | * Merge branch 'master' into developJoel Fischer2016-03-1613-535/+24
| | |\ | |_|/ |/| |
* | | Merge branch 'hotfix/issue_380'Joel Fischer2016-03-1613-535/+24
|\ \ \
| * | | Remove static OCMock, grab from CarthageJoel Fischer2016-03-1613-535/+24
|/ / /
| | * Merge branch 'pr/379' into developJoel Fischer2016-03-163-34/+33
| | |\
| | | * Added ignoring of warning for usage of deprecated methods in spec tests.Muller, Alexander (A.)2016-03-161-1/+7
| | | * Added Spec Test for handling heartbeat acknowledgement.Muller, Alexander (A.)2016-03-161-0/+25
| | | * Removed ability for in-app sending of heartbeats. Support for heartbeat now o...Muller, Alexander (A.)2016-03-152-33/+1
| | | |\
| | | | * Re-added the sendHeartbeat function to avoid doesNotRespondSelector error bec...Muller, Alexander (A.)2016-03-111-0/+10
| | | | * Initial commit that is re-adding the ability to acknowledge heartbeats, but w...Muller, Alexander (A.)2016-03-116-8/+88
| | | | * Re-added public facing header functions relating to Heartbeat, with __depreca...Muller, Alexander (A.)2016-03-076-1/+16
| | | | * Removal of heartbeat acknowledgement, maintenance and upkeep.Muller, Alexander (A.)2016-03-078-137/+1
| | * | | Merge branch 'master' into developJoel Fischer2016-03-163-2/+11
| | |\ \ \ | |_|/ / / |/| | / / | | |/ /
* | | | Merge branch 'hotfix/issue_371'Joel Fischer2016-03-163-2/+11
|\ \ \ \
| * | | | Update system version checking with a macroJoel Fischer2016-03-163-3/+5
| * | | | Merge branch 'master' into hotfix/issue_371Joel Fischer2016-03-1637-1448/+148
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | Don't check BOOL against NO, use ! insteadhotfix/issue_371Justin Dickow2016-03-111-1/+1
| * | | | Fix StreamingMediaManager version checkJoel Fischer2016-03-101-1/+2
| * | | | Check OS version in LAUNCH_APPJustin Dickow2016-03-101-1/+7
| | | * | Merge branch 'master' into developJoel Fischer2016-03-1433-1334/+14
| | | |\ \ | |_|_|/ / |/| | | |
* | | | | Merge branch 'hotfix/issue_354'Joel Fischer2016-03-1432-1327/+0
|\ \ \ \ \
| * | | | | Untrack testing frameworkshotfix/issue_354Joel Fischer2016-03-1032-1327/+0
| | |/ / / | |/| | |
* | | | | Merge branch 'hotfix/issue_349'Joel Fischer2016-03-141-7/+14
|\ \ \ \ \
| * | | | | Remove a useless nil checkJoel Fischer2016-03-141-3/+1
| * | | | | Remove a session id after the service is disconnectedhotfix/issue_349Joel Fischer2016-03-101-7/+16
| |/ / / /
| | | * | Merge branch 'master' into developJoel Fischer2016-03-145-112/+144
| | | |\ \ | |_|_|/ / |/| | | |
* | | | | Merge branch 'hotfix/issue_359'Joel Fischer2016-03-144-7/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Only call `onProxyOpened:` when its an RPC servicehotfix/issue_359Joel Fischer2016-03-041-1/+1
| * | | | Fix protocol test that now returns a bulk data rpcJoel Fischer2016-03-041-3/+2
| * | | | Merge branch 'master' into hotfix/issue_359Joel Fischer2016-03-0417-192/+229
| |\ \ \ \
| * | | | | BulkData fixesJoel Fischer2016-02-253-3/+3
* | | | | | Merge branch 'hotfix/issue_371'Joel Fischer2016-03-101-0/+12
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Actually call the right methodJustin Dickow2016-03-101-1/+1
| * | | | | Add support for LAUNCH_APP system requestJustin Dickow2016-03-091-0/+12
* | | | | | Merge branch 'hotfix/issue_364'Joel Fischer2016-03-101-102/+116
|\ \ \ \ \ \
| * | | | | | Fixes to HTTP system request uploadhotfix/issue_364Joel Fischer2016-03-101-102/+103
| * | | | | | Use "application/json" as the content-typeJustin Dickow2016-03-091-0/+1
| * | | | | | Created new uploadData methodJustin Dickow2016-03-091-4/+16
| |/ / / / /
* | | | | | Fix some bad code stylingJoel Fischer2016-03-101-4/+4
* | | | | | Update README with additional testing informationJoel Fischer2016-03-101-1/+8
|/ / / / /
| | | * | Merge branch 'master' into developJoel Fischer2016-03-092-1/+150
| | | |\ \ | |_|_|/ / |/| | | |
* | | | | Add getting started code to READMEJoel Fischer2016-03-091-0/+149
| |_|_|/ |/| | |