lams-github / lams_common / src / java

org

Clone Tools

Stats

Commits this week: 0
Total Committers: 32
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
5:14 pm

Marcin Cieslak

LDEV-4644 Display and edit outcome results in monitor gradebook

Options
    • -0
    • +5
    ./lamsfoundation/lams/outcome/dao/IOutcomeDAO.java
    • -0
    • +28
    ./lamsfoundation/lams/outcome/dao/hibernate/OutcomeDAO.java
    • -0
    • +8
    ./lamsfoundation/lams/outcome/service/IOutcomeService.java
    • -0
    • +22
    ./lamsfoundation/lams/outcome/service/OutcomeService.java
  5. … 15 more files in changeset.
Saturday 18 Aug 2018
7:44 pm

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
    • -8
    • +32
    ./lamsfoundation/lams/commonContext.xml
    • -7
    • +13
    ./lamsfoundation/lams/gradebook/dao/IGradebookDAO.java
    • -54
    • +57
    ./lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
    • -0
    • +118
    ./lamsfoundation/lams/gradebook/model/GradebookUserActivityArchive.java
    • -0
    • +97
    ./lamsfoundation/lams/gradebook/model/GradebookUserLessonArchive.java
    • -1
    • +19
    ./lamsfoundation/lams/gradebook/service/IGradebookService.java
    • -0
    • +18
    ./lamsfoundation/lams/learning/service/ILearnerService.java
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -0
    • +5
    ./lamsfoundation/lams/tool/service/ILamsToolService.java
    • -21
    • +35
    ./lamsfoundation/lams/tool/service/LamsToolService.java
    • -1
    • +1
    ./lamsfoundation/lams/toolApplicationContext.xml
    • -1
    • +20
    ./lamsfoundation/lams/util/CommonConstants.java
    • -4
    • +0
    ./lamsfoundation/lams/web/util/AttributeNames.java
  14. … 91 more files in changeset.
Tuesday 14 Aug 2018
12:21 pm

Marcin Cieslak

LDEV-4644 Add OutcomeAutor tag for outcome mapping

Options
    • -0
    • +25
    ./lamsfoundation/lams/dbupdates/patch20180802.sql
    • -3
    • +6
    ./lamsfoundation/lams/outcome/Outcome.java
    • -0
    • +54
    ./lamsfoundation/lams/outcome/OutcomeMapping.java
    • -0
    • +65
    ./lamsfoundation/lams/outcome/OutcomeResult.java
    • -1
    • +4
    ./lamsfoundation/lams/outcome/OutcomeScale.java
    • -1
    • +5
    ./lamsfoundation/lams/outcome/OutcomeScaleItem.java
    • -0
    • +8
    ./lamsfoundation/lams/outcome/dao/IOutcomeDAO.java
    • -5
    • +56
    ./lamsfoundation/lams/outcome/dao/hibernate/OutcomeDAO.java
    • -2
    • +8
    ./lamsfoundation/lams/outcome/service/IOutcomeService.java
    • -2
    • +27
    ./lamsfoundation/lams/outcome/service/OutcomeService.java
  11. … 11 more files in changeset.
Saturday 11 Aug 2018
12:01 am

Andrey Balan

DEMO-1 Add getMessage() method that accepts custom locale

Options
    • -1
    • +20
    ./lamsfoundation/lams/util/MessageService.java
  2. … 1 more file in changeset.
Thursday 09 Aug 2018
10:16 pm

Andrey Balan

LDEV-4646 Change priority of preferred locale setting

The priority of choosing preferred locale will be the following:

1. user's setting from database (the highest priority)

2. client's browser locale

3. server default locale

Options
    • -1
    • +12
    ./lamsfoundation/lams/util/LanguageUtil.java
    • -6
    • +7
    ./lamsfoundation/lams/web/filter/LocaleFilter.java
10:23 am

Marcin Cieslak

LDEV-4644 Add scale management

Options
    • -4
    • +25
    ./lamsfoundation/lams/outcome/OutcomeScale.java
    • -0
    • +3
    ./lamsfoundation/lams/outcome/dao/IOutcomeDAO.java
    • -0
    • +13
    ./lamsfoundation/lams/outcome/dao/hibernate/OutcomeDAO.java
    • -0
    • +3
    ./lamsfoundation/lams/outcome/service/IOutcomeService.java
    • -0
    • +5
    ./lamsfoundation/lams/outcome/service/OutcomeService.java
  6. … 13 more files in changeset.
