lams-github / lams_central

src

Clone Tools

Stats

Commits this week: 0
Total Committers: 28
Last Commit:
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Sunday 19 Aug 2018
1:44 am

Andrey Balan

Merge branch 'master' into LDEV-4407

Conflicts:

lams_build/lib/lams/lams-gradebook.jar

lams_build/lib/lams/lams-learning.jar

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

lams_central/web/css/pedagogicalPlanner.css

lams_central/web/includes/javascript/openUrls.js

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

lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserLessonArchive.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java

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

lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml

lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java

lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java

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

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml

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

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml

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

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml

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

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

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/SubmitFilesPedagogicalPlannerAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

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

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml

Options
    • -13
    • +30
    ./java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -0
    • +7
    ./java/org/lamsfoundation/lams/util/CentralConstants.java
    • -3
    • +45
    ./java/org/lamsfoundation/lams/web/IndexAction.java
    • -0
    • +41
    ./java/org/lamsfoundation/lams/web/ProfileAction.java
  5. … 100 more files in changeset.
Friday 17 Aug 2018
10:06 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Grade book

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/web/HomeAction.java
  2. … 4 more files in changeset.
Tuesday 14 Aug 2018
6:21 pm

Marcin Cieslak

LDEV-4644 Add OutcomeAutor tag for outcome mapping

Options
    • -3
    • +147
    ./java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java
  2. … 20 more files in changeset.
Monday 13 Aug 2018
2:54 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4638 Option to turn on confidence levels for iRA tRA

Options
    • -2
    • +6
    ./java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java
    • -4
    • +12
    ./java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java
    • -0
    • +2
    ./java/org/lamsfoundation/lams/rest/RestTags.java
  4. … 6 more files in changeset.
Friday 10 Aug 2018
4:18 am

Andrey Balan

LDEV-4646 Introduce LoginServlet that will forward to login.jsp

It was added to be able to set locale for login.jsp. As

LocaleFilter doesn't get fired when login.jsp is requested.

Options
    • -0
    • +34
    ./java/org/lamsfoundation/lams/web/LoginServlet.java
  2. … 1 more file in changeset.
Thursday 09 Aug 2018
4:23 pm

Marcin Cieslak

LDEV-4644 Add scale management

Options
    • -35
    • +202
    ./java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java
    • -0
    • +93
    ./java/org/lamsfoundation/lams/web/outcome/OutcomeScaleForm.java
  3. … 16 more files in changeset.
Wednesday 08 Aug 2018
5:46 pm

Marcin Cieslak

LDEV-4644 Global outcomes management via sysadmin

Options
    • -12
    • +7
    ./java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java
  2. … 4 more files in changeset.
5:16 pm

Marcin Cieslak

LDEV-4644 Add content folder ID for CKEditor to outcomes and scales

Options
    • -17
    • +24
    ./java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java
    • -2
    • +11
    ./java/org/lamsfoundation/lams/web/outcome/OutcomeForm.java
  3. … 13 more files in changeset.
Tuesday 07 Aug 2018
8:20 pm

Marcin Cieslak

LDEV-4644 Add/edit learning outcome

Options
    • -2
    • +3
    ./java/org/lamsfoundation/lams/web/DisplayGroupAction.java
    • -0
    • +303
    ./java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java
    • -0
    • +84
    ./java/org/lamsfoundation/lams/web/outcome/OutcomeForm.java
  4. … 11 more files in changeset.
Monday 06 Aug 2018
2:42 pm

Marcin Cieslak

LDEV-4644 Add outcomes in More Options on index page

Options
    • -0
    • +5
    ./java/org/lamsfoundation/lams/web/DisplayGroupAction.java
  2. … 1 more file in changeset.
Monday 30 Jul 2018
10:40 pm

Marcin Cieslak

LDEV-4639 Use tour instead of tutorials video on first login

Tutorial videos have never been fully implemented. We get rid of them in

favour of tours.

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/web/IndexAction.java
    • -170
    • +0
    ./java/org/lamsfoundation/lams/web/TutorialAction.java
    • -20
    • +0
    ./java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
  4. … 17 more files in changeset.
Tuesday 24 Jul 2018
11:37 pm

Marcin Cieslak

LDEV-4636 Initial implementation of read-only LDs feature

Options
    • -0
    • +6
    ./java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -1
    • +3
    ./java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
  3. … 6 more files in changeset.
2:20 am

Marcin Cieslak

LDEV-4617 Do not put HTML tags into i18n labels

Options
    • -5
    • +20
    ./java/org/lamsfoundation/lams/web/action/SignupAction.java
  2. … 1 more file in changeset.
Monday 23 Jul 2018
4:06 pm

Marcin Cieslak

LDEV-4617 i18n of signup emails

Options
    • -17
    • +10
    ./java/org/lamsfoundation/lams/web/action/SignupAction.java
  2. … 1 more file in changeset.
Friday 20 Jul 2018
5:54 pm

Marcin Cieslak

LDEV-4440 Tweak file validators to return correct messages

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSpringGroupingForm.java
  2. … 3 more files in changeset.
5:25 pm

Marcin Cieslak

LDEV-4440 Rewrite validation in PedPlanner forms

Options
    • -1
    • +3
    ./java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivitySpringForm.java
    • -1
    • +2
    ./java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSpringGroupingForm.java
  3. … 7 more files in changeset.
