lams-github

lams_common

Clone Tools

Stats

Commits this week: 0
Total Committers: 37
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
Thursday 15 Nov 2018
1:16 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4697 Audit entries filtering by user and remarks

Options
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/logevent/dao/ILogEventDAO.java
    • -32
    • +122
    ./src/java/org/lamsfoundation/lams/logevent/dao/hibernate/LogEventDAO.java
    • -3
    • +9
    ./src/java/org/lamsfoundation/lams/logevent/service/ILogEventService.java
    • -6
    • +8
    ./src/java/org/lamsfoundation/lams/logevent/service/LogEventService.java
  5. … 3 more files in changeset.
Tuesday 13 Nov 2018
12:11 am

Marcin Cieslak

LDEV-4649 Get rid of obsolete field

Options
    • -22
    • +14
    ./src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java
  2. … 1 more file in changeset.
Friday 09 Nov 2018
6:37 pm

Marcin Cieslak

LDEV-4696 Remove hbm.xml file remains

Options
    • -1
    • +0
    ./.classpath
    • -76
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml
    • -6
    • +0
    ./src/java/org/lamsfoundation/lams/commonContext.xml
2:16 pm

Marcin Cieslak

LDEV-4696 Use container provided Hibernate libraries instead of own copy

Options
    • -0
    • +1
    ./.classpath
  2. … 33 more files in changeset.
Thursday 08 Nov 2018
6:47 pm

Marcin Cieslak

LDEV-4649 Make import work with files with header or with pure data

Options
    • -90
    • +104
    ./src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java
6:23 pm

Marcin Cieslak

LDEV-4649 Fix outcome and scale import

Fixed paths for import and outcome/scale removal.

Description is now an optional field when importing.

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java
  2. … 4 more files in changeset.
Wednesday 07 Nov 2018
8:04 pm

Andrey Balan

LDEV-4696 Add generics to common methods

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/ToolContentManager.java
    • -2
    • +1
    ./src/java/org/lamsfoundation/lams/tool/ToolSessionManager.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
12:52 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4696 Fixing bugs with new single activity lesson, notifications

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/events/Subscription.java
    • -4
    • +10
    ./src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java
Tuesday 06 Nov 2018
7:47 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'LDEV-4696' of https://github.com/lamsfoundation/lams into LDEV-4696

Options
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/commonContext.xml
6:50 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4696 Comments, Ratings, Peer Review use Annotations, removed proxy

Options
    • -167
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/comments/Comment.hbm.xml
    • -51
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/comments/CommentLike.hbm.xml
    • -58
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/comments/CommentSession.hbm.xml
    • -77
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/rating/Rating.hbm.xml
    • -85
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/rating/RatingComment.hbm.xml
    • -92
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/rating/RatingCriteria.hbm.xml
    • -0
    • +50
    ./src/java/org/lamsfoundation/lams/comments/Comment.java
    • -0
    • +21
    ./src/java/org/lamsfoundation/lams/comments/CommentLike.java
    • -0
    • +20
    ./src/java/org/lamsfoundation/lams/comments/CommentSession.java
    • -30
    • +30
    ./src/java/org/lamsfoundation/lams/comments/dao/hibernate/CommentDAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/comments/dao/hibernate/CommentLikeDAO.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/commonContext.xml
    • -9
    • +9
    ./src/java/org/lamsfoundation/lams/events/dao/hibernate/EventDAOHibernate.java
    • -8
    • +8
    ./src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java
    • -5
    • +6
    ./src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCommentDAO.java
  16. … 20 more files in changeset.
4:03 pm

Marcin Cieslak

LDEV-4696 Rewrite part of Common entities to Hibernate annotations

Options
    • -63
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/events/EmailNotificationArchive.hbm.xml
    • -115
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/events/Event.hbm.xml
    • -74
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/events/Subscription.hbm.xml
    • -86
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtCourseClassMap.hbm.xml
    • -67
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerLessonMap.hbm.xml
    • -223
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml
    • -63
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.hbm.xml
    • -82
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml
    • -46
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/outcome/Outcome.hbm.xml
    • -25
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/outcome/OutcomeMapping.hbm.xml
    • -39
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/outcome/OutcomeResult.hbm.xml
    • -48
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/outcome/OutcomeScale.hbm.xml
    • -24
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/outcome/OutcomeScaleItem.hbm.xml
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/commonContext.xml
    • -1
    • +30
    ./src/java/org/lamsfoundation/lams/events/EmailNotificationArchive.java
  16. … 12 more files in changeset.
