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/25 17:21:21 UTC
[27/51] [abbrv] 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 Shawn Feldman (8) and others
# Via Dave Johnson (5) and others
* 'master' of https://github.com/usergrid/usergrid: (27 commits)
rebuilding artifacts after merge
Test case for default query string options
[DPS-865] Client will accept a 'default_qs' object with the options that will automatically populate the query string for each subsequent request. any query params passed directly to the request method will override these defaults in the event of a conflict.
prepare new version
fix issue with querying specific fields instead of entire object
fix issue with find_by using exclamation point
lock down rails version to 3.2.x
test for names with spaces
fix bug with analytics
reset version number add built files, so site doesn't initially have to be built
removing another reference to angularitics
missed angularitics reference
remove s3 and angularticis
Ignore two-dot-o's ignored files.
Renamed PR to match org.apache
USERGRID-86: Remove restriction on 10 apps in the portal, add build files
USERGRID-86: Remove restriction on 10 apps in the portal
USERGRID-86: Remove restriction on 10 apps in the portal
Fixing regression bug in Assets
Updating build artifacts
...
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4431562a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4431562a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4431562a
Branch: refs/heads/two-dot-o
Commit: 4431562ac799429e8ccbe33b057a48e2181072de
Parents: 5a5644e 24425d5
Author: grey <gr...@apigee.com>
Authored: Wed Mar 19 12:04:48 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Wed Mar 19 12:04:48 2014 -0700
----------------------------------------------------------------------
.gitignore | 9 +-
portal/config.js | 11 +-
portal/index-debug.html | 18 +-
portal/index-template.html | 2 +-
portal/index.html | 18 +-
portal/js/app.js | 7 +-
portal/js/global/page-controller.js | 58 +-
portal/js/global/page-title.html | 2 +-
portal/js/global/ug-service.js | 74 +-
portal/js/libs/usergrid-libs.min.js | 22 +-
portal/js/libs/usergrid.sdk.js | 5 +
portal/js/login/forgot-password-controller.js | 1 -
portal/js/login/login-controller.js | 8 +-
portal/js/login/login.html | 6 +
portal/js/menus/appMenu.html | 7 +-
portal/js/menus/menu-directives.js | 1 -
portal/js/org-overview/org-overview.html | 4 +-
portal/js/templates.js | 57 +-
portal/js/usergrid-dev.min.js | 171 +-
portal/js/usergrid.min.js | 12 +-
portal/js/users/users-feed-controller.js | 29 +
portal/js/users/users-feed.html | 27 +
portal/js/users/users.html | 1 +
portal/package.json | 5 +-
portal/phantomjsdriver.log | 3869 ------------------
portal/seleniumLog.txt | 0
portal/tests/unit/sample.spec.js | 3 +-
sdks/html5-javascript/lib/Usergrid.js | 13 +-
sdks/html5-javascript/lib/modules/Asset.js | 4 +-
sdks/html5-javascript/lib/modules/Client.js | 74 +-
sdks/html5-javascript/lib/modules/Folder.js | 4 +-
sdks/html5-javascript/package.json | 2 +-
sdks/html5-javascript/tests/mocha/test.js | 25 +
sdks/html5-javascript/usergrid.js | 36 +-
sdks/html5-javascript/usergrid.min.js | 6 +-
.../lib/usergrid_ironhorse/query.rb | 30 +-
.../lib/usergrid_ironhorse/version.rb | 2 +-
.../spec/usergrid_ironhorse/base_spec.rb | 8 +-
sdks/ruby-on-rails/usergrid_ironhorse.gemspec | 4 +-
.../1.5.4/AppleJavaExtensions-1.5.4.jar | Bin 0 -> 23531 bytes
.../1.5.4/AppleJavaExtensions-1.5.4.pom | 9 +
.../maven-metadata-local.xml | 12 +
stack/pom.xml | 7 +-
.../services/AbstractCollectionService.java | 3 +
.../RepairingMismatchedApplicationMetadata.java | 73 +
45 files changed, 655 insertions(+), 4084 deletions(-)
----------------------------------------------------------------------