Fisheye: Diff - lams-github/lams_central/web/authoring/authoring.jsp

Tree
Options

9091ed8

Merge branch 'LDEV-4745' into v4.0
# Conflicts:
# lams_admin/conf/language/lams/ApplicationResources.properties
# lams_central/conf/language/lams/ApplicationResources.properties
# lams_central/conf/language/lams/ApplicationResources_en_AU.properties
# lams_central/web/includes/javascript/authoring/authoringGeneral.js
# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

03 Jan 20 Marcin Cieslak 9091ed8c9bae9a48f88622c0c5031af2a39772dc

658453b

LDEV-4853 Rewrite YUI folder tree in LD authoring to bootstrap

25 Aug 19 Marcin Cieslak 658453b9f8bdfbf78bc9151b2cc711796081abc2

Loading ...