Wednesday 08 Aug 2018
11:16 am

Marcin Cieslak

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

Options
    • -1
    • +27
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +8
    ./lamsfoundation/lams/dbupdates/patch20180802.sql
    • -0
    • +9
    ./lamsfoundation/lams/outcome/Outcome.java
    • -0
    • +9
    ./lamsfoundation/lams/outcome/OutcomeScale.java
    • -0
    • +5
    ./lamsfoundation/lams/outcome/dao/IOutcomeDAO.java
    • -0
    • +29
    ./lamsfoundation/lams/outcome/dao/hibernate/OutcomeDAO.java
    • -0
    • +11
    ./lamsfoundation/lams/outcome/service/IOutcomeService.java
    • -0
    • +24
    ./lamsfoundation/lams/outcome/service/OutcomeService.java
  9. … 7 more files in changeset.
Tuesday 07 Aug 2018
2:20 pm

Marcin Cieslak

LDEV-4644 Add/edit learning outcome

Options
    • -0
    • +29
    ./lamsfoundation/lams/outcome/dao/IOutcomeDAO.java
    • -0
    • +31
    ./lamsfoundation/lams/outcome/dao/hibernate/OutcomeDAO.java
  3. … 12 more files in changeset.
Thursday 02 Aug 2018
4:56 pm

Marcin Cieslak

LDEV-4644 Add outcomes model

Options
    • -0
    • +49
    ./lamsfoundation/lams/dbupdates/patch20180802.sql
    • -0
    • +81
    ./lamsfoundation/lams/outcome/Outcome.java
    • -0
    • +84
    ./lamsfoundation/lams/outcome/OutcomeScale.java
    • -0
    • +41
    ./lamsfoundation/lams/outcome/OutcomeScaleItem.java
  5. … 4 more files in changeset.
Wednesday 01 Aug 2018
12:03 pm

Marcin Cieslak

LDEV-4440 Add missing no-arg constructors

They are required by LD import in authoring.

Options
    • -1
    • +5
    ./lamsfoundation/lams/learningdesign/dto/GroupDTO.java
    • -0
    • +4
    ./lamsfoundation/lams/learningdesign/dto/GroupingDTO.java
Monday 30 Jul 2018
4: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
    • -0
    • +15
    ./lamsfoundation/lams/dbupdates/patch20180731.sql
    • -27
    • +1
    ./lamsfoundation/lams/usermanagement/User.java
    • -1
    • +1
    ./lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java
    • -26
    • +3
    ./lamsfoundation/lams/usermanagement/dto/UserDTO.java
    • -6
    • +4
    ./lamsfoundation/lams/usermanagement/service/LdapService.java
    • -5
    • +0
    ./lamsfoundation/lams/web/util/AttributeNames.java
  7. … 14 more files in changeset.
9:22 am

Marcin Cieslak

LDEV-4641 Allow STARTTLS and SSL when sending emails with SMTP

Options
    • -0
    • +16
    ./lamsfoundation/lams/dbupdates/patch20180730.sql
    • -0
    • +4
    ./lamsfoundation/lams/util/ConfigurationKeys.java
    • -1
    • +9
    ./lamsfoundation/lams/util/Emailer.java
  4. … 3 more files in changeset.
Friday 20 Jul 2018
11:54 am

Marcin Cieslak

LDEV-4440 Tweak file validators to return correct messages

Options
    • -107
    • +2
    ./lamsfoundation/lams/util/FileValidatorSpringUtil.java
  2. … 3 more files in changeset.
Thursday 19 Jul 2018
11:28 pm

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
    • -12
    • +9
    ./lamsfoundation/lams/integration/service/IIntegrationService.java
    • -43
    • +24
    ./lamsfoundation/lams/integration/service/IntegrationService.java
    • -0
    • +7
    ./lamsfoundation/lams/usermanagement/SupportedLocale.java
    • -8
    • +57
    ./lamsfoundation/lams/util/LanguageUtil.java
  5. … 3 more files in changeset.
Wednesday 18 Jul 2018
4:29 pm

Marcin Cieslak

Merge branch 'LDEV-4609'

Options
    • -0
    • +24
    ./lamsfoundation/lams/dbupdates/patch20180629.sql
  2. … 3 more files in changeset.
3: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
    • +29
    ./lamsfoundation/lams/commonContext.xml
    • -13
    • +33
    ./lamsfoundation/lams/integration/service/IntegrationService.java
  3. … 25 more files in changeset.
8:33 am

