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

Merged
merged 58 commits into from
Jan 28, 2019
Merged

Release 1.1 merge to master #1636

Changes from 1 commit
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
b973845
Set version to branch 1.1.444.
zfi Nov 9, 2018
63fac21
Merge pull request #1602 from parallaxinc/pr-ver11444
zfi Nov 9, 2018
0c2ad40
Add surefire plugin configuration to disable testing.
pjewald Nov 10, 2018
cc36abb
Merge pull request #1603 from parallaxinc/surefile-no-tests
zfi Nov 10, 2018
7d34e18
Refactor code to trap the UnknownSessionException and return the clie…
zfi Nov 10, 2018
fca0a2a
Merge pull request #1604 from zfi/1.1
zfi Nov 11, 2018
72f9f47
point release upgrade of support packages.
zfi Nov 13, 2018
a247ce3
Refactor log configuration to eliminate duplicate log entries.
zfi Nov 13, 2018
1f21b89
Update the logger to roll over files at 10MB in size.
zfi Nov 13, 2018
82d73fc
Merge pull request #1606 from parallaxinc/pr-log-config
zfi Nov 13, 2018
4fc6750
Fix UI button to pretty-format prop C code
MatzElectronics Dec 11, 2018
e6c170a
Merge pull request #1613 from MatzElectronics/1.1
MatzElectronics Dec 11, 2018
367a2ab
Create license file for project
paragitadmin Dec 12, 2018
18386fd
Merge pull request #1615 from parallaxinc/add-license-1
paragitadmin Dec 12, 2018
350857b
Add MIT license. Update JavaDocs. Remove redundant code.
pjewald Dec 14, 2018
0da53f3
Merge pull request #1616 from zfi/1.1
zfi Dec 14, 2018
bd3bc4a
Refactor source files to add MIT license text.
pjewald Dec 15, 2018
068d326
Add missing doctype tag.
pjewald Dec 15, 2018
0e8f3a4
Refactor code to correct error on declared return type.
pjewald Dec 15, 2018
393f85c
Minor code refactoring. Add comments to clarify some code.
pjewald Dec 15, 2018
8c7bc5c
Merge pull request #1617 from zfi/1.1
zfi Dec 15, 2018
5f733f3
Change slash characters to HTML entities
MatzElectronics Dec 17, 2018
93427a1
Update build info and password validation warning
MatzElectronics Dec 18, 2018
9186fc2
Add password validation
MatzElectronics Dec 18, 2018
ab0c7b1
Improve password validation
MatzElectronics Dec 18, 2018
dfba486
Merge pull request #1620 from MatzElectronics/1.1
MatzElectronics Dec 18, 2018
c8e66f5
Update pom to use default maven repository. Update property plugin to…
pjewald Dec 20, 2018
9b93ed4
Merge pull request #1621 from zfi/1.1
zfi Dec 20, 2018
366d748
Remove debugging artifact from the pom file. oops.
pjewald Dec 20, 2018
fbc331d
Merge pull request #1622 from zfi/1.1
zfi Dec 20, 2018
54b3a9c
Add password validation
MatzElectronics Dec 21, 2018
e2e8c56
Merge pull request #1623 from MatzElectronics/1.1
MatzElectronics Dec 21, 2018
be445d0
Add ID to submit button
MatzElectronics Dec 21, 2018
f25fb4d
Merge pull request #35 from parallaxinc/1.1
MatzElectronics Dec 21, 2018
3aefb74
Add ID to submit button
MatzElectronics Dec 21, 2018
820a731
Put license header back
MatzElectronics Dec 21, 2018
fbca920
Merge pull request #1624 from MatzElectronics/1.1
MatzElectronics Dec 21, 2018
af4e997
Updating version for release.
zfi Dec 27, 2018
0b34cf9
Merge pull request #1627 from zfi/1.1
zfi Dec 27, 2018
7bde656
Adding old logging library to correct startup error.
pjewald Dec 28, 2018
0b3e450
Merge branch '1.1' of github.com:parallaxinc/BlocklyProp into local 1.1
pjewald Dec 28, 2018
33ac1a7
Merge pull request #1628 from zfi/1.1
zfi Dec 28, 2018
ce75302
Add missing DOCTYPE declaration to HTML document.
pjewald Jan 3, 2019
b809f9f
Refactor appender name. Remove unused references.
pjewald Jan 3, 2019
6353c80
Bump build number for new PR.
pjewald Jan 3, 2019
90ad88a
Add more informative console messages while locating the source help …
pjewald Jan 3, 2019
a407478
Comment out code that references old log4j LogManager class.
pjewald Jan 3, 2019
b04bf7d
Add package to support reference to old LogManager class.
pjewald Jan 3, 2019
adeb184
Merge pull request #1629 from zfi/1.1
zfi Jan 3, 2019
e7d1311
Backing off DOCTYPE commit.
pjewald Jan 3, 2019
0058a89
Merge pull request #1630 from zfi/1.1
zfi Jan 4, 2019
257aaea
Replace home page help link with a refernece to the Learn web sites.
Jan 4, 2019
0f75f5c
Merge pull request #1631 from zfi/1.1
zfi Jan 4, 2019
f7cd578
Bump build number for release.
pjewald Jan 23, 2019
ab88d84
Remove Sentury Raven packages. Update logger dependencies to user the…
pjewald Jan 24, 2019
2e2db97
Merge pull request #1633 from zfi/1.1
zfi Jan 24, 2019
486240b
Update pom to correct error in properties package.
pjewald Jan 25, 2019
d854660
Merge pull request #1635 from zfi/1.1
zfi Jan 25, 2019
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
Prev Previous commit
Next Next commit
Updating version for release.
  • Loading branch information
@zfi
zfi committed Dec 27, 2018
commit af4e997f5df4b9b2e5cda5b79b5fe769ae52dd5d
2 changes: 1 addition & 1 deletion ...in/resources/com/parallax/server/blocklyprop/internationalization/translations.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ footer.clientdownloadlink = BlocklyProp-client
# Application version numbers.
application.major = 1
application.minor = 1
application.build = 444
application.build = 446

html.content_missing = Content missing

Expand Down