Merge remote-tracking branch 'origin/master' into dev

h-neto · h-neto · commit b6b89e34e725 · 2024-06-16T20:20:35.000+01:00
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 INESC TEC
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
@@ -63,6 +63,9 @@ Linter is also installed and configured but not included in the CI pipeline, to
 
 To include the linter in the CI pipeline (first make sure all linter errors are fixed) and then add the following to the [package.json](meteor/package.json) `scripts`: `"pretest": "npm run lint --silent"`
 
+# Datasets
+  * [Data](https://github.com/haslab/Alloy4Fun/wiki/EM-19-10) from the 19/29 formal methods course at Universidade do Minho (as reported in the ABZ'20 submission).
+
 # Team
 Alloy4fun has been developed by [INESC TEC](http://inesctec.pt) with members from:
  * [HASLab](https://haslab.uminho.pt)
diff --git a/meteor/.meteor/packages b/meteor/.meteor/packages
@@ -6,15 +6,15 @@
 
 meteor-base@1.5.1             # Packages every Meteor app needs to have
 mobile-experience@1.1.0       # Packages for a great mobile UX
-mongo@1.16.5                   # The database Meteor supports right now
+mongo@1.16.6                   # The database Meteor supports right now
 blaze-html-templates@1.0.4 # Compile .html files into Meteor Blaze views
 reactive-var@1.0.12            # Reactive variable for tracker
 jquery@1.9.1                  # Helpful client-side library
-tracker@1.3.1                 # Meteor's client-side reactive programming library
+tracker@1.3.2                 # Meteor's client-side reactive programming library
 
 standard-minifier-js@2.8.1    # JS minifier run for production mode
 es5-shim@4.8.0                # ECMAScript 5 compatibility for older browsers.
-ecmascript@0.16.6              # Enable ECMAScript2015+ syntax in app code
+ecmascript@0.16.7              # Enable ECMAScript2015+ syntax in app code
 shell-server@0.5.0            # Server-side component of the `meteor shell` command
 
 session@1.2.1
diff --git a/meteor/.meteor/release b/meteor/.meteor/release
@@ -1 +1 @@
-METEOR@2.11.0
+METEOR@2.12
diff --git a/meteor/.meteor/versions b/meteor/.meteor/versions
@@ -2,7 +2,7 @@ aldeed:collection2@3.5.0
 aldeed:simple-schema@1.5.4
 allow-deny@1.1.1
 autoupdate@1.8.0
-babel-compiler@7.10.3
+babel-compiler@7.10.4
 babel-runtime@1.5.1
 base64@1.0.12
 benjaminrh:jquery-blockui@2.61.0
@@ -13,19 +13,19 @@ blaze-tools@1.1.3
 boilerplate-generator@1.7.1
 caching-compiler@1.2.2
 caching-html-compiler@1.2.0
-callback-hook@1.5.0
+callback-hook@1.5.1
 check@1.3.2
 coffeescript@1.0.17
 cwaring:modernizr@3.0.0_1
 ddp@1.4.1
 ddp-client@2.6.1
 ddp-common@1.4.0
-ddp-server@2.6.0
+ddp-server@2.6.1
 deps@1.0.12
 diff-sequence@1.1.2
-dynamic-import@0.7.2
-ecmascript@0.16.6
-ecmascript-runtime@0.8.0
+dynamic-import@0.7.3
+ecmascript@0.16.7
+ecmascript-runtime@0.8.1
 ecmascript-runtime-client@0.12.1
 ecmascript-runtime-server@0.11.0
 ejson@1.1.3
@@ -51,36 +51,37 @@ jeremy:selectize@0.12.1_5
 jquery@1.11.11
 kevohagan:sweetalert@1.0.0
 launch-screen@1.3.0
-lmieulet:meteor-coverage@3.2.0
+lmieulet:meteor-coverage@1.1.4
 logging@1.3.2
-mdg:validation-error@0.5.1
-meteor@1.11.1
+mdg:validation-error@0.2.0
+meteor@1.11.2
 meteor-base@1.5.1
-meteortesting:browser-tests@1.3.5
-meteortesting:mocha@1.1.5
-meteortesting:mocha-core@7.2.0
+meteorhacks:picker@1.0.3
+meteortesting:browser-tests@1.0.0
+meteortesting:mocha@1.1.1
+meteortesting:mocha-core@1.0.1
 minifier-js@2.7.5
-minimongo@1.9.2
+minimongo@1.9.3
 mobile-experience@1.1.0
 mobile-status-bar@1.1.0
 modern-browsers@0.1.9
 modules@0.19.0
 modules-runtime@0.13.1
-mongo@1.16.5
+mongo@1.16.6
 mongo-decimal@0.1.3
 mongo-dev-server@1.1.0
 mongo-id@1.0.8
-npm-mongo@4.14.0
-observe-sequence@1.0.20
+npm-mongo@4.16.0
+observe-sequence@1.0.16
 ordered-dict@1.1.0
 perak:codemirror@1.3.1
 pntbr:js-yaml-client@0.0.1
 practicalmeteor:chai@2.1.0_1
 promise@0.12.2
 propercursive:zeroclipboard@0.0.1
-raix:eventemitter@1.0.0
+raix:eventemitter@0.1.3
 random@1.2.1
-react-fast-refresh@0.2.6
+react-fast-refresh@0.2.7
 reactive-dict@1.3.1
 reactive-var@1.0.12
 reload@1.3.1
@@ -90,21 +91,20 @@ rochal:slimscroll@1.3.3
 routepolicy@1.1.1
 session@1.2.1
 shell-server@0.5.0
-socket-stream-client@0.5.0
+socket-stream-client@0.5.1
 spacebars@1.2.0
 spacebars-compiler@1.2.1
 standard-minifier-js@2.8.1
 templating@1.4.1
 templating-compiler@1.4.1
 templating-runtime@1.5.0
 templating-tools@1.2.0
-tmeasday:check-npm-versions@1.0.2
-tracker@1.3.1
-twbs:bootstrap@3.3.6
-typescript@4.9.4
+tmeasday:check-npm-versions@0.3.2
+tracker@1.3.2
+twbs:bootstrap@3.3.5
 ui@1.0.13
-underscore@1.0.12
+underscore@1.0.13
 url@1.3.2
-webapp@1.13.4
+webapp@1.13.5
 webapp-hashing@1.1.1
 zardak:soap@0.2.6
diff --git a/meteor/client/stylesheets/alloy4fun.css b/meteor/client/stylesheets/alloy4fun.css
@@ -287,6 +287,7 @@ body {
     color: white;
     width: auto;
     padding: 5px;
+    text-align: center;
 }
 
 .log-wrong {
@@ -295,6 +296,7 @@ body {
     color: white;
     width: auto;
     padding: 5px;
+    text-align: center;
 }
 
 .log-warning {
@@ -323,6 +325,7 @@ body {
     color: white;
     width: auto;
     padding: 5px;
+    text-align: center;
 }
 
 .log-unavailable {

-Original file line number
+Diff line change
 [email protected]             # Packages every Meteor app needs to have
 [email protected]       # Packages for a great mobile UX
 -[email protected].5                   # The database Meteor supports right now
 +[email protected].6                   # The database Meteor supports right now
 [email protected] # Compile .html files into Meteor Blaze views
 [email protected]            # Reactive variable for tracker
 [email protected]                  # Helpful client-side library
 -[email protected].1                 # Meteor's client-side reactive programming library
 +[email protected].2                 # Meteor's client-side reactive programming library
 [email protected]    # JS minifier run for production mode
 [email protected]                # ECMAScript 5 compatibility for older browsers.
 -[email protected].6              # Enable ECMAScript2015+ syntax in app code
 +[email protected].7              # Enable ECMAScript2015+ syntax in app code
 [email protected]            # Server-side component of the `meteor shell` command
 [email protected]
Original file line number	Diff line number	Diff line change
`@@ -287,6 +287,7 @@ body {`
`287`	`287`	`color: white;`
`288`	`288`	`width: auto;`
`289`	`289`	`padding: 5px;`
	`290`	`+ text-align: center;`
`290`	`291`	`}`
`291`	`292`
`292`	`293`	`.log-wrong {`
`@@ -295,6 +296,7 @@ body {`
`295`	`296`	`color: white;`
`296`	`297`	`width: auto;`
`297`	`298`	`padding: 5px;`
	`299`	`+ text-align: center;`
`298`	`300`	`}`
`299`	`301`
`300`	`302`	`.log-warning {`
`@@ -323,6 +325,7 @@ body {`
`323`	`325`	`color: white;`
`324`	`326`	`width: auto;`
`325`	`327`	`padding: 5px;`
	`328`	`+ text-align: center;`
`326`	`329`	`}`
`327`	`330`
`328`	`331`	`.log-unavailable {`