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

Teamlevel permission issues #80

Merged
merged 7 commits into from
Oct 28, 2024
Merged

Teamlevel permission issues #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4b16dcf
fixing team level permission issues
summitt Oct 25, 2024
5aefbd2
[maven-release-plugin] prepare release 1.3.30
summitt Oct 25, 2024
a185ce3
[maven-release-plugin] prepare for next development iteration
summitt Oct 25, 2024
958868b
typo
summitt Oct 28, 2024
16ebb98
[maven-release-plugin] prepare release 1.3.31
summitt Oct 28, 2024
f6eef4f
[maven-release-plugin] prepare for next development iteration
summitt Oct 28, 2024
3b954b9
Merge branch 'main' into teamlevel-permission-issues
summitt Oct 28, 2024
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
2 changes: 1 addition & 1 deletion WebContent/WEB-INF/jsp/users/Users.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@
type="password" placeholder="Sends Registration Email if Blank" autocomplete="new-password">
</div>
<div class="form-group">
<label>Firstame: *</label> <input type="search"
<label>First Name: *</label> <input type="search"
class="form-control" id="fname" placeholder="First">
</div>
<div class="form-group">
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.faction</groupId>
<artifactId>faction</artifactId>
<version>1.3.30-SNAPSHOT</version>
<version>1.3.32-SNAPSHOT</version>
<packaging>war</packaging>
<name>Faction</name>
<scm>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml.releaseBackup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.faction</groupId>
<artifactId>faction</artifactId>
<version>1.3.29-SNAPSHOT</version>
<version>1.3.30-SNAPSHOT</version>
<packaging>war</packaging>
<name>Faction</name>
<scm>
Expand Down
8 changes: 4 additions & 4 deletions release.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#release configuration
#Fri Oct 25 09:22:48 CDT 2024
#Fri Oct 25 16:37:09 CDT 2024
completedPhase=end-release
exec.activateProfiles=github
exec.additionalArguments=-Dmaven.javadoc.skip\=true -Dmaven.test.skipTests\=true -Dmaven.test.skip\=true
exec.pomFileName=pom.xml
exec.snapshotReleasePluginAllowed=false
pinExternals=false
preparationGoals=clean verify
project.dev.org.faction\:faction=1.3.30-SNAPSHOT
project.rel.org.faction\:faction=1.3.29
project.dev.org.faction\:faction=1.3.31-SNAPSHOT
project.rel.org.faction\:faction=1.3.30
project.scm.org.faction\:faction.connection=scm\:git\:https\://github.com/factionsecurity/faction.git
project.scm.org.faction\:faction.developerConnection=scm\:git\:https\://github.com/factionsecurity/faction.git
project.scm.org.faction\:faction.tag=1.3.14
Expand All @@ -24,7 +24,7 @@ scm.developmentCommitComment=@{prefix} prepare for next development iteration
scm.id=faction-web
scm.releaseCommitComment=@{prefix} prepare release @{releaseLabel}
scm.rollbackCommitComment=@{prefix} rollback the release of @{releaseLabel}
scm.tag=1.3.29
scm.tag=1.3.30
scm.tagNameFormat=@{project.version}
scm.url=scm\:git\:https\://github.com/factionsecurity/faction.git
scm.username=summitt
Loading