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

Tree
Options

2a60aef

LDEV-5058 Move activity category from DB to authoring front end

30 Jul 20 Marcin Cieslak 2a60aefd13ef4aac8e67f7e23ff837062aa837d9

Merge remote-tracking branch 'origin/master' into v4.0
Conflicts:
lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java
lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

20 Mar 20 Marcin Cieslak a61b6ad192148c0ae514f37a9b488c3a15535ee9

Loading ...