Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
25788c7
alloy api, better logging and reporting
Nov 10, 2020
3890f84
alloy api, close parent session
Nov 10, 2020
a36d18c
request sends parent id
Nov 10, 2020
7451514
request sends parent id
Nov 10, 2020
6719bdf
logging props
Nov 10, 2020
eee32dd
api, better debugging msgs
Nov 12, 2020
c239e18
missing enum keyword
Nov 24, 2020
000c827
reset original when from private
Nov 24, 2020
a9f5832
log thread usage
Nov 24, 2020
513bc82
cleaner thread logging
Nov 30, 2020
e3c4274
fixed executor pool not shutdown
Nov 30, 2020
53a8e45
pom updated and cleaned up (fixes issue with hanging threads after re…
Nov 30, 2020
cb8ff63
npm packages updated
Nov 30, 2020
00e0946
npm selenium downgrade
Nov 30, 2020
09faa01
removed chrome plugin
Nov 30, 2020
0345c03
fixed missing skolems funcs
Dec 23, 2020
79ea026
metrics library, initial commit
Dec 23, 2020
886e36b
removed metrics lib
Feb 8, 2022
f881165
fixed management rel theme
Feb 10, 2022
86ddb83
first draft register navs
Feb 10, 2022
e2b9feb
first draft register navs
Feb 10, 2022
c8ac759
now shows when executing (and does not allow new exec)
Feb 10, 2022
3b8a094
fixed couple of issues with projection
Feb 10, 2022
9683c8b
fixed bug when getting node attrs
Feb 10, 2022
b091fab
improve user experience
Kaixi26 Jul 18, 2022
b66346c
small fix preventing error from showing
Kaixi26 Jul 19, 2022
ddb4253
updated alloy backend to version 6.1.0
nmacedo Jan 16, 2023
59ff1ea
updated front-end to alloy 6.1.0
nmacedo Jan 16, 2023
b24dadb
Merge branch 'dev' of https://github.com/Kaixi26/Alloy4Fun into Kaixi…
nmacedo Jan 16, 2023
e000298
Merge branch 'Kaixi26-dev' into dev
nmacedo Jan 16, 2023
7b07c1c
small changes to msg display (inc no more instances)
nmacedo Jan 16, 2023
258da57
meteor updated
nmacedo Jan 20, 2023
20cb72a
consistent msg display
nmacedo Jan 24, 2023
afdc3ff
Create LICENSE
Oct 24, 2023
7eedff4
meteor and deps updated
nmacedo Oct 24, 2023
80aa185
Merge branch 'dev' of github.com:haslab/Alloy4Fun into dev
nmacedo Oct 24, 2023
c97f9b2
Merge pull request #151 from haslab/dev
Oct 24, 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
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
language: node_js
node_js:
- "6"
addons:
chrome: stable
before_script:
- cd meteor
- curl https://install.meteor.com | /bin/sh
Expand Down
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -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.
9 changes: 0 additions & 9 deletions api/lib/edu/mit/csail/sdg/Electrum/1.2.1/Electrum-1.2.1.pom

This file was deleted.

Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.alloytoolsy</groupId>
<groupId>org.alloytools</groupId>
<artifactId>Alloy</artifactId>
<version>5.0.0.1</version>
<description>POM was manually for mfes</description>
</project>
<version>6.1.0</version>
<description>POM was created from install:install-file</description>
</project>
Binary file not shown.
9 changes: 0 additions & 9 deletions api/lib/org/alloytools/Electrum/2.0.0/Electrum-2.0.0.pom

This file was deleted.

32 changes: 14 additions & 18 deletions api/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>.</groupId>
<artifactId>alloy4fun-api</artifactId>
Expand All @@ -11,8 +8,8 @@
<finalName>alloy4fun-api</finalName>
<plugins>
<plugin>
<groupId>org.wildfly.swarm</groupId>
<artifactId>wildfly-swarm-plugin</artifactId>
<groupId>io.thorntail</groupId>
<artifactId>thorntail-maven-plugin</artifactId>
<version>${version.wildfly-swarm}</version>
<executions>
<execution>
Expand All @@ -29,33 +26,32 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.wildfly-swarm>2017.7.0</version.wildfly-swarm>
<version.wildfly-swarm>2.7.0.Final</version.wildfly-swarm>
</properties>
<dependencies>
<dependency>
<groupId>io.thorntail</groupId>
<artifactId>logging</artifactId>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wildfly.swarm</groupId>
<groupId>io.thorntail</groupId>
<artifactId>jaxrs</artifactId>
</dependency>
<dependency>
<groupId>org.alloytools</groupId>
<artifactId>Electrum</artifactId>
<version>2.0.0</version>
<artifactId>Alloy</artifactId>
<version>6.1.0</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20180813</version>
</dependency>
<dependency>
<groupId>javax.json</groupId>
<artifactId>javax.json-api</artifactId>
<version>1.1.4</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
Expand All @@ -67,11 +63,11 @@
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>7.0</version>
<version>8.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wildfly.swarm</groupId>
<groupId>io.thorntail</groupId>
<artifactId>bom-all</artifactId>
<version>${version.wildfly-swarm}</version>
<type>pom</type>
Expand All @@ -86,4 +82,4 @@
<url>file://${project.basedir}/lib</url>
</repository>
</repositories>
</project>
</project>
67 changes: 0 additions & 67 deletions api/src/main/java/RestApplication.java

This file was deleted.

Loading