Skip to content
This repository has been archived by the owner on Feb 15, 2022. It is now read-only.

Commit

Permalink
Bug #30/#34, update dependencies in package JSON [iet:5981221]
Browse files Browse the repository at this point in the history
* Including, Angular.JS 1.2.27 >> 1.2.29;
* `devDependencies` - `grunt-sass` etc.
  • Loading branch information
nfreear committed Jun 15, 2016
1 parent f3c32a7 commit 9b808bb
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ node_js:
- "0.10"

git:
depth: 5
depth: 10

install:
- npm install -g npm
Expand Down
16 changes: 6 additions & 10 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,26 +86,22 @@ module.exports = function (grunt) {
},
files: {
'po/template.pot': [
'static/**/*.html',
'static/**/*.html', //'static/src/partials/**/*.html',
'static/src/js/app/**/*.js' // Exclude 'js/dist/**' files.
]
}
}
},
nggettext_compile: {
all: {
nQuire_it: {
files: {
'static/src/js/app/translations.js': [
'po/*.po'
]
'static/src/js/app/translations.js': [ 'po/*.po' ]
}
}
},
msgInitMerge: {
your_target: {
src: [
'po/template.pot'
],
msgInitMerge: { // requires Grunt ~0.4.5.
nQuire_it: {
src: [ 'po/template.pot' ],
options: {
// I18n / translation - list available languages, except 'en' [Bug: #3]
'locales': [
Expand Down
11 changes: 5 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,20 @@
}
],
"dependencies": {
"angular": "1.2.27",
"angular": "1.2.29",
"jquery": "2.1.4"
},
"devDependencies": {
"grunt": "0.4.5",
"grunt-angular-gettext": "2.1.0",
"grunt-angular-gettext": "2.2.2",
"grunt-contrib-jshint": "1.0.0",
"grunt-contrib-uglify": "1.0.1",
"grunt-contrib-watch": "1.0.0",
"grunt-html-angular-validate": "0.5.7",
"grunt-html-angular-validate": "0.5.8",
"grunt-msg-init-merge": "0.0.5",
"grunt-nice-package": "0.10.2",
"grunt-sass": "1.1.0",
"simple-git": "1.31.0"
"grunt-sass": "1.2.0",
"simple-git": "1.37.0"
},
"engines": {
"node": "> 0.10.40"
Expand All @@ -57,7 +57,6 @@
"bugs": "ghi | cat",
"compile-java": "mvn compile -f app/pom.xml",
"echo-versions": "printf 'npm: '; npm --version; echo ''; mvn --version",
"ln-jquery": "# ln -s ../../../../node_modules/jquery/dist/jquery.min.js static/src/js/dist/jquery-2.x.min.js",
"ps": "ps -af | egrep '(tomcat|httpd)' #| grep -v sh # grep",
"pull": "#git checkout package.json; git pull;\n grunt; npm run version",
"setup-config-js": "cp -n static/src/js/app/config.js.DIST.html static/src/js/app/config.js",
Expand Down
4 changes: 4 additions & 0 deletions static/src/.htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
#


Options +FollowSymlinks


# Note, the rewrite rules need to be in ".htaccess".
# When I tried them in "httpd/*/*_nquire.conf" the ENV variables (REQUEST_FILENAME) weren't available.

Expand All @@ -16,6 +19,7 @@
RewriteRule ^index\.html - [L]
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_URI} !.*\.(jpe?g|png|css|js)
###RewriteRule . /index.php [L]
RewriteRule . /index.html [L]
</IfModule>
Expand Down

0 comments on commit 9b808bb

Please sign in to comment.