You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/03/21 20:21:23 UTC
[36/44] git commit: Merge branch 'master' of
https://github.com/usergrid/usergrid into Export_Persistance_Integration
Merge branch 'master' of https://github.com/usergrid/usergrid into Export_Persistance_Integration
# By ryan bridges (6) and Lieven Govaerts (2)
# Via ryan bridges (2) and others
* 'master' of https://github.com/usergrid/usergrid:
Added Counters section to readme
tweaking formatting in readme
Changing script reference to local path
Adding basic asset documentation to README
Update changelog for 0.10.8
Updating version to 0.10.8. Updating references to point to apache documentation
For USERGRID-100, add a NOTICE file and update LICENSE for the SBJson and SSKeychain components in the iOS SDK..
Partial fix for USERGRID-100: Add the correct A.L. headers to the ios sdk files.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/153cf717
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/153cf717
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/153cf717
Branch: refs/pull/76/head
Commit: 153cf71762fe0baada6300d0d9259816278858b0
Parents: 1f71604 3f93ca7
Author: grey <gr...@apigee.com>
Authored: Fri Mar 21 11:48:18 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Fri Mar 21 11:48:18 2014 -0700
----------------------------------------------------------------------
LICENSE | 65 ++++++++-
NOTICE | 11 ++
sdks/html5-javascript/README.md | 206 ++++++++++++++++++++++-----
sdks/html5-javascript/changelog.md | 10 +-
sdks/ios/UGAPI/UGActivity.h | 17 +++
sdks/ios/UGAPI/UGActivity.m | 17 +++
sdks/ios/UGAPI/UGClient.h | 17 +++
sdks/ios/UGAPI/UGClient.m | 17 +++
sdks/ios/UGAPI/UGClientDelegate.h | 17 +++
sdks/ios/UGAPI/UGClientResponse.h | 17 +++
sdks/ios/UGAPI/UGClientResponse.m | 17 +++
sdks/ios/UGAPI/UGHTTPManager.h | 17 +++
sdks/ios/UGAPI/UGHTTPManager.m | 17 +++
sdks/ios/UGAPI/UGMultiStepAction.h | 17 +++
sdks/ios/UGAPI/UGMultiStepAction.m | 17 +++
sdks/ios/UGAPI/UGQuery.h | 17 +++
sdks/ios/UGAPI/UGQuery.m | 17 +++
sdks/ios/UGAPI/UGUser.h | 17 +++
sdks/ios/UGAPI/UGUser.m | 23 ++-
sdks/ios/UGAPIApp/UGAPIApp-Prefix.pch | 17 +++
sdks/ios/UGAPIApp/UGAppAppDelegate.h | 23 ++-
sdks/ios/UGAPIApp/UGAppAppDelegate.m | 23 ++-
sdks/ios/UGAPIApp/UGAppViewController.h | 23 ++-
sdks/ios/UGAPIApp/UGAppViewController.m | 23 ++-
sdks/ios/UGAPIApp/main.m | 23 ++-
sdks/ios/UGAPIAppTests/UGAPIAppTests.h | 23 ++-
sdks/ios/UGAPIAppTests/UGAPIAppTests.m | 23 ++-
27 files changed, 639 insertions(+), 92 deletions(-)
----------------------------------------------------------------------