Monday 05 Nov 2018
3:57 pm

Marcin Cieslak

LDEV-4696 Rewrite part of Common entities to Hibernate annotations

Options
    • -44
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/ActivityEvaluation.hbm.xml
    • -0
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml
    • -70
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Competence.hbm.xml
    • -63
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/CompetenceMapping.hbm.xml
    • -20
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/GroupUser.hbm.xml
    • -20
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesignAccess.hbm.xml
    • -32
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesignAnnotation.hbm.xml
    • -80
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningLibrary.hbm.xml
    • -66
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningLibraryGroup.hbm.xml
    • -21
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/License.hbm.xml
    • -206
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/SystemTool.hbm.xml
    • -78
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolContent.hbm.xml
    • -105
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/AuthenticationMethod.hbm.xml
    • -88
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.hbm.xml
    • -70
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/FavoriteOrganisation.hbm.xml
  16. … 40 more files in changeset.
Sunday 04 Nov 2018
5:48 pm

Marcin Cieslak

LDEV-4696 Remove obsolete DTO

Options
    • -188
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/BasicToolVO.hbm.xml
    • -479
    • +0
    ./src/java/org/lamsfoundation/lams/tool/BasicToolVO.java
    • -81
    • +0
    ./src/java/org/lamsfoundation/lams/tool/IToolVO.java
    • -8
    • +0
    ./src/java/org/lamsfoundation/lams/tool/Tool.java
    • -17
    • +20
    ./src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java
    • -20
    • +12
    ./src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/web/controller/LamsAuthoringFinishController.java
  8. … 8 more files in changeset.
5:41 pm

Marcin Cieslak

LDEV-4696 Rewrite part of Common entities to Hibernate annotations

Options
    • -84
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/config/ConfigurationItem.hbm.xml
    • -97
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserActivity.hbm.xml
    • -80
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserLesson.hbm.xml
    • -22
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/lesson/CompletedActivityProgress.hbm.xml
    • -22
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/lesson/CompletedActivityProgressArchive.hbm.xml
    • -85
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml
    • -68
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgressArchive.hbm.xml
    • -84
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/planner/PedagogicalPlannerActivityMetadata.hbm.xml
    • -84
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/themes/Theme.hbm.xml
    • -382
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml
    • -401
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/commonContext.xml
    • -43
    • +17
    ./src/java/org/lamsfoundation/lams/config/ConfigurationItem.java
    • -28
    • +30
    ./src/java/org/lamsfoundation/lams/gradebook/GradebookUserActivity.java
    • -20
    • +26
    ./src/java/org/lamsfoundation/lams/gradebook/GradebookUserLesson.java
  16. … 11 more files in changeset.
Friday 02 Nov 2018
10:32 pm

Marcin Cieslak

LDEV-4696 Rewrite part of Common entities to Hibernate annotations

Options
    • -389
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -51
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.hbm.xml
    • -86
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/DataFlowObject.hbm.xml
    • -141
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml
    • -120
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml
    • -273
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml
    • -136
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Transition.hbm.xml
    • -270
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml
    • -76
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolSession.hbm.xml
    • -117
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml
    • -59
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/workspace/WorkspaceFolderContent.hbm.xml
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/commonContext.xml
    • -41
    • +80
    ./src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -9
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/ActivityOrderComparator.java
    • -12
    • +5
    ./src/java/org/lamsfoundation/lams/learningdesign/ActivityTitleComparator.java
  16. … 45 more files in changeset.
Thursday 01 Nov 2018
3:24 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV4696 Removing legacy parameters and deprecated methods

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/commonContext.xml
  2. … 29 more files in changeset.
Monday 29 Oct 2018
9:51 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4696 Content Repository converted to annotations

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/commonContext.xml
  2. … 13 more files in changeset.
2:13 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4696 TZ, Notebook entry, Log Event, Signup, Policies converted

