lams_admin

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_admin/.classpath

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams-gradebook.jar

lams_build/lib/lams/lams.jar

lams_central/.classpath

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java

lams_central/src/java/org/lamsfoundation/lams/rest/RestServlet.java

lams_central/src/java/org/lamsfoundation/lams/rest/ToolRestManager.java

lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java

lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java

lams_central/web/includes/javascript/pedagogicalPlanner.js

lams_common/.classpath

lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java

lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

lams_gradebook/.classpath

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java

lams_learning/.classpath

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java

lams_monitoring/.classpath

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

lams_tool_assessment/.classpath

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_bbb/.classpath

lams_tool_chat/.classpath

lams_tool_doku/.classpath

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java

lams_tool_eadventure/.classpath

lams_tool_forum/.classpath

lams_tool_images/.classpath

lams_tool_kaltura/.classpath

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java

lams_tool_lamc/.classpath

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java

lams_tool_laqa/.classpath

lams_tool_larsrc/.classpath

lams_tool_leader/.classpath

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/LearningAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java

lams_tool_nb/.classpath

lams_tool_notebook/.classpath

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java

lams_tool_sbmt/.classpath

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

lams_tool_scratchie/.classpath

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java

lams_tool_spreadsheet/.classpath

lams_tool_survey/.classpath

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java

lams_tool_task/.classpath

lams_tool_vote/.classpath

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java

lams_tool_wiki/.classpath

  1. … 102 more files in changeset.
LDEV-4658: Adding label

LDEV-4054: Updating Greek

LDEV-4658 Add new config setting "Enable profile portrait editing"

  1. … 4 more files in changeset.
LDEV-4660 Update LAMS code to support POI 3.17 and 4.0

POI libraries are kept at 3.17 version, until they fix the following

issue: java.lang.IllegalArgumentException: Property

'http://www.oracle.com/xml/jaxp/properties/entityExpansionLimit' is not

recognized.

  1. … 13 more files in changeset.
LDEV-4440 Various fixes in admin

  1. … 2 more files in changeset.
LDEV-4440 added session scope at UserOrgRole, fixed paths - added lams url

  1. … 16 more files in changeset.
LDEV-4440 changed redirect into forward at return of methods

LDEV-4654 userinfoUrl field is no longer required one

Also added * character after all required fields to make required fields

more obvious.

LDEV-4440 added setters of userid and orgid

LDEV-4440 fixed creating courses/subcourses, added annotation with session scope at userorgrole files

LDEV-4440 fixed userorgrole jsp file - changed checkbox

LDEV-4440 Fixed import users, lti / server maintain, user create and edit

  1. … 3 more files in changeset.
LDEV-4440 changes at user controller - set orgid and userid

LDEV-3322: resucitating selenium tests

Readapting the old lams_test to LAMS 3.x

  1. … 2 more files in changeset.
LDEV-4440 Admin migration - fixed tool content list, theme management, ldap, cleaned code at controllers

  1. … 21 more files in changeset.
LDEV-4440 Migration of admin - fixed import, ldap and toolcontentlist

    • -27
    • +28
    ./web/toolcontent/learningLibraryGroup.jsp
LDEV-4645 Fix a but similar to LDEV-3382

LDEV-4645: bootstrap page

Bootstrap layout and remove userInfoURL as it is not longer a required field

LDEV-4440 Admin - fixed sign up management, added errorMaps

  1. … 30 more files in changeset.
LDEV-4440 Migration of admin - fixed userChangePass and userRoles

  1. … 14 more files in changeset.
LDEV-4440 Migration of admin - no struts

    • -1020
    • +0
    ./web/WEB-INF/struts-config.xml
  1. … 35 more files in changeset.
LDEV-4440 Migration of admin

  1. … 16 more files in changeset.
LDEV-4645 Add default lesson settings to integrated servers

  1. … 6 more files in changeset.
LDEV-4440 Migration of admin in progress

  1. … 57 more files in changeset.
LDEV-4440 Migration of admin in progress

    • -5
    • +5
    ./web/WEB-INF/tags/AuthoringButton.tag
    • -31
    • +30
    ./web/WEB-INF/tags/AuthoringRatingCriteria.tag
  1. … 13 more files in changeset.
LDEV-4440 Migration of admin in progress

  1. … 41 more files in changeset.
LDEV-4440 Migration / changes at jsp files

    • -100
    • +210
    ./web/import/importexcel.jsp
    • -61
    • +169
    ./web/lti/ltiConsumerList.jsp
    • -76
    • +199
    ./web/organisation/courseAdminEdit.jsp
    • -156
    • +341
    ./web/organisation/createOrEdit.jsp
    • -60
    • +131
    ./web/organisation/deleteAllLessons.jsp
    • -296
    • +546
    ./web/organisation/list.jsp
  1. … 8 more files in changeset.
LDEV-4440 Actions changed to controllers

  1. … 67 more files in changeset.
LDEV-4644 Add outcomes in authoring in all tools

    • -0
    • +155
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  1. … 116 more files in changeset.