FishEye

- checkstyle configuration ... ... [X] clean up according to the checkstyle rules - smoke test passed: mvn clean package install

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

OLAT-5201 corrected display of a few elements

OLAT-4648 Replace Form with FlexiForm OLAT-3930 Interaction design changes OLAT-2887 Replace DefaultController with BasicController OLAT-4951 Issue with screen-shots for testing

Mazenization of HEAD olat3 and related submodules

IN PROGRESS - issue OLAT-4109: Refactor Logging Infrastructure: Unify Log Entries http://bugs.olat.org/jira/browse/OLAT-4109

OLAT-4109: refactoring of course log files into user activity logging table o_loggingtable - introducing ThreadLocalUserActivityLogger concept

missing part of the course chat enable/disable flag

OLAT-3478: Check ICourse references. Always get them from the cache.

OLAT-3422 more junit tests, removed legacy Localization class, refactored legacy usage of Localization to Package Translator, count keys method

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

MERGE BRANCH TO HEAD OLAT-2126

Merge from 1577 branch: SCORM assessable functionality OLAT-1602

OLAT-1796 update to apache 2.0 license boiler plate

OLAT-1593: Form refactoring, set the translator in the form constructor use form specific functions to translate * translate(String key) * translate(String key, String[] params) * getLoacle()

olat-1509 - move identityEnvironment to org.olat.core.id also Roles.java

olat-1528 : changed abstract form method "validate(ureq)" to "validate()" since userrequest is (and should) never be used in the validate method

OLAT-1509 moved org.olat.util to org.olat.core.util

OLAT-1509

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

OLAT-1509

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

Fixes OLAT-1437 Display each loglevel only if globally enabled or member of administrator group.

Fixes OLAT-1437 Display personalized user log configuration for administrators only.

Merge from OLAT-4_0_2-BPS_UNIZH-1319 Branch

file DisplayCourseInfoForm.java was initially added on branch OLAT-4_0_2-BPS_UNIZH-1319.

Beautify

add the REVIEW task name to see reviewed places where some questions arise of the BPS repository patch This is the reviewed BPS patch, without changes except added REVIEW messages - I see the need for a concept to jump between controllers as it is solved here by setting booleans to know where to jump back --- to jump from the catalog to the detail a ChangeEvent is used --- to jump from the course the activateable mechanism is used. - "upload a file" code is now replicated at several places (also the library's licence must be reviewed to be compatible with ours) - wizards should not be generated by subclassing this is stated from felix, now we should refactor the existing wizards not to use subclassing, as these may serve as base code for learning. -> Alexander Schneiders wizards InOutWizardController and BulkAssessmentWizardController show how to do it without subclassing. - Important small things: - use the constanst and not a value, where constants are defined , i.e. ChangedEvent.MODIFIED = 0 otherwise refactorings would generate errors. - introducing methods with almost the same signature but changing a new input value like boolean should not copy paste, but call the new method the corresponding default value. - introducing a new signature in a public method or constructor should not be done by refactoring all references but creating a new method. Then point the old one to the new one providing a default value.

OLAT-1482 ajax -ify olat work in progress!

OLAT-1233:Merge HEAD into branch-1233

OLAT-1233: Merge HEAD into Branch

merged head (with ajax, header cleanup)

OLAT-1530: Merge HEAD into BRANCH-1530

OLAT-1562:Merge HEAD into Branch.

merges from HEAD

MERGE HEAD TO BRANCH 5.0.x prepare for 5.0.1

OLAT-1879 Merge HEAD into Branch 1879

OLAT-1914 Merge HEAD to Branch

OLAT-2126

OLAT-3421 - course chat is configurable, first result was performance problem if course chat is enabled and a lot of people starting the same course within very short time (700 people within 10 minutes)

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

code refactoring

head merged

OLAT-1229: mostly only updates to stay in sync with the HEAD extended logging from HEAD calls to new api in this branch updated file to generate reporting table updated file to generate postgresql-database in general

OLAT-1595 : mergeOLAT-5_1_xToBranch

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

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-1577 adding glossary viewer, glossary editor, glossary course right, editor locking, and glossary course configuration. cleanup of old course configuration code that was not deleted after moving the configuration from the course to the repository.

Merging HEAD to branch

MERGE HEAD TO BRANCH 1508

MERGE HEAD to BRANCH for mvn testing

merge Head to Branch

OLAT-4648 Replace Form with FlexiForm OLAT-3930 Interaction design changes OLAT-2887 Replace DefaultController with BasicController OLAT-4951 Issue with screen-shots for testing