Options
    • -107
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/logevent/LogEvent.hbm.xml
    • -53
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/logevent/LogEventType.hbm.xml
    • -106
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/notebook/model/NotebookEntry.hbm.xml
    • -68
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/policies/Policy.hbm.xml
    • -34
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/policies/PolicyConsent.hbm.xml
    • -149
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/signup/model/SignupOrganisation.hbm.xml
    • -56
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/timezone/Timezone.hbm.xml
    • -1
    • +4
    ./src/java/org/lamsfoundation/lams/commonContext.xml
    • -29
    • +23
    ./src/java/org/lamsfoundation/lams/logevent/LogEvent.java
    • -0
    • +16
    ./src/java/org/lamsfoundation/lams/logevent/LogEventType.java
    • -0
    • +25
    ./src/java/org/lamsfoundation/lams/notebook/model/NotebookEntry.java
    • -8
    • +34
    ./src/java/org/lamsfoundation/lams/policies/Policy.java
    • -5
    • +19
    ./src/java/org/lamsfoundation/lams/policies/PolicyConsent.java
    • -1
    • +39
    ./src/java/org/lamsfoundation/lams/signup/model/SignupOrganisation.java
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/timezone/Timezone.java
Friday 26 Oct 2018
1:55 pm

Marcin Cieslak

LDEV-4696 Rewrite Condition inheritance to Hibernate annotations

Options
    • -1
    • +6
    ./src/java/org/lamsfoundation/lams/commonContext.xml
    • -5
    • +35
    ./src/java/org/lamsfoundation/lams/learningdesign/BranchCondition.java
    • -2
    • +16
    ./src/java/org/lamsfoundation/lams/learningdesign/TextSearchCondition.java
  4. … 2 more files in changeset.
Thursday 25 Oct 2018
10:52 pm

Marcin Cieslak

LDEV-4696 Link persistence API source to in classpaths

Options
    • -1
    • +1
    ./.classpath
  2. … 23 more files in changeset.
6:38 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4696 Correct scan path for tool Hibernate objects

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/commonContext.xml
3:41 pm

Marcin Cieslak

LDEV-4696 Set proper JNDI name for transaction manager

Also get rid of deprecated manager_lookup_class property.

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/applicationContext.xml
3:32 am

Marcin Cieslak

LDEV-4696 Rewrite Criteria queries to use new API

Options
    • -20
    • +12
    ./src/java/org/lamsfoundation/lams/dao/IBaseDAO.java
    • -77
    • +35
    ./src/java/org/lamsfoundation/lams/dao/hibernate/LAMSBaseDAO.java
3:31 am

Marcin Cieslak

LDEV-4696 Change transaction configuration for Hibernate 5.3

hibernate.transaction.factory_class is deprecated. We need to use

hibernate.transaction.coordinator_class

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/applicationContext.xml
Wednesday 24 Oct 2018
3:02 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4696 Runs Hibernate 5.3 with errors, Noticeboard hbm xml gone.

Options
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/commonContext.xml
    • -11
    • +30
    ./src/java/org/lamsfoundation/lams/dao/hibernate/LAMSBaseDAO.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/events/dao/hibernate/EventDAOHibernate.java
    • -9
    • +9
    ./src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceDAO.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceMappingDAO.java
    • -9
    • +9
    ./src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/TransitionDAO.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/security/SecurityDAO.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/util/FileUtil.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/util/hibernate/TransactionAwareSessionContext.java
    • -6
    • +3
    ./src/java/org/lamsfoundation/lams/workspace/dao/hibernate/WorkspaceFolderContentDAO.java
  12. … 3448 more files in changeset.
3:50 am

Andrey Balan

LDEV-4440 Fix author and monitor links requested from integrations

Options
    • -12
    • +16
    ./src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java
Friday 19 Oct 2018
7:48 pm

Marcin Cieslak

LDEV-4694 Remove obsolete embedded MySQL configuration

Options
    • -1
    • +1
    ./build.xml
  2. … 5 more files in changeset.
5:38 pm

Marcin Cieslak

Merge branch 'lams31' into LDEV-4440

Conflicts:

lams_admin/web/sessionmaintain.jsp

lams_build/build.xml

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java

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

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

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

Options
    • -0
    • +2
    ./build.xml
    • -3
    • +14
    ./src/java/org/lamsfoundation/lams/web/session/SessionManager.java
  3. … 16 more files in changeset.
4:20 pm

Marcin Cieslak

LDEV-4693 Add name in logged in user list in sysadmin

Options
    • -3
    • +14
    ./src/java/org/lamsfoundation/lams/web/session/SessionManager.java
  2. … 2 more files in changeset.
3:30 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_build/build_base.xml

# lams_build/lib/lams/lams.jar

# lams_central/web/WEB-INF/struts-config.xml

# lams_common/build.xml

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

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

Options
    • -1
    • +3
    ./build.xml
  2. … 10 more files in changeset.