Skip to content
This repository has been archived by the owner on Sep 24, 2020. It is now read-only.

Commit

Permalink
automatic project update
Browse files Browse the repository at this point in the history
  • Loading branch information
jdubois committed Feb 6, 2017
1 parent 243564a commit 530e70a
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .yo-rc.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"en"
],
"serverPort": 8080,
"jhipsterVersion": "4.0.1",
"jhipsterVersion": "4.0.2",
"enableSocialSignIn": false,
"jwtSecretKey": "042e7d536354d3cdfab490925c55022efcb42bae",
"useSass": false,
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# jhipsterJwtSampleApplication
This application was generated using JHipster 4.0.0, you can find documentation and help at [https://jhipster.github.io/documentation-archive/v4.0.0](https://jhipster.github.io/documentation-archive/v4.0.0).
This application was generated using JHipster 4.0.1, you can find documentation and help at [https://jhipster.github.io/documentation-archive/v4.0.1](https://jhipster.github.io/documentation-archive/v4.0.1).

## Development

Expand Down Expand Up @@ -95,13 +95,13 @@ For more information refer to [Using Docker and Docker-Compose][], this page als
To set up a CI environment, consult the [Setting up Continuous Integration][] page.

[JHipster Homepage and latest documentation]: https://jhipster.github.io
[JHipster 4.0.0 archive]: https://jhipster.github.io/documentation-archive/v4.0.0
[JHipster 4.0.1 archive]: https://jhipster.github.io/documentation-archive/v4.0.1

[Using JHipster in development]: https://jhipster.github.io/documentation-archive/v4.0.0/development/
[Using Docker and Docker-Compose]: https://jhipster.github.io/documentation-archive/v4.0.0/docker-compose
[Using JHipster in production]: https://jhipster.github.io/documentation-archive/v4.0.0/production/
[Running tests page]: https://jhipster.github.io/documentation-archive/v4.0.0/running-tests/
[Setting up Continuous Integration]: https://jhipster.github.io/documentation-archive/v4.0.0/setting-up-ci/
[Using JHipster in development]: https://jhipster.github.io/documentation-archive/v4.0.1/development/
[Using Docker and Docker-Compose]: https://jhipster.github.io/documentation-archive/v4.0.1/docker-compose
[Using JHipster in production]: https://jhipster.github.io/documentation-archive/v4.0.1/production/
[Running tests page]: https://jhipster.github.io/documentation-archive/v4.0.1/running-tests/
[Setting up Continuous Integration]: https://jhipster.github.io/documentation-archive/v4.0.1/setting-up-ci/

[Gatling]: http://gatling.io/
[Node.js]: https://nodejs.org/
Expand Down
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated on 2017-02-04 using generator-jhipster 4.0.1
// Generated on 2017-02-06 using generator-jhipster 4.0.2
'use strict';

var gulp = require('gulp'),
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"eslint-config-angular": "0.5.0",
"eslint-plugin-angular": "1.3.1",
"event-stream": "3.3.4",
"generator-jhipster": "4.0.1",
"generator-jhipster": "4.0.2",
"gulp": "3.9.1",
"gulp-angular-filesort": "1.1.1",
"gulp-angular-templatecache": "2.0.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
<div>
<h2><span data-translate="userManagement.detail.title">User</span> "{{vm.user.login}}"</h2>
<dl class="row">
<h2>
<span data-translate="userManagement.detail.title">User</span> [<b>{{vm.user.login}}</b>]
</h2>
<dl class="row jh-entity-details">
<dt><span data-translate="userManagement.login">Login</span></dt>
<dd><span>{{vm.user.login}}</span></dd>
<dd>
<span>{{vm.user.login}}</span>
<span class="label label-danger" ng-show="!vm.user.activated"
data-translate="userManagement.deactivated">Deactivated</span>
<span class="label label-success" ng-show="vm.user.activated"
data-translate="userManagement.activated">Activated</span>
</dd>
<dt><span data-translate="userManagement.firstName">First Name</span></dt>
<dd>{{vm.user.firstName}}</dd>
<dt><span data-translate="userManagement.lastName">Last Name</span></dt>
<dd>{{vm.user.lastName}}</dd>
<dt><span data-translate="userManagement.email">Email</span></dt>
<dd>{{vm.user.email}}</dd>
<dt><span data-translate="userManagement.activated">Activated</span></dt>
<dd>{{vm.user.activated}}</dd>
<dt><span data-translate="userManagement.langKey">Lang Key</span></dt>
<dd>{{vm.user.langKey}}</dd>
<dt><span data-translate="userManagement.createdBy">Created By</span></dt>
Expand All @@ -24,7 +30,9 @@ <h2><span data-translate="userManagement.detail.title">User</span> "{{vm.user.lo
<dt><span data-translate="userManagement.profiles">Profiles</span></dt>
<dd>
<ul class="list-unstyled">
<li ng-repeat="authority in vm.user.authorities"><span>{{authority}}</span></li>
<li ng-repeat="authority in vm.user.authorities">
<span class="label label-info">{{authority}}</span>
</li>
</ul>
</dd>
</dl>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ <h2 data-translate="userManagement.home.title">Users</h2>
<td>{{user.login}}</td>
<td>{{user.email}}</td>
<td>
<span class="label label-danger" ng-click="vm.setActive(user, true)" ng-show="!user.activated"
data-translate="userManagement.deactivated" style="cursor: pointer;">Deactivated</span>
<span class="label label-success" ng-click="vm.setActive(user, false)" ng-show="user.activated"
data-translate="userManagement.activated" style="cursor: pointer;">Activated</span>
<span class="label label-danger hand" ng-click="vm.setActive(user, true)" ng-show="!user.activated"
data-translate="userManagement.deactivated">Deactivated</span>
<span class="label label-success hand" ng-click="vm.setActive(user, false)" ng-show="user.activated"
data-translate="userManagement.activated">Activated</span>
</td>
<td>{{user.langKey}}</td>
<td>
Expand Down
14 changes: 5 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2248,9 +2248,9 @@ generate-object-property@^1.1.0:
dependencies:
is-property "^1.0.0"

[email protected].1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/generator-jhipster/-/generator-jhipster-4.0.1.tgz#a842f59bf7eb54b5a3c818560d7af20097eb5372"
[email protected].2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/generator-jhipster/-/generator-jhipster-4.0.2.tgz#9dc2a4cf83ace133a2e25e877e963e92b8cedcfa"
dependencies:
chalk "1.1.3"
cheerio "0.22.0"
Expand Down Expand Up @@ -4151,22 +4151,18 @@ lodash.uniq@^4.3.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"

[email protected], lodash@^4.0.0, lodash@^4.0.1, lodash@^4.11.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.3.0, lodash@^4.5.0, lodash@^4.6.1:
[email protected], lodash@^4.0.0, lodash@^4.0.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.3.0, lodash@^4.5.0:
version "4.15.0"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.15.0.tgz#3162391d8f0140aa22cf8f6b3c34d6b7f63d3aa9"

[email protected]:
[email protected], lodash@^4.11.1, lodash@^4.17.2, lodash@^4.6.1:
version "4.17.4"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"

lodash@^3.0.0, lodash@^3.0.1, lodash@^3.10.1, lodash@^3.2.0, lodash@^3.3.1, lodash@^3.6.0, lodash@^3.8.0, lodash@^3.9.3:
version "3.10.1"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"

lodash@^4.17.2:
version "4.17.2"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.2.tgz#34a3055babe04ce42467b607d700072c7ff6bf42"

lodash@~1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"
Expand Down

0 comments on commit 530e70a

Please sign in to comment.