usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [38/41] git commit: Merge pull request #57 from shawnfeldman/master
Date Mon, 24 Feb 2014 07:21:33 GMT
Merge pull request #57 from shawnfeldman/master

bug fixes for user input and performance fixes

Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/57f0a947
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/57f0a947
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/57f0a947

Branch: refs/pull/55/merge
Commit: 57f0a94751a0750f6e771363351945469c1ba31c
Parents: 231edee 2c4af65
Author: Rod Simpson <rod@rodsimpson.com>
Authored: Thu Feb 20 13:58:26 2014 -0700
Committer: Rod Simpson <rod@rodsimpson.com>
Committed: Thu Feb 20 13:58:26 2014 -0700

----------------------------------------------------------------------
 .gitignore                                      |     1 +
 portal/Gruntfile.js                             |    74 +-
 portal/archive/coming_soon.html                 |    31 +
 .../ui-bg_diagonals-thick_90_eeeeee_40x40.png   |   Bin 0 -> 251 bytes
 .../images/ui-bg_flat_100_deedf7_40x100.png     |   Bin 0 -> 182 bytes
 .../images/ui-bg_flat_100_e4f1fb_40x100.png     |   Bin 0 -> 213 bytes
 .../images/ui-bg_flat_100_f2f5f7_40x100.png     |   Bin 0 -> 212 bytes
 .../images/ui-bg_flat_15_cd0a0a_40x100.png      |   Bin 0 -> 181 bytes
 .../images/ui-bg_flat_50_3baae3_40x100.png      |   Bin 0 -> 182 bytes
 .../images/ui-bg_flat_80_d7ebf9_40x100.png      |   Bin 0 -> 183 bytes
 .../ui-bg_highlight-hard_70_000000_1x100.png    |   Bin 0 -> 118 bytes
 .../ui-bg_highlight-soft_25_ffef8f_1x100.png    |   Bin 0 -> 153 bytes
 .../images/ui-icons_000000_256x240.png          |   Bin 0 -> 4369 bytes
 .../images/ui-icons_2694e8_256x240.png          |   Bin 0 -> 4369 bytes
 .../images/ui-icons_2e83ff_256x240.png          |   Bin 0 -> 4369 bytes
 .../images/ui-icons_3d80b3_256x240.png          |   Bin 0 -> 4369 bytes
 .../images/ui-icons_72a7cf_256x240.png          |   Bin 0 -> 4369 bytes
 .../images/ui-icons_ffffff_256x240.png          |   Bin 0 -> 4369 bytes
 .../css/custom-theme/jquery-ui-1.8.9.custom.css |   573 +
 portal/archive/css/jquery-ui-timepicker.css     |    53 +
 portal/archive/css/jquery.ui.statusbar.css      |    25 +
 portal/archive/css/prettify.css                 |    52 +
 portal/archive/css/usergrid-stripped.css        |  5199 ++++
 portal/archive/css/usergrid.css                 |  5203 ++++
 portal/archive/dash/README.md                   |     3 +
 .../archive/dash/config/testacular-e2e.conf.js  |    22 +
 portal/archive/dash/config/testacular.conf.js   |    20 +
 portal/archive/dash/test/e2e/runner.html        |    10 +
 portal/archive/dash/test/e2e/scenarios.js       |    45 +
 .../dash/test/lib/angular/angular-mocks.js      |  1764 ++
 .../dash/test/lib/angular/angular-scenario.js   | 26195 +++++++++++++++++
 .../archive/dash/test/lib/angular/version.txt   |     1 +
 .../archive/dash/test/unit/controllersSpec.js   |    31 +
 portal/archive/dash/test/unit/directivesSpec.js |    19 +
 portal/archive/dash/test/unit/filtersSpec.js    |    19 +
 portal/archive/dash/test/unit/servicesSpec.js   |    14 +
 portal/archive/images/APNS_cert_upload.png      |   Bin 0 -> 33956 bytes
 portal/archive/images/APNS_certification.png    |   Bin 0 -> 16855 bytes
 portal/archive/images/android-notification.png  |   Bin 0 -> 41629 bytes
 portal/archive/images/android-sdk-download.png  |   Bin 0 -> 4848 bytes
 portal/archive/images/api-activity.gif          |   Bin 0 -> 10819 bytes
 portal/archive/images/apigee-logo.png           |   Bin 0 -> 3647 bytes
 portal/archive/images/apigeetopbar.png          |   Bin 0 -> 4658 bytes
 portal/archive/images/background_one_col.png    |   Bin 0 -> 3126 bytes
 portal/archive/images/btn-copyCurl-up.png       |   Bin 0 -> 2762 bytes
 portal/archive/images/clippy-bg.png             |   Bin 0 -> 561 bytes
 portal/archive/images/close.gif                 |   Bin 0 -> 718 bytes
 portal/archive/images/dotnet-sdk-download.png   |   Bin 0 -> 7149 bytes
 portal/archive/images/down_arrow.png            |   Bin 0 -> 1285 bytes
 portal/archive/images/error.png                 |   Bin 0 -> 2009 bytes
 portal/archive/images/faviconApigee.ico         |   Bin 0 -> 1150 bytes
 .../images/glyphicons-halflings-white.png       |   Bin 0 -> 4352 bytes
 portal/archive/images/glyphicons-halflings.png  |   Bin 0 -> 4352 bytes
 .../glyphicons_halflings_135_wrench-white2.pdn  |   Bin 0 -> 5400 bytes
 .../glyphicons_halflings_135_wrench-white2.png  |   Bin 0 -> 296 bytes
 .../images/glyphicons_halflings_135_wrench.png  |   Bin 0 -> 228 bytes
 .../glyphicons_halflings_135_wrench_white.png   |   Bin 0 -> 251 bytes
 .../glyphicons_halflings_wrench_white.png       |   Bin 0 -> 1016 bytes
 portal/archive/images/google_api_key.png        |   Bin 0 -> 98118 bytes
 portal/archive/images/green_dot.png             |   Bin 0 -> 3472 bytes
 portal/archive/images/grid.png                  |   Bin 0 -> 166 bytes
 portal/archive/images/icons.png                 |   Bin 0 -> 13132 bytes
 portal/archive/images/ios-sdk-download.png      |   Bin 0 -> 4886 bytes
 portal/archive/images/iphone_message.png        |   Bin 0 -> 90307 bytes
 .../archive/images/javascript-sdk-download.png  |   Bin 0 -> 4618 bytes
 portal/archive/images/left_arrow.png            |   Bin 0 -> 1257 bytes
 portal/archive/images/logo-white.png            |   Bin 0 -> 2014 bytes
 portal/archive/images/menuActiveTriangle.png    |   Bin 0 -> 315 bytes
 portal/archive/images/nodejs-sdk-download.png   |   Bin 0 -> 5273 bytes
 portal/archive/images/notice.png                |   Bin 0 -> 2112 bytes
 portal/archive/images/orange-arrow.png          |   Bin 0 -> 242 bytes
 .../archive/images/push_notifications_icon.png  |   Bin 0 -> 338 bytes
 portal/archive/images/red_dot.png               |   Bin 0 -> 3482 bytes
 portal/archive/images/right_arrow.png           |   Bin 0 -> 1251 bytes
 portal/archive/images/ruby-sdk-download.png     |   Bin 0 -> 6343 bytes
 portal/archive/images/step_1.png                |   Bin 0 -> 1953 bytes
 portal/archive/images/step_2.png                |   Bin 0 -> 2117 bytes
 portal/archive/images/step_3.png                |   Bin 0 -> 2162 bytes
 portal/archive/images/success.png               |   Bin 0 -> 1863 bytes
 portal/archive/images/swish_arrow.png           |   Bin 0 -> 220 bytes
 portal/archive/images/topbackground.png         |   Bin 0 -> 2890 bytes
 portal/archive/images/up_arrow.png              |   Bin 0 -> 1292 bytes
 portal/archive/images/user-photo.png            |   Bin 0 -> 3849 bytes
 portal/archive/images/user_profile.png          |   Bin 0 -> 3775 bytes
 portal/archive/images/usergrid_200.png          |   Bin 0 -> 6397 bytes
 portal/archive/images/usergrid_400.png          |   Bin 0 -> 8746 bytes
 portal/archive/images/warning.png               |   Bin 0 -> 1179 bytes
 portal/archive/images/yellow_dot.png            |   Bin 0 -> 3475 bytes
 portal/archive/index-stripped2.html             |  1795 ++
 portal/archive/index.html                       |  1910 ++
 portal/archive/js/app/app.js                    |   131 +
 portal/archive/js/app/console.js                |  5393 ++++
 portal/archive/js/app/helpers.js                |   241 +
 portal/archive/js/app/navigation.js             |   251 +
 portal/archive/js/app/pages.js                  |   161 +
 portal/archive/js/app/params.js                 |    30 +
 portal/archive/js/app/quickLogin.js             |    30 +
 portal/archive/js/app/session.js                |   176 +
 portal/archive/js/app/sso.js                    |   135 +
 portal/archive/js/app/status.js                 |    37 +
 portal/archive/js/app/ui/collections.entity.js  |   320 +
 portal/archive/js/app/ui/collections.user.js    |   120 +
 portal/archive/js/app/ui/ui.js                  |   415 +
 portal/archive/js/app/usergrid.appSDK.js        |  2097 ++
 portal/archive/js/app/usergrid.appSDK.orig.js   |  2070 ++
 portal/archive/js/lib/MD5.min.js                |     1 +
 portal/archive/js/lib/backbone.js               |  1431 +
 portal/archive/js/lib/bootstrap.min.js          |     7 +
 portal/archive/js/lib/date.min.js               |     2 +
 portal/archive/js/lib/jquery-1.7.2.min.js       |     4 +
 portal/archive/js/lib/jquery-ui-1.8.18.min.js   |    15 +
 portal/archive/js/lib/jquery.dataset.min.js     |     1 +
 portal/archive/js/lib/jquery.dform-0.1.3.min.js |    16 +
 portal/archive/js/lib/jquery.jsonp-2.3.1.min.js |     3 +
 portal/archive/js/lib/jquery.tmpl.min.js        |    10 +
 .../archive/js/lib/jquery.ui.statusbar.min.js   |     1 +
 .../archive/js/lib/jquery.ui.timepicker.min.js  |     1 +
 portal/archive/js/lib/prettify.js               |  1477 +
 portal/archive/js/lib/underscore-min.js         |     5 +
 portal/archive/js/spec/client-tests.js          |   159 +
 portal/archive/js/spec/index.html               |    20 +
 portal/archive/js/spec/qunit-git.css            |   238 +
 portal/archive/js/spec/qunit-git.js             |  1865 ++
 portal/archive/js/unit-tests/appSDK-tests.js    |   255 +
 portal/archive/js/unit-tests/ie-jquery-tests.js |   191 +
 portal/archive/js/unit-tests/qunit.css          |   231 +
 portal/archive/js/unit-tests/qunit.js           |  1934 ++
 portal/archive/loading.html                     |     9 +
 portal/archive/max/index.html                   |     0
 portal/archive/planned_outage.html              |    48 +
 portal/archive/push/index.html                  |    34 +
 portal/archive/service_down.html                |    48 +
 .../apigee.ui.activities.table_rows.html        |    14 +
 .../templates/apigee.ui.admins.table_rows.html  |     8 +
 .../apigee.ui.applications.table_rows.html      |     4 +
 .../apigee.ui.collection.table_rows.html        |    67 +
 .../apigee.ui.collections.query.indexes.html    |     5 +
 .../apigee.ui.collections.table_rows.html       |     9 +
 .../apigee.ui.collections.user.header.html      |    21 +
 .../templates/apigee.ui.curl.detail.html        |    11 +
 .../templates/apigee.ui.feed.table_rows.html    |    15 +
 .../templates/apigee.ui.groups.table_rows.html  |    14 +
 .../apigee.ui.panels.group.activities.html      |    28 +
 .../apigee.ui.panels.group.details.html         |    97 +
 .../apigee.ui.panels.group.memberships.html     |    40 +
 .../apigee.ui.panels.group.permissions.html     |    99 +
 ...pigee.ui.panels.notifications.configure.html |    14 +
 .../apigee.ui.panels.role.permissions.html      |    58 +
 .../templates/apigee.ui.panels.role.users.html  |    38 +
 .../apigee.ui.panels.user.activities.html       |    40 +
 .../templates/apigee.ui.panels.user.graph.html  |    80 +
 .../apigee.ui.panels.user.memberships.html      |    40 +
 .../apigee.ui.panels.user.permissions.html      |   105 +
 .../apigee.ui.panels.user.profile.html          |   113 +
 .../apigee.ui.role.groups.table_rows.html       |    44 +
 .../templates/apigee.ui.roles.table_rows.html   |    15 +
 .../templates/apigee.ui.users.table_rows.html   |    18 +
 portal/archive/templates/test/modalForm2.html   |    32 +
 portal/archive/test/autocomplete.html           |    25 +
 portal/archive/test/modalForm.html              |    32 +
 portal/bower.json                               |     3 +-
 portal/build.sh                                 |    14 +-
 portal/config.js                                |    44 +-
 portal/css/dash.min.css                         |     1 +
 portal/css/main.css                             |  1391 +-
 portal/img/verify.png                           |   Bin 0 -> 22934 bytes
 portal/index-debug.html                         |   128 +
 portal/index-template.html                      |    26 +-
 portal/index.html                               |   128 +
 .../js/app-overview/app-overview-controller.js  |     5 +-
 portal/js/app-overview/app-overview.html        |     8 +-
 .../js/app-overview/doc-includes/android.html   |     2 +-
 .../app-overview/doc-includes/images/verify.png |   Bin 22934 -> 0 bytes
 portal/js/app-overview/doc-includes/ios.html    |     2 +-
 .../app-overview/doc-includes/javascript.html   |     2 +-
 .../app-overview/getting-started-controller.js  |     5 +-
 portal/js/app-overview/getting-started.html     |    39 +-
 portal/js/app.js                                |   104 +-
 portal/js/charts/chart-controller.js            |     2 +-
 portal/js/data/data.html                        |     9 +-
 portal/js/global/page-controller.js             |    36 +-
 portal/js/global/page-service.js                |   214 -
 portal/js/global/page-title.html                |    17 +
 portal/js/global/page-title.js                  |    31 +
 portal/js/global/ug-service.js                  |   208 +-
 portal/js/global/utility-service.js             |     4 +-
 portal/js/groups/groups-details-controller.js   |     2 +-
 portal/js/groups/groups.html                    |    13 +-
 .../libs/bootstrap/custom/css/bootstrap.min.css |   867 +-
 .../js/libs/jqueryui/jquery-ui-1.8.9.custom.css |   574 +-
 .../js/libs/jqueryui/jquery-ui-timepicker.css   |    54 +-
 portal/js/libs/usergrid-libs.min.js             |    22 +
 portal/js/libs/usergrid.sdk.js                  |     8 +-
 portal/js/login/forgot-password-controller.js   |     3 +-
 portal/js/login/login.html                      |     2 +-
 portal/js/org-overview/org-overview.html        |    12 +-
 portal/js/profile/account.html                  |     9 +-
 portal/js/roles/roles-controller.js             |     2 +-
 portal/js/roles/roles.html                      |    10 +-
 portal/js/shell/shell.html                      |     9 +-
 portal/js/templates.js                          |  2963 ++
 portal/js/usergrid-dev.min.js                   |  4771 +++
 portal/js/usergrid.min.js                       |     6 +
 portal/js/users/users-controller.js             |     4 +-
 portal/js/users/users-profile-controller.js     |     2 +-
 portal/js/users/users.html                      |    15 +-
 portal/package.json                             |    11 +-
 portal/phantomjsdriver.log                      |  3869 +++
 portal/seleniumLog.txt                          |     0
 portal/tests/karma.conf.js                      |     2 +-
 portal/tests/protractor/data.spec.js            |     9 +-
 portal/tests/protractor/monitoring.spec.js      |    15 -
 portal/tests/protractor/profile.spec.js         |     4 +
 portal/tests/protractor/push.spec.js            |    15 -
 portal/tests/protractor/users.spec.js           |    21 +-
 portal/tests/protractor/util.js                 |    17 +-
 portal/tests/protractorConf.js                  |    15 +-
 portal/tests/unit/sample.spec.js                |    12 +-
 218 files changed, 76815 insertions(+), 2704 deletions(-)
----------------------------------------------------------------------



Mime
View raw message