Skip to content

Release 1.1 merge to master #1636

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
Merged
merged 58 commits into from
Jan 28, 2019
Merged

Release 1.1 merge to master #1636

merged 58 commits into from
Jan 28, 2019

Conversation

zfi
Copy link
Contributor

@zfi zfi commented Jan 25, 2019

Merging version 1.1 into the master branch for release.

zfi and others added 30 commits November 9, 2018 14:44
@zfi
Set version to branch 1.1.444.
b973845
@zfi
Merge pull request #1602 from parallaxinc/pr-ver11444
63fac21 
Set version to branch 1.1.444.
@pjewald
Add surefire plugin configuration to disable testing.
0c2ad40
@zfi
Merge pull request #1603 from parallaxinc/surefile-no-tests
cc36abb 
Add surefire plugin configuration to disable testing.
@zfi
Refactor code to trap the UnknownSessionException and return the clie…
7d34e18 
…nt browser to the home page as an unauthenticated user.
@zfi
Merge pull request #1604 from zfi/1.1
fca0a2a 
Correct session timeout stack dump
@zfi
point release upgrade of support packages.
72f9f47
@zfi
Refactor log configuration to eliminate duplicate log entries.
a247ce3
@zfi
Update the logger to roll over files at 10MB in size.
1f21b89
@zfi
Merge pull request #1606 from parallaxinc/pr-log-config
82d73fc 
Rotate log files at 10MB
@MatzElectronics
Fix UI button to pretty-format prop C code
4fc6750
@MatzElectronics
Merge pull request #1613 from MatzElectronics/1.1
e6c170a 
Fix UI button to pretty-format prop C code
@paragitadmin
Create license file for project
367a2ab 
Adding the MIT license to the project
@paragitadmin
Merge pull request #1615 from parallaxinc/add-license-1
18386fd 
Create license file for project
@pjewald
Add MIT license. Update JavaDocs. Remove redundant code.
350857b
@zfi
Merge pull request #1616 from zfi/1.1
0da53f3 
Begin process to add MIT license to source files.
@pjewald
Refactor source files to add MIT license text.
bd3bc4a
@pjewald
Add missing doctype tag.
068d326
@pjewald
Refactor code to correct error on declared return type.
0e8f3a4
@pjewald
Minor code refactoring. Add comments to clarify some code.
393f85c
@zfi
Merge pull request #1617 from zfi/1.1
8c7bc5c 
License headers and minor code refactoring
@MatzElectronics
Change slash characters to HTML entities
5f733f3
@MatzElectronics
Update build info and password validation warning
93427a1
@MatzElectronics
Add password validation
9186fc2
@MatzElectronics
Improve password validation
ab0c7b1
@MatzElectronics
Merge pull request #1620 from MatzElectronics/1.1
dfba486 
Improve password validation
@pjewald
Update pom to use default maven repository. Update property plugin to…
c8e66f5 
… version 1.0.
@zfi
Merge pull request #1621 from zfi/1.1
9b93ed4 
Pom file updates
@pjewald
Remove debugging artifact from the pom file. oops.
366d748
@zfi
Merge pull request #1622 from zfi/1.1
fbc331d 
Remove debugging artifact from the pom file
MatzElectronics and others added 28 commits December 21, 2018 07:48
@MatzElectronics
Add password validation
54b3a9c
@MatzElectronics
Merge pull request #1623 from MatzElectronics/1.1
e2e8c56 
Add password validation
@MatzElectronics
Add ID to submit button
be445d0 
Allows script to disable it until passwords are validated.
@MatzElectronics
Merge pull request #35 from parallaxinc/1.1
f25fb4d 
Update local repo
@MatzElectronics
Add ID to submit button
3aefb74
@MatzElectronics
Put license header back
820a731 
oops.
@MatzElectronics
Merge pull request #1624 from MatzElectronics/1.1
fbca920 
 Add ID to submit button
@zfi
Updating version for release.
af4e997
@zfi
Merge pull request #1627 from zfi/1.1
0b34cf9 
Updating version for release.
@pjewald
Adding old logging library to correct startup error.
7bde656
@pjewald
Merge branch '1.1' of github.com:parallaxinc/BlocklyProp into local 1.1
0b3e450
@zfi
Merge pull request #1628 from zfi/1.1
33ac1a7 
1.1 Update
@pjewald
Add missing DOCTYPE declaration to HTML document.
ce75302
@pjewald
Refactor appender name. Remove unused references.
b809f9f
@pjewald
Bump build number for new PR.
6353c80
@pjewald
Add more informative console messages while locating the source help …
90ad88a 
…files.
@pjewald
Comment out code that references old log4j LogManager class.
a407478
@pjewald
Add package to support reference to old LogManager class.
b04bf7d
@zfi
Merge pull request #1629 from zfi/1.1
adeb184 
1.1 pre-deployment updates
@pjewald
Backing off DOCTYPE commit.
e7d1311
@zfi
Merge pull request #1630 from zfi/1.1
0058a89 
Backing off DOCTYPE commit.
Replace home page help link with a refernece to the Learn web sites.
257aaea
@zfi
Merge pull request #1631 from zfi/1.1
0f75f5c 
Replace home page help link with a refernece to the Learn web sites.
@pjewald
Bump build number for release.
f7cd578
@pjewald
Remove Sentury Raven packages. Update logger dependencies to user the…
ab88d84 
… same version.
@zfi
Merge pull request #1633 from zfi/1.1
2e2db97 
1.1 - Release
@pjewald
Update pom to correct error in properties package.
486240b
@zfi
Merge pull request #1635 from zfi/1.1
d854660 
Update pom to correct error in properties package.
@zfi zfi merged commit bc3af61 into parallaxinc:master Jan 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@zfi @pjewald @MatzElectronics @paragitadmin