Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev/2.2.0 #96

Merged
merged 33 commits into from
Jul 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
78a8183
Bump mixin-deep from 1.3.1 to 1.3.2
dependabot[bot] Sep 19, 2019
b16ff9c
Add force update and check for duplicate widgets
Oct 10, 2019
3c5aedf
Make refresh list work for adding and remove widgets and changing wid…
Oct 10, 2019
ec42afc
Add styling for inline previewing info
Oct 15, 2019
9893d78
Add check for if data is not a string
Oct 25, 2019
38b3dc4
Package.json updated with alpha version
clpetersonucf Oct 28, 2019
9767137
Merge pull request #90 from Goff-Davis/issue/1066-lti-preview-info-st…
clpetersonucf Nov 22, 2019
90c5407
Materia#1271 Added a button on the profile settings page to disable B…
FrenjaminBanklin Dec 20, 2019
45f7b9a
Bump handlebars from 4.1.2 to 4.5.3
dependabot[bot] Dec 28, 2019
cbe94a9
Merge pull request #87 from Goff-Davis/issue/1259-lti-picker-refresh-fix
clpetersonucf Apr 3, 2020
d75127c
Merge pull request #99 from FrenjaminBanklin/feature/beardmode-toggle
clpetersonucf Apr 3, 2020
b8528b2
Merge pull request #95 from Goff-Davis/issue/78-check-score-post-mess…
clpetersonucf Apr 3, 2020
1717fdc
Added retain ownership flag to copy modal, visual updates to copy mod…
clpetersonucf May 14, 2020
8d096ec
Changes to availability and settings to better clarify roles and perm…
clpetersonucf May 14, 2020
d5f159d
Bump angular from 1.6.9 to 1.8.0
dependabot[bot] Jun 18, 2020
bda2f28
Merge pull request #102 from ucfopen/dependabot/npm_and_yarn/angular-…
clpetersonucf Jun 29, 2020
3683b2e
mywidgets dialog style cleanup
iturgeon Jul 1, 2020
e9b6fc9
Merge remote-tracking branch 'upstream/dev/2.2.0' into issue/1287-imp…
iturgeon Jul 1, 2020
2edf290
update student mode settings disabled state
iturgeon Jul 2, 2020
a138bd1
cleanup some share and delete dialogs
iturgeon Jul 2, 2020
c0f487e
Merge pull request #101 from clpetersonucf/issue/1287-improve-widget-…
iturgeon Jul 2, 2020
1d7e19c
Merge pull request #84 from ucfopen/dependabot/npm_and_yarn/mixin-dee…
iturgeon Jul 2, 2020
a31f180
Merge pull request #100 from ucfopen/dependabot/npm_and_yarn/handleba…
iturgeon Jul 2, 2020
1e3dc5b
[chore] webpack, better polyfills, all libs updated
iturgeon Jul 3, 2020
dad1829
update package.json repository
iturgeon Jul 3, 2020
7606635
[chore] controller name cleanup
iturgeon Jul 4, 2020
3e65045
[chore] finished angular name convention changes
iturgeon Jul 4, 2020
cd0f019
[chore] prettier updated
iturgeon Jul 4, 2020
988fa61
[fix] fixes incorrect copy and delete mywidget states
iturgeon Jul 4, 2020
f17fb7c
v2.2.0-alpha4
iturgeon Jul 4, 2020
ccc667c
[fix] angular 1.8.0 interval error on preview mode
iturgeon Jul 6, 2020
aec9f98
v2.2.0-alpha5
iturgeon Jul 6, 2020
e4fdf53
v2.2.0
iturgeon Jul 7, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@
[
"@babel/preset-env",
{
debug: true,
targets: {
browsers: [
">0.25%",
"not ie 10",
"not op_mini all"
]
}
useBuiltIns: "usage",
corejs: 3,
// debug: true, // outputs polyfills and browserlist
// targets: 'defaults' // allows .browserslistrc to work
}
],
"jest"
],
"plugins": [
'babel-plugin-angularjs-annotate'
]
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ node_modules
coverage
**.DS_Store
*.*-e
yarn-error.log
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
coverage
*.*-e
.yarn-error.log
69 changes: 41 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
{
"name": "materia-server-client-assets",
"version": "2.1.1",
"version": "2.2.0",
"license": "AGPL-3.0",
"description": "Materia Server Client Assets contains all the javascript and css for Materia Server and the Materia Widget Development Kit.",
"author": "University of Central Florida, Center for Distributed Learning",
"homepage": "https://ucfopen.github.io/Materia-Docs",
"repository": "https://github.com/ucfopen/Materia-Server-Client-Assets.git",
"scripts": {
"test": "TZ=Etc/UTC jest --verbose",
"test:dev": "TZ=Etc/UTC jest --verbose --watch --coverage",
"test:ci": "TZ=Etc/UTC CI=true jest --ci --useStderr --coverage --coverageReporters text-summary cobertura",
"build": "webpack -p",
"build-watch": "webpack --watch",
"build-dev": "webpack",
"prepare": "yarn build",
"prettier:run": "prettier --write 'src/**/*.{js,scss}'",
"prettier:debug": "prettier -l 'src/**/*.{js,scss}'",
"prettier:detectchanges": "git diff --exit-code ./src || (echo '!! Prettier created files that need to be manually added.'; exit 1;)",
"precommit": "yarn test && lint-staged"
"prettier:detectchanges": "git diff --exit-code ./src || (echo '!! Prettier created files that need to be manually added.'; exit 1;)"
},
"prettier": {
"printWidth": 100,
Expand All @@ -25,10 +26,19 @@
},
"lint-staged": {
"src/**/*.{js,scss}": [
"yarn prettier --write",
"git add"
"yarn prettier --write"
]
},
"husky": {
"hooks": {
"pre-commit": "yarn test:ci && yarn lint-staged"
}
},
"browserslist": [
"> 0.5%",
"not ie >= 0",
"not op_mini all"
],
"jest": {
"transform": {
"ctrl-widget-catalog.js": "babel-jest"
Expand All @@ -46,41 +56,44 @@
],
"coverageThreshold": {
"global": {
"statements": 44,
"branches": 31,
"statements": 43,
"branches": 32,
"functions": 48,
"lines": 43
}
}
},
"dependencies": {
"angular": "1.6.9",
"angular": "1.8.0",
"js-snakecase": "^1.2.0",
"ngmodal": "ucfcdl/ngModal#v1.2.2"
},
"devDependencies": {
"@babel/core": "^7.4.5",
"@babel/preset-env": "^7.4.5",
"angular-animate": "1.6.9",
"angular-mocks": "1.6.9",
"babel-jest": "^24.6.0",
"babel-loader": "^8.0.6",
"@babel/core": "^7.10.4",
"@babel/preset-env": "^7.10.4",
"angular-animate": "1.8.0",
"angular-mocks": "1.8.0",
"autoprefixer": "^9.7.6",
"babel-jest": "^26.1.0",
"babel-loader": "^8.1.0",
"babel-plugin-angularjs-annotate": "^0.10.0",
"babel-polyfill": "^6.26.0",
"clean-webpack-plugin": "^2.0.2",
"css-loader": "^0.28.4",
"extract-text-webpack-plugin": "^3.0.0",
"clean-webpack-plugin": "^3.0.0",
"core-js": "3",
"css-loader": "^3.6.0",
"hammerjs": "2.0.8",
"husky": "^2.3.0",
"jest": "^24.6.0",
"lint-staged": "^8.1.7",
"node-sass": "^4.12.0",
"prettier": "^1.11.1",
"sass-loader": "^6.0.6",
"style-loader": "^0.20.2",
"webpack": "3.12.0",
"webpack-strip-block": "^0.2.0",
"whatwg-fetch": "^3.0.0"
"husky": "^4.2.5",
"ignore-emit-webpack-plugin": "^2.0.2",
"jest": "^26.1.0",
"lint-staged": "^10.2.11",
"mini-css-extract-plugin": "^0.9.0",
"node-sass": "^4.14.1",
"postcss-loader": "^3.0.0",
"prettier": "^2.0.5",
"sass-loader": "^9.0.1",
"style-loader": "^1.2.1",
"webpack": "4.43.0",
"webpack-cli": "^3.3.12",
"webpack-strip-block": "^0.2.0"
},
"engines": {
"node": "^12.3.1",
Expand Down
Loading