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

Release v0.11.2 #2705

Merged
merged 30 commits into from
Sep 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
57edd31
fix: upgrade body-parser from 1.20.0 to 1.20.1
snyk-bot Oct 28, 2022
ae42f20
fix: upgrade express from 4.18.1 to 4.18.2
snyk-bot Oct 30, 2022
6706d78
fix: upgrade @babel/preset-env from 7.19.3 to 7.19.4
snyk-bot Nov 1, 2022
777d16b
fix: upgrade traverse from 0.6.6 to 0.6.7
snyk-bot Nov 5, 2022
2a4d8f2
fix: upgrade @babel/core from 7.19.3 to 7.19.6
snyk-bot Nov 11, 2022
29122d2
Add support for core _globals._extensions properties
taylortom Jan 9, 2023
4aca574
Make sure core 'extensions' are not removed from schemas
taylortom Jan 11, 2023
23f124c
Replace spread with [].concat for compatibility
taylortom Mar 23, 2023
47eaf22
Add form inputType inference
taylortom Mar 23, 2023
48a6116
Added check for exsistence of course
simondate Apr 17, 2023
3014be2
Added schema titles
simondate Apr 25, 2023
2335603
Reverted to stable Mongoose version
simondate May 14, 2023
cb973f9
fix #2697
cksachdev May 15, 2023
541bed0
[Snyk] Upgrade @babel/core from 7.19.3 to 7.19.6 (#2686)
taylortom May 19, 2023
784edd9
[Snyk] Upgrade traverse from 0.6.6 to 0.6.7 (#2685)
taylortom May 19, 2023
e826bfe
[Snyk] Upgrade express from 4.18.1 to 4.18.2 (#2683)
taylortom May 19, 2023
9fe6596
[Snyk] Upgrade body-parser from 1.20.0 to 1.20.1 (#2682)
taylortom May 19, 2023
7ae5a44
Merge branch 'release/0.11.2' into snyk-upgrade-2b65b8f5a5e4053a489d6…
taylortom May 19, 2023
45ce7ae
[Snyk] Upgrade @babel/preset-env from 7.19.3 to 7.19.4 (#2684)
taylortom May 19, 2023
0a4afa0
Add form inputType inference (#2701)
taylortom Jun 12, 2023
301149d
Add support for core _globals._extensions properties (#2692)
taylortom Jun 12, 2023
facde9a
Fixed code that was removing extensions showing
simondate Jul 14, 2023
57eda53
Reverted to stable Mongoose version (#2704)
taylortom Aug 14, 2023
c2f08e1
Added check for existence of course (#2702)
taylortom Aug 14, 2023
45a585b
Update package-lock dependencies
taylortom Aug 14, 2023
ade8d58
Update CHANGELOG.md
taylortom Aug 14, 2023
c40a233
Remove badges from README.md
taylortom Aug 14, 2023
22d4869
Fix: package-lock.json file
simondate Aug 15, 2023
1a5ad72
Fix: package-lock.json file (#2728)
simondate Aug 15, 2023
bdc1e19
Update release date
taylortom Sep 25, 2023
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
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,21 @@ All notable changes to the Adapt authoring tool are documented in this file.
**IMPORTANT**: For information on how to **correctly and safely** update your installation, please consult **INSTALL.md**.<br/>
_Note that we adhere to the [semantic versioning](http://semver.org/) scheme for release numbering._

## [0.11.2] - 2023-09-25

Bugfix release.

### Fixed
- Framework core `_globals._extensions` missing from editor ([#2691](https://github.com/adaptlearning/
adapt_authoring/issues/2691))
- `_globals._extensions` form elements incorrectly rendered ([#2693](https://github.com/adaptlearning/
adapt_authoring/issues/2693))
- Force rebuild isn't run for new courses ([#2696](https://github.com/adaptlearning/2696))
- Imported course doesn't set correct ownership ([#2697](https://github.com/adaptlearning/2697))

### Added
- Scaffold should infer input type from schema type if no inputType has been specified ([#2700](https://github.com/adaptlearning/2700))

## [0.11.1] - 2022-12-02

Bugfix release.
Expand Down Expand Up @@ -758,6 +773,7 @@ Initial release.
- Loading screen of death
- Session cookie security issues

[0.11.2]: https://github.com/adaptlearning/adapt_authoring/compare/v0.11.1...v0.11.2
[0.11.1]: https://github.com/adaptlearning/adapt_authoring/compare/v0.11.0...v0.11.1
[0.11.0]: https://github.com/adaptlearning/adapt_authoring/compare/v0.10.5...v0.11.0
[0.10.5]: https://github.com/adaptlearning/adapt_authoring/compare/v0.10.4...v0.10.5
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Adapt Authoring Tool

[![Build Status](https://secure.travis-ci.org/adaptlearning/adapt_authoring.png)](http://travis-ci.org/adaptlearning/adapt_authoring) [![Join the chat at https://gitter.im/adaptlearning/adapt_authoring](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/adaptlearning/adapt_authoring?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

Adapt is a free and easy to use framework and authoring tool that creates fully responsive, multi-device, HTML5 e-learning content.

## What Does It Do?
Expand Down
15 changes: 12 additions & 3 deletions frontend/src/modules/scaffold/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,21 @@ define([
if (itemsProperties && Backbone.Form.editors[itemsInputType]) {
return itemsInputType;
}

if (fieldType === 'array') {
return 'List';
switch (fieldType) {
case 'array':
return 'List';
case 'boolean':
return 'Checkbox';
case 'number':
return 'Number';
case 'object':
return 'Object';
case 'string':
return 'Text';
}
};


var getValidators = function() {
var validators = field.validators || [];

Expand Down
3 changes: 2 additions & 1 deletion frontend/src/modules/scaffold/schemas.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@ define([ 'core/origin', './models/schemasModel' ], function(Origin, SchemasModel

// remove unrequired globals from the course
function trimGlobals(schema) {
var corePlugins = [{ targetAttribute: '_drawer' }, { targetAttribute: '_navigation' }]; // HACK to make sure core 'extensions' are included
var globals = schema._globals.properties;
trimDisabledPlugins(globals._extensions, _.values(configModel.get('_enabledExtensions')));
trimDisabledPlugins(globals._extensions, corePlugins.concat(_.values(configModel.get('_enabledExtensions'))));
trimDisabledPlugins(globals._menu, editorData.menutypes.where({ name: configModel.get('_menu') }));
trimDisabledPlugins(globals._theme, editorData.themetypes.where({ name: configModel.get('_theme') }));
// trim off the empty globals objects
Expand Down
14 changes: 11 additions & 3 deletions lib/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,14 @@ Origin.prototype.createServer = function (options, cb) {
server.use(session({
key: 'connect.sid',
secret: app.configuration.getConfig('sessionSecret'),
store: new MongoStore({ uri: db.conn.connectionUri }),
store: new MongoStore({
uri: db.conn.connectionUri,
connectionOptions: {
domainsEnabled: true,
useNewUrlParser: true,
useUnifiedTopology: true
}
}),
resave: true,
cookie: {
signed: true,
Expand All @@ -284,9 +291,10 @@ Origin.prototype.createServer = function (options, cb) {
requestDomain.add(res);
requestDomain.session = req.session;
requestDomain.on('error', next);
requestDomain.enter();
requestDomain.run(next);
// requestDomain.enter();
// requestDomain.run(next());
next();
// next();
});
server.use(auth.initialize());
server.use(auth.session());
Expand Down
9 changes: 9 additions & 0 deletions lib/contentmanager.js
Original file line number Diff line number Diff line change
Expand Up @@ -620,6 +620,15 @@ ContentManager.prototype.setupRoutes = function () {
logger.log('error', err);
return next(err);
}
// HACK to include core extensions globals schema and add titles
const coreExtensionsGlobals = that._contentSchemas.course.properties._globals.properties?._extensions?.properties;
if(coreExtensionsGlobals) {
Object.assign(schemas.course._globals.properties._extensions.properties, coreExtensionsGlobals);
schemas.course._globals.properties._extensions.title = "Extensions";
}

schemas.course._globals.properties._components.title = "Components";

res.status(200).json(schemas);
});
});
Expand Down
2 changes: 1 addition & 1 deletion lib/permissions.js
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ exports = module.exports = {
if(this.shouldIgnore(req.url)) {
return next(); // route has been explicitly ignored somewhere
}
const user = app.usermanager.getCurrentUser();
const user = app.usermanager.getCurrentUser() || JSON.parse(JSON.stringify(req.session.passport.user));

if (!user || !user._id) {
return res.status(403).json({ statusCode: STATUS.NOT_AUTHENTICATED });
Expand Down
Loading