libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Bill Burke 2015-04-20 11:55:01 -04:00
commit e32ef66e2a
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
forms/common-themes/src/main/resources/theme/base/account/messages/messages_en.properties
View file

@ -84,7 +84,7 @@ revoke=Revoke Access
configureAuthenticators=Configured Authenticators configureAuthenticators=Configured Authenticators
mobile=Mobile mobile=Mobile
totpStep1=Install <a href="https://fedorahosted.org/freeotp/" target="_blank">FreeOTP</a> or <a href="http://code.google.com/p/google-authenticator/" target="_blank">Google Authenticator</a> on your mobile. totpStep1=Install <a href="https://fedorahosted.org/freeotp/" target="_blank">FreeOTP</a> or Google Authenticator on your device. Both applications are available in <a href="https://play.google.com">Google Play</a> and Apple App Store.
totpStep2=Open the application and scan the barcode or enter the key. totpStep2=Open the application and scan the barcode or enter the key.
totpStep3=Enter the one-time code provided by the application and click Save to finish the setup. totpStep3=Enter the one-time code provided by the application and click Save to finish the setup.

2
forms/common-themes/src/main/resources/theme/base/login/messages/messages_en.properties
View file

@ -47,7 +47,7 @@ country=Country
emailVerified=Email verified emailVerified=Email verified
gssDelegationCredential=gss delegation credential gssDelegationCredential=gss delegation credential
loginTotpStep1=Install <a href="https://fedorahosted.org/freeotp/" target="_blank">FreeOTP</a> or <a href="http://code.google.com/p/google-authenticator/" target="_blank">Google Authenticator</a> on your mobile loginTotpStep1=Install <a href="https://fedorahosted.org/freeotp/" target="_blank">FreeOTP</a> or Google Authenticator on your mobile. Both applications are available in <a href="https://play.google.com">Google Play</a> and Apple App Store.
loginTotpStep2=Open the application and scan the barcode or enter the key loginTotpStep2=Open the application and scan the barcode or enter the key
loginTotpStep3=Enter the one-time code provided by the application and click Submit to finish the setup loginTotpStep3=Enter the one-time code provided by the application and click Submit to finish the setup
loginTotpOneTime=One-time code loginTotpOneTime=One-time code

5
misc/HackingOnKeycloak.md
View file

@ -39,8 +39,7 @@ Once you have received feedback from the mailing list if there's not one already
Implement changes Implement changes
----------------- -----------------
We don't currently enforce a code style in Keycloak, but a good reference is the code style used by WildFly. This can be We don't currently enforce a code style in Keycloak, but a good reference is the code style used by WildFly. This can be retrieved from [Wildfly ide-configs](https://github.com/wildfly/wildfly-core/tree/master/ide-configs).To import formatting rules, see following [instructions](http://community.jboss.org/wiki/ImportFormattingRules)
retrieved from (https://github.com/wildfly/wildfly-core/tree/master/ide-configs)[https://github.com/wildfly/wildfly-core/tree/master/ide-configs].
If your changes requires updates to the database read [Updating Database Schema](UpdatingDatabaseSchema.md). If your changes requires updates to the database read [Updating Database Schema](UpdatingDatabaseSchema.md).
@ -67,4 +66,4 @@ Once you're happy with your changes go to GitHub and create a PR.
Release Keycloak Release Keycloak
---------------- ----------------
* [Release Process](ReleaseProcess.md) * [Release Process](ReleaseProcess.md)