Marcin Cieslak

LDEV-4617 Implement full email verification on sign up

Options
    • -1
    • +2
    ./lamsfoundation/lams/signup/service/ISignupService.java
    • -1
    • +15
    ./lamsfoundation/lams/signup/service/SignupService.java
    • -9
    • +15
    ./lamsfoundation/lams/usermanagement/User.java
  4. … 7 more files in changeset.
Tuesday 17 Jul 2018
3:41 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Necessary changes for validation

Options
    • -40
    • +46
    ./lamsfoundation/lams/util/FileValidatorSpringUtil.java
3:36 pm

Marcin Cieslak

LDEV-4617 Add an option to enable email verification on sign up

Options
    • -0
    • +15
    ./lamsfoundation/lams/dbupdates/patch20180717.sql
    • -0
    • +9
    ./lamsfoundation/lams/signup/model/SignupOrganisation.java
  3. … 8 more files in changeset.
1:59 pm

Marcin Cieslak

LDEV-4609 Sort attempts in reverse order

It was implemented from the start, but our Java -> jqGrid XML conversion

method sorts the rows in ascending order by default.

Options
    • -2
    • +2
    ./lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
  2. … 2 more files in changeset.
Monday 16 Jul 2018
5:23 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

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

Options
    • -5
    • +4
    ./lamsfoundation/lams/util/FileValidatorSpringUtil.java
  2. … 8 more files in changeset.
Friday 13 Jul 2018
4:26 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Added new way of sending error messages

Options
    • -631
    • +632
    ./lamsfoundation/lams/commonContext.xml
  2. … 10 more files in changeset.
Tuesday 10 Jul 2018
6:56 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Started migration of Noticeboard

Options
    • -0
    • +199
    ./lamsfoundation/lams/util/FileValidatorSpringUtil.java
  2. … 45 more files in changeset.
Monday 09 Jul 2018
7:13 pm

Andrey Balan

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

Options
    • -4
    • +11
    ./lamsfoundation/lams/integration/service/IntegrationService.java
    • -1
    • +2
    ./lamsfoundation/lams/integrationContext.xml
    • -0
    • +1
    ./lamsfoundation/lams/usermanagement/ldapContext.xml
    • -13
    • +20
    ./lamsfoundation/lams/usermanagement/service/LdapService.java
  5. … 3 more files in changeset.
6:16 pm

Andrey Balan

LDEV-4631 Prevent accidental storing of timezone as JVM one

Options
    • -2
    • +1
    ./lamsfoundation/lams/usermanagement/User.java
Sunday 08 Jul 2018
7:18 pm

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
    • -3
    • +3
    ./lamsfoundation/lams/integration/service/IIntegrationService.java
    • -6
    • +12
    ./lamsfoundation/lams/integration/service/IntegrationService.java
  3. … 5 more files in changeset.
11:27 am

Marcin Cieslak

LDEV-4625 Make server country configurable

Also use default country in integrations

Options
    • -0
    • +15
    ./lamsfoundation/lams/dbupdates/patch20180708.sql
    • -6
    • +3
    ./lamsfoundation/lams/integration/service/IntegrationService.java
    • -1
    • +1
    ./lamsfoundation/lams/signup/service/SignupService.java
    • -2
    • +2
    ./lamsfoundation/lams/util/LanguageUtil.java
  5. … 4 more files in changeset.
10:31 am

Marcin Cieslak

LDEV-4625 Use default country configured on server

Options
    • -1
    • +1
    ./lamsfoundation/lams/signup/service/SignupService.java
    • -0
    • +5
    ./lamsfoundation/lams/util/ConfigurationKeys.java
    • -16
    • +23
    ./lamsfoundation/lams/util/LanguageUtil.java
  4. … 1 more file in changeset.
Saturday 07 Jul 2018
9:58 pm

Andrey Balan

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

Options
    • -2
    • +8
    ./lamsfoundation/lams/util/LanguageUtil.java
    • -0
    • +22
    ./lamsfoundation/lams/util/MessageService.java
  3. … 3 more files in changeset.
5:51 pm

Marcin Cieslak

LDEV-4616 Remove locale from courses

Options
    • -0
    • +15
    ./lamsfoundation/lams/dbupdates/patch20180707.sql
    • -3
    • +2
    ./lamsfoundation/lams/integration/service/IntegrationService.java
    • -10
    • +0
    ./lamsfoundation/lams/usermanagement/Organisation.java
  4. … 10 more files in changeset.