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

V1.3.0 #31

Merged
merged 61 commits into from
Nov 14, 2016
Merged

V1.3.0 #31

merged 61 commits into from
Nov 14, 2016

Conversation

kvb2univpitt
Copy link
Contributor

No description provided.

kvb2univpitt and others added 30 commits October 3, 2016 18:01
@kvb2univpitt
Changed version to 1.3.0.
9ebc001 
Refactoring for Spring Boot 1.4.1.RELEASE.
Update Shiro to version 1.3.2.
Update ccd-mail to version 0.2.1.
Update ccd-job-queue to 0.1.5.
@kvb2univpitt
Updated web libraries.
f723358
@kvb2univpitt
Refactoring login and user registration via Shiro.
9f866dd
@kvb2univpitt
Updated user registration and login.
cb8e369
@kvb2univpitt
Uncommented code.
4dfdb6b
@kvb2univpitt
Fixed login bugs.
75f1fad
@kvb2univpitt
Refactoring user profile.
f92d6cf
@kvb2univpitt
Refactoring user feedback.
9ecffd3
@kvb2univpitt
Refactoring password reset.
fc551ba
@kvb2univpitt
Fixed collapsing panels.
709940f
@kvb2univpitt
Added Auth0 authentication.
6dff86b
@kvb2univpitt
Set default values for algorithms.
6c90269
@kvb2univpitt
Updated algorithm parameter values.
74de46a 
Added a flag for user registration.
@kvb2univpitt
Fixed term page and password reset page.
4721dd4
@kvb2univpitt
Added missing category.
1262307
@kvb2univpitt
Updated Auth0 to version 1.1.1.
8df940d 
Use CDN for Auth0's lock.js.
@kvb2univpitt
Set the multipart max request size to max.
fa392b1
@kvb2univpitt
Fixed Google Font CDN to use https.
f59b1ba
@kvb2univpitt
Added logging.file configuration.
eb1a1ac
@marksilvis
ports all annotations files from v1.2.0-annotations
cc29fe5
@marksilvis
Merge pull request #26 from bd2kccd/v1.3.0-annotations
00d7376 
V1.3.0 annotations
This merge adds the necessary files for adding CCD-Annotations to Causal-Web.
@kvb2univpitt
Refactoring algorithms.
3afb5b8
@kvb2univpitt
Updated algorithm html views.
3f086d4
@kvb2univpitt
Minor update to html views.
a59ef7b
@kvb2univpitt
Merge pull request #27 from bd2kccd/v1.3.0-casual-cmd
83b94ab 
V1.3.0 casual cmd
@kvb2univpitt
Excluded ccd-db submodule from ccd-job-queue module.
0645106
@kvb2univpitt
Ignore files that do not have extension '.txt' in result view.
0e26b4d
@marksilvis
fixes annotations support
e65c96f 
removes replaces old login with new shiro login
@marksilvis
Merge pull request #28 from bd2kccd/v1.3.0-annotations
f4bffc3 
Annotations support
@marksilvis
requests annotations tokens on login
d34ae74
marksilvis and others added 28 commits November 2, 2016 12:04
@marksilvis
updates login
e97aae2
@marksilvis
updates annotations url
0e5f7dc
@kvb2univpitt
Refactored activation to use activationKey column from database.
a7a6b74
@marksilvis
Can now set the Annotations service URL, clientId, and clientSecret i…
37ccbc3 
…n application-annotations.properties
@marksilvis
fixes date parsing error in safari
d6dce2f
@marksilvis
server fetches annotations on account creation
5bafe19
@marksilvis
server fetches annotations tokens on account creation
b2fa38d
@marksilvis
Merge branch 'v1.3.0' of https://github.com/bd2kccd/causal-web into v…
2aacade 
…1.3.0
@marksilvis
updates annotations service properties
04fd03d
@marksilvis
includes references to annotations properties
c8e2845
@marksilvis
working on token refresh
35fd9c3
@marksilvis
working on improving refresh token request
4ce9b79
@kvb2univpitt
Added additional properties.
4c4ab0a
@marksilvis
Refreshing data files now creates annotation targets
c984f3e
@marksilvis
fixes call to lazily loaded resource
b90c068
@kvb2univpitt
Fixed the missing annotation target issue.
21c6b93
@marksilvis
includes json dependency in gradle build file
ff4cb25
@marksilvis
updates annotation media margin
c10ea4a
@marksilvis
updates annotations media css
eceecf4
@marksilvis
last css fix
a428606
@kvb2univpitt
Show password reset only if it's not using auth0.
fc6392d
@kvb2univpitt
Encode URI with dataset name.
b5607e2
@kvb2univpitt
Fixed filename that has HTML character code.
ed65f5d
@kvb2univpitt
Removed Gradle.
478938d
@kvb2univpitt
Use hsqldb as a default db to prevent test errors during compilation.
e244279
@kvb2univpitt
Clean up properties file.
9ca8fb1
@kvb2univpitt
Reorganized Javascript imports.
f563141
@kvb2univpitt
Updated the README file.
725fe03
@kvb2univpitt kvb2univpitt merged commit 2d3ed2d into master Nov 14, 2016
@kvb2univpitt kvb2univpitt deleted the v1.3.0 branch April 7, 2017 19:20
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.
2 participants
@kvb2univpitt @marksilvis