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.

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

more stuff #3

Merged
merged 2 commits into from
Jul 15, 2013
Merged

more stuff #3

merged 2 commits into from
Jul 15, 2013

Conversation

patriot1burke
Copy link
Contributor

No description provided.

patriot1burke added a commit that referenced this pull request Jul 15, 2013
@patriot1burke patriot1burke merged commit bdfb480 into keycloak:master Jul 15, 2013
bdecoste pushed a commit to bdecoste/keycloak that referenced this pull request Mar 2, 2016
Finish JEE REST-endpoint example.
hectorj2f pushed a commit to hectorj2f/keycloak that referenced this pull request Mar 7, 2017
alexeykazakov pushed a commit to alexeykazakov/keycloak that referenced this pull request Mar 24, 2017
stianst pushed a commit that referenced this pull request Oct 20, 2017
fperot74 pushed a commit to fperot74/keycloak that referenced this pull request Oct 1, 2019
[CLOUDTRUST-1438] Conditional mechanism for multi-token
stianst pushed a commit that referenced this pull request Apr 6, 2022
adding nvmrc

CIAM-1048 Device Activity screen PF updates

CIAM-1046: Personal Info sub-header update

Updates SigningInPage to use EmptyState component when there are no credentials.

rearanged some components used in signing in page

Displays ApplicationPage content in description list.

Updates refresh link on ContentPage, updates Resources screen.

CIAM-1049 Linked Accounts screen PF updates

CIAM-1043-General upstream updates

Updates AccountPage to display form errors.

fix: display Set up Authenticator Application link on large viewport

fix(page structure): rearranges page sections

CIAM-1254/Personal info PF4 updates & Sidebar text updates

updating layouts

updating layout on Signing in and Linked acounts

adding patternfly-additions

adding patternfly-addons styles

Updates Application page based on designs feedback.

moving page description

Updates status label on Applications page to be capitalized.

Updates the copy-fonts script for keycloak.v2 to copy all font directories instead of one.

update Personal info screen - set max width of 600px for form input fields

update Personal info - remove required indicator from input fields

General updates (#2)

* removed the extra lines being shown

* tweaked general spacing

* general alignment and spacer application

* refactor to get proper alignments without css globals

* forgot to add the conditional on displaying the set up buttons

* try and adjust the alignments

Co-authored-by: zwitter <[email protected]>

resolve merge conflicts

Device activity updates (#4)

* update text to sentence case

* update device info columns to be dynamic across various viewport sizes

* update signed in device layout

* update based on feedback

Co-authored-by: Jon Szeto <[email protected]>

Linked accounts update (#3)

* linked accounts screen - updated icons & Linked/Unlinked Login Providers layout & update text to sentence case

Co-authored-by: Jon Szeto <[email protected]>

fixing ts errors

cleaning up fonts and messages

final review updates

message update for Back to admin console link

fixing capitalization on 2fa

updating landing page welcome message

fix: reposition Back to... link

adjusting size for confirm modal

updating spacing and alignment issues

updating resources page

removing unused header class

fixes ts issues and updates node version to match the themes install

npm updates

fixing pf addons

adding chokidar to get babel:watch working

fixing issues from pull request feedback

fixing tests

fixes signingin page test

fixing tests

Co-authored-by: Tyler Andor <[email protected]>
@nrobert13 nrobert13 mentioned this pull request Dec 27, 2022
2 tasks
Pepo48 referenced this pull request in Pepo48/keycloak Jan 27, 2023
---
Quarkus3 branch sync #3 (27.1.2023)
Resolved conflicts:
keycloak/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapStorageProviderFactory.java - Modified
Pepo48 referenced this pull request in Pepo48/keycloak Jan 27, 2023
Closes keycloak#16502

---
Quarkus3 branch sync #3 (27.1.2023)
Resolved conflicts:
keycloak/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapStorageProviderFactory.java - Modified
Pepo48 referenced this pull request in Pepo48/keycloak Jan 27, 2023
Closes keycloak#16336

---
Quarkus3 branch sync #3 (27.1.2023)
Resolved conflicts:
keycloak/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/JpaMapStorage.java - Modified
keycloak/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/JpaMapStorageCockroachdb.java - Modified
Pepo48 referenced this pull request in Pepo48/keycloak Feb 3, 2023
---
Quarkus3 branch sync #3 (27.1.2023)
Resolved conflicts:
keycloak/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapStorageProviderFactory.java - Modified
Pepo48 referenced this pull request in Pepo48/keycloak Feb 3, 2023
Closes keycloak#16502

---
Quarkus3 branch sync #3 (27.1.2023)
Resolved conflicts:
keycloak/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapStorageProviderFactory.java - Modified
Pepo48 referenced this pull request in Pepo48/keycloak Feb 3, 2023
Closes keycloak#16336

---
Quarkus3 branch sync #3 (27.1.2023)
Resolved conflicts:
keycloak/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/JpaMapStorage.java - Modified
keycloak/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/JpaMapStorageCockroachdb.java - Modified
Pepo48 referenced this pull request in Pepo48/keycloak Feb 10, 2023
---
Quarkus3 branch sync #3 (27.1.2023)
Resolved conflicts:
keycloak/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapStorageProviderFactory.java - Modified
Pepo48 referenced this pull request in Pepo48/keycloak Feb 10, 2023
Closes keycloak#16502

---
Quarkus3 branch sync #3 (27.1.2023)
Resolved conflicts:
keycloak/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapStorageProviderFactory.java - Modified
Pepo48 referenced this pull request in Pepo48/keycloak Feb 10, 2023
Closes keycloak#16336

---
Quarkus3 branch sync #3 (27.1.2023)
Resolved conflicts:
keycloak/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/JpaMapStorage.java - Modified
keycloak/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/JpaMapStorageCockroachdb.java - Modified
xieshenzh pushed a commit to xieshenzh/keycloak that referenced this pull request May 26, 2023
Extends the conditional user attribute authenticator to check the att… keycloak#20189
lexmanh added a commit to lexmanh/keycloak that referenced this pull request Jan 12, 2024
@pedroigor pedroigor mentioned this pull request Mar 4, 2024
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant