keycloak-aplcache

Merge branch 'master-upstream' into feature-lithuanian-locale # …

9/4/2016 4:20:03 PM

Conflicts:
#	themes/src/main/resources/theme/base/account/messages/messages_en.properties
#	themes/src/main/resources/theme/base/account/theme.properties
#	themes/src/main/resources/theme/base/admin/theme.properties
#	themes/src/main/resources/theme/base/email/theme.properties
#	themes/src/main/resources/theme/base/login/theme.properties

Ramunas Kraujutis

Commit: 2e9f14d

Tree: 97f42f0

Parents: 352602d
404aa69

change lt locale position to be ordered alphabetically

8/22/2016 1:12:03 PM

Ramunas Kraujutis

Commit: 352602d

Tree: b6cbdb3

Parents: c333d1e

change lt locale position to be ordered alphabetically

8/22/2016 1:10:20 PM

Ramunas Kraujutis

Commit: c333d1e

Tree: 658dce5

Parents: ee66cb5

adding Lithuanian translation

8/21/2016 10:14:22 AM

Ramunas Kraujutis

Commit: ee66cb5

Tree: 351772c

Parents: fa1fb3a

Merge pull request #3200 from mbaluch/master RHSSO-423 …

9/8/2016 3:42:54 AM

- Added default value for 'log-dir'. Set to ${project.build…

Stian Thorgersen

Commit: 348e0b6

Tree: 1ddd949

Parents: 44b7210
fd25dbc

RHSSO-423 - Added default value for 'log-dir'. Set to ${project.build.dir}/surefire-reports

9/6/2016 1:16:08 PM

Marek Baluch

Commit: fd25dbc

Tree: 8e8b06a

Parents: eebd496

Merge pull request #3203 from mhajas/eap6fix KEYCLOAK-3533 …

9/8/2016 3:41:52 AM

Fix forbidden page on eap6

Stian Thorgersen

Commit: 44b7210

Tree: 1a6bcfe

Parents: f726cae
c860d03

Fix forbidden page on eap6

9/5/2016 5:44:01 AM

mhajas

Commit: c860d03

Tree: c4b43ae

Parents: eebd496

Merge pull request #3205 from stianst/KEYCLOAK-3342 KEYCLOAK-3342 …

9/8/2016 3:40:32 AM

Add Identity Provider authenticator

Stian Thorgersen

Commit: f726cae

Tree: c36c78e

Parents: d2c546b
7c292b1

KEYCLOAK-3342 Add Identity Provider authenticator

9/7/2016 3:52:55 AM

Stian Thorgersen

Commit: 7c292b1

Tree: 018a4cc

Parents: eebd496