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-5754 Fixed for wiki. Revert changes for WikiCourseNode.calcAccessAndVisibility.

OLAT-5754 Fixed for wiki. restrict editing only if no edit condition specified

OLAT-5754 Fixed for wiki. block editing only if is not coach and is readonly

OLAT-5754 Fixed for wiki. Evaluate "editarticle" access condition depending on "access" condition.

[non-jira] [merged from 6-3-public branch] log an error if the destination cannot be created - to find more infos for a redscreen on live

OLAT-4793 Fixed. Changed CourseNode.archiveNodeData signature to return a boolean.

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

config and startup refactoring to spring only

OLAT-4148: display of description more consistent across all course elements

OLAT-3590: fixed deletion of subscribers when user was removed from group, fixed deletion of publishers/subscribers is resource (group, LR) gets deleted

OLAT-3560 Fixed. Check for null at return from WikiManager.getWikiContainer().

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

MERGE OLAT-6_0_3-FINAL into HEAD

olat-2278 now not in branch anymore, but spring-ified in HEAD. Work: - rename olatresourceableeventcenter to olatsystembus - extract interface and let spring implement by di - created singleVM and Cluster version of the olat system bus - organize imports work still in progress for the cluster version, the standard version is ok.

OLAT-1943: merge from head. fix broken access to course node if read only is not set, and generate warning if wiki words are too long

OLAT-1943: fix broken access to course node if read only is not set

OLAT-1899: wiki to cp export, class renaming

OLAT-1943: first version of read only wiki - stable

organize imports

OLAT-1796 update to apache 2.0 license boiler plate

OLAT-1781: Fix bug when copy wiki repository entry on windows. (Take wrong resource folder on windows).

OLAT-1701: implemented course import with wiki refereces

olat-902: windows does not like ":" in filenames, creating filenames with "-" only

olat-902: unifiing import / export format of wiki resource

OLAT-904 adding missing wiki export when exporting a course. import of a course does still NOT import the wiki! the course has an invalid reference at this time

OLAT-1583: delete zombies that remained on filesystem if exeception was thrown while adding resource

olat-1568: writing bytes as utf-8 instead of plattform default setting

OLAT-1568: do zip wiki while archiving

OLAT-903: adding locale to wiki for date rendering, fixing repo copy - now copies images as well. exporting generates overview to match pagename with pageid

OLAT-903: wiki archiving and refectoring of similar archiving classes to GenericArchiveController

OLAT-1553: New features: - view external page content in new browser window Feature improvements: - external page configuration - multiple possibilities of choosing a html page in all course building blocks with a own html page und batch upload of html page packages in a zip file in a modal dialog - wiki textarea description position and tabindex Removed features: - popup option for all course building blocks (user can choose this on its own when watching content) Enhanced gui features: - visibilityDependsOnSelectionRules can now be detained from working in both ways (for complex dependencies like external page) - RadioButtonGroupElement can now be shown without label and may contain html tags for formatting of description - obsolete DisplayConfiguration(Form)Controller removed Enhanced core programming features: - standarized updateModulConfigDefaults methods (in interface) in all course nodes, documentation of this Enhanced i18n handling: - all major touched classes now contain a NLS (native language support) section with all used LocalStrings in the declaration area

OLAT-904: new course building block wiki

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

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

always supply windowcontrol to all controllers (various reasons: error tracing, extensions, preferences keys, ...)

OLAT-688

- Bugfix OLAT-987 - first clean up - better readable code

Course Editor

Enhancements, bug fixes

+ catch invalid node references during course publish + enhanced publish procedure -> internal pre-publish for checking validity of course -> error messages in case where invalid node references are found, cycles not checked yet. OLAT-872 More verbose information about invalid course node configurations OLAT-471 Löschen von BB bei bestehenden Abhängigkeiten OLAT-540 Catch cyclic or invalid node references in condition during course publish

+Course Editor enhanced verbosity. Error Overview -> which node has what kind of error. GUI is not finished ;-) customers, please where and how to put what. +Menu tree shows if any condition is set on a node. +Course Editor Environment knows about which node references what other resource (node,group,area, etc) Next step is catch cyclic, and invalid references. And prevent deletion of still referenced nodes. OLAT-872 More verbose information about invalid course node configurations OLAT-471 Löschen von BB bei bestehenden Abhängigkeiten OLAT-540 Catch cyclic or invalid node references in condition during course publish OLAT-67 Icon bei Stuktur wenn Sichtbarkeit oder Zugang aktiv OLAT-877 See conditions in menu tree

+ Courseeditor is very verbose now when configuring Conditions with the Expert Form, i.e. the error messages include now the most exact error cause, which is possible to extract from the condition parser. Even some hints about corrections are available. Now it is no longer possible to create an invalid condition, in the sense of referencing a non existing: -GroupName -AreaName -Course node Although it is still possible to add a valid reference and later delete the group, area, course node, but this is a different story. Which is addressed in the next step. All this is more or less a side effect of the ongoing work at the following tasks: OLAT-872 More verbose information about invalid course node configurations OLAT-471 Löschen von BB bei bestehenden Abhängigkeiten OLAT-540 Catch cyclic or invalid node references in condition during course publish OLAT-67 Icon bei Stuktur wenn Sichtbarkeit oder Zugang aktiv OLAT-877 See conditions in menu tree

cp integration in course v 0.85

version 0.8 of course refactoring

refactoring: - row id's in forms have now id = elementname + formname -> id's are unique also when more than one form is on the same page (as in conditions) - condition form must have unique name -> now more than one form on the same page works smoothly

Improved easy mode for access and visibility conditions http://bugzilla.olat.org/show_bug.cgi?id=1144

*** empty log message ***

randstunden-wikikursbaustein ;)

OLAT-1553: First draft of - simplyfied options in BB external page (1555) - popup option is no longer available (1554) - course editor: simplyfied workflow (original 1553) - belonging localstrings for de language

OLAT-1233: Merge HEAD into Branch

merged head (with ajax, header cleanup)

merge HEAD into BRANCH-1530

OLAT-1530: Merge HEAD into BRANCH-1530

OLAT-1562:Work in progress; Merge HEAD into Branch.

OLAT-1562: Work in progress; Merge HEAD into branch.

OLAT-1562: Merge HEAD into branch.

merges from HEAD

MERGE HEAD TO BRANCH 5.0.x prepare for 5.0.1

OLAT-1943: fix broken access to course node if read only is not set, and generate warning if wiki words are too long

OLAT-1943: fix broken access to course node if read only is not set

OLAT-1899: wiki to cp export

merge Head to Branch ( target: HEAD common source: mergeHeadTo1879_1 )

merge head into branch

OLAT-1879 Merge HEAD into Branch 1879

merge head into branch

OLAT-3560 Fixed on 6.0.x Branch. Check for null at return from WikiManager.getWikiContainer().

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

OLAT-3373 OLAT-3356 non-jira /g/ mapper fix

[non-jira] log an error if the destination cannot be created - to find more infos for a redscreen on live

sync with head

head merged

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

OLAT-5494 merge 7.1 head to epf-branch

OLAT-5494: merge head to epf-branch: olat3

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

Merging HEAD to branch

MERGE HEAD TO BRANCH 1508

merge Head to Branch

OLAT-1835 organize imports & Separation core - lms

- intermediate save - merge HEAD into Branch

updating to current head

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

merge with head