Skip to content

Commit 7d86138

Browse files
committed
Merge branch 'release/3.0.0'
2 parents 60de136 + 4071dce commit 7d86138

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+3680
-2028
lines changed

.classpath

Lines changed: 0 additions & 32 deletions
This file was deleted.

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,7 @@
33
/application.yml
44
/.project
55
*.gz
6+
.project
7+
.classpath
8+
.settings
9+

.mvn/wrapper/maven-wrapper.jar

-48.3 KB
Binary file not shown.

.mvn/wrapper/maven-wrapper.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.

.settings/org.eclipse.core.resources.prefs

Lines changed: 0 additions & 4 deletions
This file was deleted.

.settings/org.eclipse.jdt.core.prefs

Lines changed: 0 additions & 14 deletions
This file was deleted.

.settings/org.eclipse.m2e.core.prefs

Lines changed: 0 additions & 4 deletions
This file was deleted.

.settings/org.eclipse.wst.common.project.facet.core.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

LICENSE_HEADER

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ShinyProxy
22

3-
Copyright (C) 2016-2021 Open Analytics
3+
Copyright (C) 2016-2023 Open Analytics
44

55
===========================================================================
66

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Open Source Enterprise Deployment for Shiny Apps
1818

1919
Learn more at https://shinyproxy.io
2020

21-
#### (c) Copyright Open Analytics NV, 2016-2021 - Apache License 2.0
21+
#### (c) Copyright Open Analytics NV, 2016-2023 - Apache License 2.0
2222

2323
## Building from source
2424

@@ -33,7 +33,7 @@ The build will result in a single `.jar` file that is made available in the `tar
3333
## Running the application
3434

3535
```
36-
java -jar shinyproxy-2.3.0.jar
36+
java -jar shinyproxy-3.0.0.jar
3737
```
3838

3939
Navigate to http://localhost:8080 to access the application. If the default configuration is used, authentication will be done against the LDAP server at *ldap.forumsys.com*; to log in one can use the user name "tesla" and password "password".
@@ -42,4 +42,3 @@ Navigate to http://localhost:8080 to access the application. If the default con
4242
## Further information
4343

4444
https://shinyproxy.io
45-

0 commit comments

Comments
 (0)