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 Jun 13, 2016
1 parent 0091bf9 commit e515395
Show file tree
Hide file tree
Showing 21 changed files with 183 additions and 95 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": "3.4.0",
"jhipsterVersion": "3.4.1",
"enableSocialSignIn": false,
"jwtSecretKey": "042e7d536354d3cdfab490925c55022efcb42bae",
"useSass": false,
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"angular-translate-storage-cookie": "2.11.0",
"angular-ui-router": "0.3.0",
"bootstrap": "3.3.6",
"bootstrap-ui-datetime-picker": "2.3.1",
"bootstrap-ui-datetime-picker": "2.4.0",
"jquery": "2.2.4",
"json3": "3.3.2",
"messageformat": "0.3.1",
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 2016-05-27 using generator-jhipster 3.4.0
// Generated on 2016-06-13 using generator-jhipster 3.4.1
'use strict';

var gulp = require('gulp'),
Expand Down
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
],
"devDependencies": {
"bower": "1.7.9",
"browser-sync": "2.12.5",
"browser-sync": "2.12.10",
"del": "2.2.0",
"eslint-config-angular": "0.5.0",
"eslint-plugin-angular": "1.0.1",
"event-stream": "3.3.2",
"generator-jhipster": "3.4.0",
"generator-jhipster": "3.4.1",
"gulp": "3.9.1",
"gulp-angular-filesort": "1.1.1",
"gulp-angular-templatecache": "1.8.0",
Expand All @@ -24,17 +24,17 @@
"gulp-eslint": "2.0.0",
"gulp-flatten": "0.2.0",
"gulp-footer": "1.0.5",
"gulp-htmlmin": "1.3.0",
"gulp-if": "2.0.0",
"gulp-imagemin": "2.4.0",
"gulp-inject": "4.0.0",
"gulp-htmlmin": "2.0.0",
"gulp-if": "2.0.1",
"gulp-imagemin": "3.0.1",
"gulp-inject": "4.1.0",
"gulp-natural-sort": "0.1.1",
"gulp-ng-annotate": "2.0.0",
"gulp-rename": "1.2.2",
"gulp-ng-constant": "1.1.0",
"gulp-notify": "2.2.0",
"gulp-plumber": "1.1.0",
"gulp-protractor": "2.3.0",
"gulp-protractor": "2.4.0",
"gulp-util": "3.0.7",
"gulp-rev": "7.0.0",
"gulp-rev-replace": "0.4.3",
Expand All @@ -44,23 +44,23 @@
"jasmine-core": "2.4.1",
"jasmine-reporters": "2.1.1",
"karma": "0.13.22",
"karma-chrome-launcher": "0.2.3",
"karma-coverage": "0.5.5",
"karma-jasmine": "0.3.8",
"karma-jenkins-reporter": "0.0.2",
"karma-chrome-launcher": "1.0.1",
"karma-coverage": "1.0.0",
"karma-jasmine": "1.0.2",
"karma-junit-reporter": "1.0.0",
"karma-phantomjs-launcher": "1.0.0",
"karma-script-launcher": "0.2.0",
"karma-script-launcher": "1.0.0",
"lazypipe": "1.0.1",
"lodash": "4.11.1",
"main-bower-files": "2.11.1",
"lodash": "4.13.1",
"main-bower-files": "2.13.1",
"map-stream": "0.0.6",
"phantomjs-prebuilt": "2.1.7",
"protractor": "3.3.0",
"protractor-jasmine2-screenshot-reporter": "0.3.1",
"proxy-middleware": "0.15.0",
"run-sequence": "1.1.5",
"run-sequence": "1.2.1",
"xml2js": "0.4.16",
"yargs": "4.6.0"
"yargs": "4.7.1"
},
"engines": {
"node": "^4.3"
Expand Down
17 changes: 4 additions & 13 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
<mapstruct.version>1.0.0.Final</mapstruct.version>
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
<maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
<maven-resources-plugin.version>3.0.0</maven-resources-plugin.version>
<sortpom-maven-plugin.version>2.5.0</sortpom-maven-plugin.version>
<metrics-spark-reporter.version>1.2</metrics-spark-reporter.version>
<metrics-spring.version>3.1.3</metrics-spring.version>
Expand Down Expand Up @@ -453,18 +454,19 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>${maven-resources-plugin.version}</version>
<executions>
<execution>
<id>default-resources</id>
<phase>validate</phase>
<goals>
<goal>resources</goal>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>target/classes</outputDirectory>
<useDefaultDelimiters>false</useDefaultDelimiters>
<delimiters>
<delimiter>#</delimiter>
<delimiter>#</delimiter>
</delimiters>
<resources>
<resource>
Expand Down Expand Up @@ -836,15 +838,4 @@
</properties>
</profile>
</profiles>

<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.19</version>
</plugin>
</plugins>
</reporting>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import io.github.jhipster.sample.domain.User;
import io.github.jhipster.sample.repository.AuthorityRepository;
import io.github.jhipster.sample.repository.UserRepository;
import io.github.jhipster.sample.security.AuthoritiesConstants;
import io.github.jhipster.sample.security.SecurityUtils;
import io.github.jhipster.sample.service.util.RandomUtil;
import io.github.jhipster.sample.web.rest.dto.ManagedUserDTO;
Expand Down Expand Up @@ -84,7 +85,7 @@ public User createUserInformation(String login, String password, String firstNam
String langKey) {

User newUser = new User();
Authority authority = authorityRepository.findOne("ROLE_USER");
Authority authority = authorityRepository.findOne(AuthoritiesConstants.USER);
Set<Authority> authorities = new HashSet<>();
String encryptedPassword = passwordEncoder.encode(password);
newUser.setLogin(login);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
package io.github.jhipster.sample.web.rest;

import io.github.jhipster.sample.config.JHipsterProperties;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import javax.inject.Inject;

import org.springframework.core.env.Environment;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

import io.github.jhipster.sample.config.JHipsterProperties;

@RestController
@RequestMapping("/api")
public class ProfileInfoResource {
Expand All @@ -22,7 +23,9 @@ public class ProfileInfoResource {
@Inject
private JHipsterProperties jHipsterProperties;

@RequestMapping("/profile-info")
@RequestMapping(value = "/profile-info",
method = RequestMethod.GET,
produces = MediaType.APPLICATION_JSON_VALUE)
public ProfileInfoResponse getActiveProfiles() {
return new ProfileInfoResponse(env.getActiveProfiles(), getRibbonEnv());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public ParameterizedErrorDTO processParameterizedValidationError(CustomParameter
@ExceptionHandler(AccessDeniedException.class)
@ResponseStatus(HttpStatus.FORBIDDEN)
@ResponseBody
public ErrorDTO processAccessDeniedExcpetion(AccessDeniedException e) {
public ErrorDTO processAccessDeniedException(AccessDeniedException e) {
return new ErrorDTO(ErrorConstants.ERR_ACCESS_DENIED, e.getMessage());
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/error.html
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ <h1 th:text="#{error.title}">Your request cannot be processed <span>:(</span></h
var GOOG_FIXURL_LANG = '[[${#locale.language}]]', GOOG_FIXURL_SITE = location.host;
/*]]>*/
</script>
<script src="http://linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js"></script>
<script src="https://linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js"></script>
</div>
</body>
</html>
5 changes: 3 additions & 2 deletions src/main/webapp/app/blocks/config/localstorage.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
.module('jhipsterJwtSampleApplicationApp')
.config(localStorageConfig);

localStorageConfig.$inject = ['$localStorageProvider'];
localStorageConfig.$inject = ['$localStorageProvider', '$sessionStorageProvider'];

function localStorageConfig($localStorageProvider) {
function localStorageConfig($localStorageProvider, $sessionStorageProvider) {
$localStorageProvider.setKeyPrefix('jhi-');
$sessionStorageProvider.setKeyPrefix('jhi-');
}
})();
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@

var jhiItemCount = {
template: '<div class="info">' +
'Showing {{(($ctrl.page-1) * 20)==0 ? 1:(($ctrl.page-1) * 20 + 1)}} - ' +
'{{($ctrl.page * 20) < $ctrl.queryCount ? ($ctrl.page * 20) : $ctrl.queryCount}} ' +
'Showing {{(($ctrl.page - 1) * $ctrl.itemsPerPage) == 0 ? 1 : (($ctrl.page - 1) * $ctrl.itemsPerPage + 1)}} - ' +
'{{($ctrl.page * $ctrl.itemsPerPage) < $ctrl.queryCount ? ($ctrl.page * $ctrl.itemsPerPage) : $ctrl.queryCount}} ' +
'of {{$ctrl.queryCount}} items.' +
'</div>',
bindings: {
page: '<',
queryCount: '<total'
queryCount: '<total',
itemsPerPage: '<'
}
};

Expand Down
7 changes: 3 additions & 4 deletions src/main/webapp/app/components/util/parse-links.service.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

return service;

function parse (header) {
function parse(header) {
if (header.length === 0) {
throw new Error('input must not be of zero length');
}
Expand All @@ -22,7 +22,7 @@
var parts = header.split(',');
var links = {};
// Parse each part into a named link
angular.forEach(parts, function (p) {
angular.forEach(parts, function(p) {
var section = p.split(';');
if (section.length !== 2) {
throw new Error('section could not be split on ";"');
Expand All @@ -34,13 +34,12 @@
function($0, $1, $2, $3) { queryString[$1] = $3; }
);
var page = queryString.page;
if( angular.isString(page) ) {
if (angular.isString(page)) {
page = parseInt(page);
}
var name = section[1].replace(/rel="(.*)"/, '$1').trim();
links[name] = page;
});

return links;
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bootstrap-ui-datetime-picker",
"version": "2.3.1",
"version": "2.4.0",
"homepage": "https://github.com/Gillardo/bootstrap-ui-datetime-picker",
"authors": [
"Gillardo <[email protected]>"
Expand Down Expand Up @@ -29,15 +29,15 @@
"tests"
],
"dependencies": {
"angular-bootstrap": "~1.2.0"
"angular-bootstrap": "^1.2.0"
},
"_release": "2.3.1",
"_release": "2.4.0",
"_resolution": {
"type": "version",
"tag": "2.3.1",
"commit": "865d67644cd408d7a4b678b92c80d525327b3478"
"tag": "2.4.0",
"commit": "6bf5c38a6867aaa261051280695e15a5be887fff"
},
"_source": "https://github.com/gillardo/bootstrap-ui-datetime-picker.git",
"_target": "2.3.1",
"_target": "2.4.0",
"_originalSource": "bootstrap-ui-datetime-picker"
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ You have the following properties available to use with the directive. All are
* ngModel (required) - Your date object
* isOpen - (true/false)
* closeOnDateSelection (true/false)
* closeOnTimeNow (true/false)
* enableDate (true/false)
* enableTime (true/false)
* buttonBar (object)
Expand All @@ -34,11 +35,15 @@ You have the following properties available to use with the directive. All are
* datepickerOptions (object)
* timepickerOptions (object)
* defaultTime (string)
* saveAs (boolean|function|'ISO'|'json'|'number')
* readAs (boolean|function)

##### isOpen
Whether the popup/dropdown is visible or not. Defaults to false
##### closeOnDateSelection
Close popup once a date has been chosen. TimePicker will stay open until user closes.
##### closeOnTimeNow
Close popup once a time has been chosen via now button.
##### enableDate
Whether you would like the user to be able to select a date. Defaults to true
##### enableTime
Expand All @@ -51,13 +56,25 @@ The initial picker to open when the control is first pressed
##### reOpenDefault
The picker to set as the picker to open once the control has already been opened at least once. Setting to `false` will default to the date picker if both date and time are enabled, or just the enabled control if only time or date is in use.
##### datepickerOptions
Object to configure settings for the datepicker (can be found on angularUI site)
Object to configure settings for the datepicker (can be found on [angularUI site](https://angular-ui.github.io/bootstrap/#/datepicker))
##### timepickerOptions
Object to configure settings for the timepicker (can be found on angularUI site)
Object to configure settings for the timepicker (can be found on [angularUI site](https://angular-ui.github.io/bootstrap/#/timepicker))
##### defaultTime
Initial time when a new date is selected (e.g. "14:00:00" or "2:00 pm")
##### whenClosed
An callback function to call when the picker dropdown is closed. See demo for more details.
##### saveAs
A boolean value to switch saving the Date to the model as a string, or a ngModel.$parsers function to take over the transformation from the Date object to a string.
Possible values:
* true
* false
* 'ISO' (Date.toISOString())
* 'json' (Date.toJSON())
* 'number' (Date.valueOf())
* a function accepting a value parameter and returning the converted value to save to the model.
Note: If using an html5 input type, the default parser will use Date.toLocaleString() to convert to a string. To override this, provide a function with your desired formatted conversion. Otherwise all other input types will use the supplied date format.
##### readAs
A boolean value to convert a string (or Date.valueOf()) value back to a Date object from the ngModel, or a ngModel.$formatters function to take over the transformation completely.

## uiDatetimePickerConfig
Now datetimePicker options are globally set by default. If you do not state the values within the declaration, the config options are used instead. Here are the default options
Expand Down Expand Up @@ -103,9 +120,12 @@ Now datetimePicker options are globally set by default. If you do not state the
}
},
closeOnDateSelection: true,
closeOnTimeNow: true,
appendToBody: false,
altInputFormats: [],
ngModelOptions: { }
ngModelOptions: { },
saveAs: false,
readAs: false,
})
```

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bootstrap-ui-datetime-picker",
"version": "2.3.1",
"version": "2.4.0",
"homepage": "https://github.com/Gillardo/bootstrap-ui-datetime-picker",
"authors": [
"Gillardo <[email protected]>"
Expand Down Expand Up @@ -29,6 +29,6 @@
"tests"
],
"dependencies": {
"angular-bootstrap": "~1.2.0"
"angular-bootstrap": "^1.2.0"
}
}
Loading

0 comments on commit e515395

Please sign in to comment.