5:28 am

Andrey Balan

LDEV-4627 Set country and locale for users created via integrations

New locale detecting algorithm:

1. Check whether we have exactly the same locale. If we do - select it.

2. Grab the first two letters of the provided locale (which we assume to

be the language code), and map it to one of our locales of the

respective language. If we have multiple ones - choose the first one

from the list indiscriminately.

3. If we don't have locale of such language - use the server default

one.

Options
    • -16
    • +5
    ./java/org/lamsfoundation/lams/web/LoginRequestServlet.java
    • -23
    • +14
    ./java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java
    • -54
    • +38
    ./java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
  4. … 4 more files in changeset.
5:25 am

Andrey Balan

LDEV-4627 Courses doesn't have specific locale any longer

Options
    • -4
    • +3
    ./java/org/lamsfoundation/lams/web/GradebookServlet.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/web/OrganisationGroupServlet.java
Wednesday 18 Jul 2018
9:02 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

lams_build/3rdParty.userlibraries

lams_build/build.xml

lams_build/conf/j2ee/jboss-deployment-structure.xml

lams_build/lib/lams/lams.jar

lams_build/liblist.txt

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java

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

Options
    • -0
    • +15
    ./java/org/lamsfoundation/lams/web/IndexAction.java
  2. … 26 more files in changeset.
2:33 pm

Marcin Cieslak

LDEV-4617 Implement full email verification on sign up

Options
    • -28
    • +95
    ./java/org/lamsfoundation/lams/web/action/SignupAction.java
  2. … 9 more files in changeset.
1:49 pm

Andrey Balan

LDEV-4627 Fix the issue of not passing "lang" parameter

There was an exception thrown on accessing LoginRequest with

missing lang parameter (i.e. URL doesn't contain lang parameter at all)

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/web/LoginRequestServlet.java
Tuesday 17 Jul 2018
9:38 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Added new spring version of grouping form

Options
    • -7
    • +4
    ./java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • -8
    • +11
    ./java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivityForm.java
    • -6
    • +4
    ./java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java
    • -0
    • +148
    ./java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSpringGroupingForm.java
  5. … 1 more file in changeset.
7:25 pm

Michal Kowalski <mickowal@hotmail.com>

LDEV-4440 notebook nostruts library

Options
    • -3
    • +3
    ./java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivitySpringForm.java
  2. … 19 more files in changeset.
Monday 16 Jul 2018
11:23 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Necessary changes for migration to Spring - changes in method of validation

Options
    • -4
    • +7
    ./java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • -12
    • +8
    ./java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivityForm.java
    • -3
    • +3
    ./java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivitySpringForm.java
    • -4
    • +6
    ./java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java
  5. … 5 more files in changeset.
Tuesday 10 Jul 2018
1:13 am

Andrey Balan

LDEV-4631 Set server timezone for users created via integrations/spreadsheet and signup pages

Options
    • -3
    • +5
    ./java/org/lamsfoundation/lams/web/action/SignupAction.java
  2. … 6 more files in changeset.
Monday 09 Jul 2018
1:18 am

Marcin Cieslak

LDEV-4627 Accept country in integrations servlet

If a received langIsoCode is just 2 letters, then countryIsoCode stays

the same and country will fall back to default. If langIsoCode is en_AU,

then it gets split to langIsoCode and countryIsoCode and the old value

of countryIsoCode is considered country.

Options
    • -4
    • +4
    ./java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
    • -2
    • +14
    ./java/org/lamsfoundation/lams/web/LoginRequestServlet.java
    • -15
    • +27
    ./java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java
    • -25
    • +44
    ./java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
  5. … 3 more files in changeset.
Sunday 08 Jul 2018
3:58 am

Andrey Balan

LDEV-4624 Signup page to use system language for country list

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/web/ProfileAction.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/web/action/SignupAction.java
  3. … 3 more files in changeset.
Thursday 05 Jul 2018
8:02 pm

Andrey Balan

LDEV-4614 Sort country list by name rather than code

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/web/ProfileAction.java
    • -1
    • +2
    ./java/org/lamsfoundation/lams/web/action/SignupAction.java
  3. … 5 more files in changeset.
Saturday 30 Jun 2018
5:35 am

Andrey Balan

LDEV-4605 Codify country for users

Change the country field to ISO_3166-1 alpha-2 codes (two letters).

So in when editing the profile, a user should be able to set his/her

country based on the list of countries in the ISO list.

Country should be a compulsory when editing profile, editing user

as group manager and in signup pages.

For integrations, if the country is not passed, then we should default

to a default country server.

Options
    • -0
    • +3
    ./java/org/lamsfoundation/lams/web/ProfileAction.java
    • -0
    • +6
    ./java/org/lamsfoundation/lams/web/ProfileSaveAction.java
    • -15
    • +25
    ./java/org/lamsfoundation/lams/web/action/SignupAction.java
  4. … 10 more files in changeset.
5:31 am

Andrey Balan

LDEV-4605 Introduce CommonConstants.java

For starters it will contain user portrait dimensions and the list of

country codes.

Options
    • -3
    • +4
    ./java/org/lamsfoundation/lams/web/PortraitSaveAction.java
  2. … 3 more files in changeset.