FishEye

- checkstyle configuration ... [X] formatting step only - smoke test passed: mvn clean package install

OLAT-4734: fix im sync error when using multiple-instance-mode

OLAT-3694: speed up list of all connected users by adding a cache

olat-3377: fix broken hasAccount if account was not yet present, add check for pluginversion on server, allow manual reconnection of admin user

OLAT-1796 Boilerplate: replaced "Copyright (c) 1999-200[0-9]" with "Copyright (c) since 2004"

OLAT-2878: new IM junit tests

OLAT-2878: new IM junit tests

OLAT-2878: smaller IM api, testing ability without olat

OLAT-2878: smaller api, testing ability without olat

merge with Branch 6.0

OLAT-3097: multiwindow chat for p2p chat and groupchat

OLAT-2725 XHTML compliance: image tags, br's, wrong form labels etc

OLAT-2894: learning groups get synchronized with Instant Messaging server as well

OLAT-2840: remove unused config vars

MERGE BRANCH 5.2.x INTO HEAD (gs-part 5.2.3)

olat-2143: make sure all smack treads are closing on logout

OLAT-2428: removed flash based im stuff from head

OLAT-2143: html chat, html chat for OLAT group mode

OLAT-2143: html chat; working protoype

OLAT-1796 update to apache 2.0 license boiler plate

olat-1509 moved Identiy to org.olat.core.id and OLATResourceable to org.olat.core.id

OLAT-1509 -move org.olat.gui -> org.olat.core.gui (except the portal which has some class references in xml stream) -adapted xx_config.xml files where some org.olat.gui.render.VelocityRender references were

header cleanup, license stuff has to be on top above package otherwise its included in javadoc every time!

OLAT-624: fixed, groups get now renamed as well on the IM server.

- changed from boolean modes to generic modes in conference toom controller configuration - mode mini (existed as boolean flag) - mode maxi (existed as boolean flag) - mode toolbox - course chat uses not new toolbox mode to generate the link - starting coursechat does now correctly start a new chat when chat not opened, else it just opens the chat in the existing window. http://bugzilla.olat.org/show_bug.cgi?id=1179

formatting

small changes

fixed possible concurrent access problems to clients map

cleaning up TODO's , adding more erro logging, comments

string from oresHelper not suitable for jabber server, replaced by own method

adding conferencing as collaboration tool http://bugzilla.olat.org/show_bug.cgi?id=1203

inial version of startup sync for buddygrops, not yet working, still NULL pointer

inial version of startup sync for buddygrops

new interface methods

Collab enable/disable if in assessment

refractoring of instant messaging

synchonizing of buddygroups added to Interface implementation. Interface for buddygroup sync works for the case of adding users to a roster group. Synchronisation at startup does not yet work. jive messenger bug was fixed, ressources now get initial presence when serveral resources are connected simultanly

Disable IM in test mode.

refractoring of instant messaging: by chanching the server to "idmels3test" and setting the classname for the AccountCreation right, the new IM accouts get now successful created by olat

refractoring of instant messaging, new wrapper class for IMClient (solves interator velocity issue)

refractoring of instant messaging

refractoring of instant messaging

refractoring of instant messaging, new methods in interface InstantMessaging, additional comments

refractoring of instant messaging, new methodes in interface InstantMessaging

refractoring of instant messaging, new interfaces for IM-API

OLAT-1589: Login name mapper. Used for IM name mapping and allows arbitrary OLAT login name, because they will be mapped for IM usage. The default name mapping should not change the current OLAT behaviour (IMName = OLATLoginName.toLowerCase())

OLAT-1233: Merge HEAD into Branch

merged head (with ajax, header cleanup)

MERGE HEAD TO BRANCH 5.0.x prepare for 5.0.1

OLAT-2735: Escape "&" in course title for chat

OLAT-1796 Boilerplate: replaced "Copyright (c) 1999-200[0-9]" with "Copyright (c) since 2004"

OLAT-3182: improvements in groupchatManager handling

OLAT-3097: multiwindow chat for p2p chat and groupchat

head merged

http://bugs.olat.org/jira/browse/OLAT-1595 OLAT-1595: Merge HEAD into BRANCH (work in progress)

OLAT-2434 Merging HEAD to CF branch, adding database migration script. There are some classes I had to patch in the core to make this branch work, I will commit them directly to HEAD when merging the branch back to HEAD, so this branch will not compile out of the box.

OLAT-2434 BPS-CF update branch to current HEAD development after fixing power search method and ajax user search

OLAT-2434 BPS-CF update branch to current HEAD development after user delete state refactoring

OLAT-2434 BPS-CF update old branch to current head development. has some errors in test classes

Synchronyzing 1577 branch (glossary, scorm assessable, repo can reference) with HEAD

OLAT-2385 - forth time merge MAIN HEAD with the OLAT-HEAD-UZH-2385 BRANCH (common base version is Temp_lavinia_1, merged with Temp_lavinia_2, where Temp_lavinia_2 is the latest tag on MAIN HEAD)

OLAT-2385 - third time merge MAIN HEAD with the OLAT-HEAD-UZH-2385 BRANCH (common base version is Temp_lavinia_2, merged with Temp_lavinia_1, where Temp_lavinia_1 is the latest tag on MAIN HEAD)

olat-2433

OLAT-2725 merges from head, adjusting portal changes edit mode

merge Head to Branch

OLAT-1835 organize imports & Separation core - lms

merge with head