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.

Sign up for GitHub

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

Jump to bottom

Release v4.2.0 #1191

Merged
merged 70 commits into from
Jul 16, 2021
Merged

Release v4.2.0 #1191

merged 70 commits into from
Jul 16, 2021

Conversation

hanjoosten
Copy link
Member

No description provided.

hanjoosten and others added 30 commits June 4, 2021 21:43
@hanjoosten
Releasenotes
ce47ac5
@hanjoosten
Fix Duplicate labels in VIEW #1171
237ae00
@hanjoosten
fix
7f06555
@hanjoosten
Add reminder action for pull requests
481ed27
@hanjoosten
Merge branch 'development' into feature/Issue1171
90d3632
@hanjoosten
fix workflow
353d01b
@hanjoosten
Merge branch 'development' into feature/Issue1171
9594a36
@hanjoosten
Specify correct version
4aa13a0
@hanjoosten
This should work
5019b32
@hanjoosten
Github action doesn't seem to exist
71710b6
@stefjoosten
Merge branch 'development' into feature/Issue1171
5df37ef
@hanjoosten
Merge pull request #1179 from AmpersandTarski/feature/Issue1171
732019e 
Feature/issue1171
@stefjoosten
issue #1163 ready for testing
02e04a0
@stefjoosten
enhanced the chapter "Conceptual Analysis" with meanings
6e01429
@stefjoosten
Conceptual Analysis now documents the MEANINGs of relations properly.
2d560f1
@stefjoosten
Making the Conceptual Analysis ready for referencing (as in ChapterNa…
c576236 
…tLangReqs.hs)
@stefjoosten
Merge pull request #1180 from AmpersandTarski/feature/ConceptualAnalysis
dd08b8d 
Feature/conceptual analysis
@stefjoosten
fixed the use of concept definitions in the Conceptual analysis and
e0e13b8 
added ConceptDefs, Representations, and RoleRules to the A_Pattern to pay off some technical debt.
@hanjoosten
Error types for quickcheck roundtrips
ba47e9d
@hanjoosten
remove whenChecked
93e0da7
@hanjoosten
minor refactoring
654872a
@hanjoosten
some more refactoring
e38ebe4
@hanjoosten
better formatted error message
1e307e1
@hanjoosten
better formatting
ba8d717
@hanjoosten
Eventually get a nice error message
cefbc08
@stefjoosten
minor bugfix
9fc948c
@stefjoosten
fixed a warning
e9a557b
@hanjoosten
fixed hlint warnings
72e1436
@hanjoosten
nicer output of testresults
60bd6cd
@hanjoosten
Make sure a failure effects the exitstate
c3057e0
hanjoosten and others added 28 commits June 25, 2021 23:41
@hanjoosten
Merge pull request #1185 from AmpersandTarski/feature/issue1163-2nd-a…
589a977 
…ttempt

Feature/issue1163
@stefjoosten
temp
5479952
@hanjoosten
Releasenotes
b0b868c
@hanjoosten
Add testcase
be7ec73
@hanjoosten
minor improvement of an error message
e5f3f0d
@hanjoosten
correction of the testcase
0a308bd
@hanjoosten
Again an adaption of the testcase
00464ea
@hanjoosten
parser part
37386ed
@hanjoosten
compiles again
485cb52
@hanjoosten
minor bug in ArbitraryTree
c35221a
@hanjoosten
bugfix prettyprinter
5bb9e81
@stefjoosten
WIP
6400ef7
@stefjoosten
Merge branch 'feature/ConceptualAnalysis' into feature/Issue1183
131f0ef 
* feature/ConceptualAnalysis:
  WIP
  temp
  write canonical form of graphs
  minor bugfix
  fixed the use of concept definitions in the Conceptual analysis and added ConceptDefs, Representations, and RoleRules to the A_Pattern to pay off some technical debt.

# Conflicts:
#	src/Ampersand/Output/ToPandoc/ChapterConceptualAnalysis.hs
@stefjoosten
Testing Han's changes from issue #1183
2c9c141
@stefjoosten
corresponds with #1183 (comment)
43313b7
@stefjoosten
update the EBNF syntax for students (i.e. the simplified version)
8632054
@stefjoosten
updated test file for issue #1183
040471a
@hanjoosten
Add Stef's nice-to-have statements to the test
51803f5
@hanjoosten
refactoring, to avoid duplicate code
50d757f
@stefjoosten
refactored orderingByTheme (in SharedAmongChapters) to ensure compl…
5897b70 
…eteness
@hanjoosten
fix extra requirement of @stefjoosten
b18cce6
@stefjoosten
remove redundant concept definitions in the documentation
dab8f09
@stefjoosten
Merge pull request #1186 from AmpersandTarski/feature/Issue1183
8e3a574 
Feature/issue1183
@stefjoosten
fix a bug on the previous commit
ea8180a
@stefjoosten
wip
7afe8e0
@stefjoosten
Merge commit '8e3a574560aa121f90428266aca279c427474b4c' into feature/…
605f9ea 
…ConceptualAnalysis

* commit '8e3a574560aa121f90428266aca279c427474b4c':
  fix extra requirement of @stefjoosten
  refactoring, to avoid duplicate code
  Add Stef's nice-to-have statements to the test
  corresponds with #1183 (comment)

# Conflicts:
#	ampersand.cabal
#	src/Ampersand/Output/ToPandoc/ChapterConceptualAnalysis.hs
#	testing/Travis/testcases/FuncSpec/testIssue1183.adl
@stefjoosten
Merge pull request #1187 from AmpersandTarski/feature/Issue1183
46d2f3a 
Feature/issue1183, as discussed with Han
@hanjoosten
Bump version to 4.2.0
513da41
@hanjoosten hanjoosten self-assigned this Jul 16, 2021
@hanjoosten hanjoosten merged commit 7e0b87c into master Jul 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@hanjoosten hanjoosten

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@hanjoosten @stefjoosten