Merge with 5250d00ab4307f661c15253bc3a71df7de1b1e9e (66b8c938) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 66b8c938 authored 8 years ago by hg

Browse files

Merge with 5250d00ab4307f661c15253bc3a71df7de1b1e9e

parents 4373da70 7e6c5984

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

.hgtags 1 addition, 0 deletions

.hgtags
pom.xml 12 additions, 6 deletions

pom.xml
src/main/java/org/olat/admin/user/UserSearchFlexiController.java 3 additions, 2 deletions

...n/java/org/olat/admin/user/UserSearchFlexiController.java
src/main/java/org/olat/basesecurity/AuthHelper.java 1 addition, 1 deletion

src/main/java/org/olat/basesecurity/AuthHelper.java
src/main/java/org/olat/basesecurity/BaseSecurity.java 7 additions, 1 deletion

src/main/java/org/olat/basesecurity/BaseSecurity.java
src/main/java/org/olat/basesecurity/BaseSecurityManager.java 5 additions, 3 deletions

src/main/java/org/olat/basesecurity/BaseSecurityManager.java
src/main/java/org/olat/basesecurity/manager/GroupDAO.java 18 additions, 1 deletion

src/main/java/org/olat/basesecurity/manager/GroupDAO.java
src/main/java/org/olat/basesecurity/model/GroupMembershipImpl.java 1 addition, 0 deletions

...java/org/olat/basesecurity/model/GroupMembershipImpl.java
src/main/java/org/olat/commons/calendar/ui/components/FullCalendarComponentRenderer.java 7 additions, 7 deletions

...calendar/ui/components/FullCalendarComponentRenderer.java
src/main/java/org/olat/core/commons/chiefcontrollers/_i18n/LocalStrings_it.properties 6 additions, 1 deletion

...commons/chiefcontrollers/_i18n/LocalStrings_it.properties
src/main/java/org/olat/core/gui/components/form/flexible/elements/FlexiTableSortOptions.java 7 additions, 0 deletions

...ponents/form/flexible/elements/FlexiTableSortOptions.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/FormJSHelper.java 50 additions, 9 deletions

.../core/gui/components/form/flexible/impl/FormJSHelper.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/_i18n/LocalStrings_it.properties 2 additions, 1 deletion

...m/flexible/impl/elements/_i18n/LocalStrings_it.properties
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java 9 additions, 1 deletion

...lexible/impl/elements/richText/RichTextConfiguration.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextElementRenderer.java 1 addition, 1 deletion

...xible/impl/elements/richText/RichTextElementRenderer.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

...e/impl/elements/richText/_i18n/LocalStrings_de.properties
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/_i18n/LocalStrings_en.properties 2 additions, 1 deletion

...e/impl/elements/richText/_i18n/LocalStrings_en.properties
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/AbstractFlexiTableRenderer.java 15 additions, 12 deletions

...xible/impl/elements/table/AbstractFlexiTableRenderer.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableClassicRenderer.java 5 additions, 4 deletions

...exible/impl/elements/table/FlexiTableClassicRenderer.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableElementImpl.java 1 addition, 1 deletion

...m/flexible/impl/elements/table/FlexiTableElementImpl.java

with 154 additions and 52 deletions

Please register or to comment