lams

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 33
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 4,779,243
Net change in LoC this week: 0

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
Wednesday 29 Oct 2014
8:44 pm

Marcin Cieslak

LDEV-3315: Temporarily skip security check if organisation is NULL (lesson preview).

Options
    • -6
    • +11
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
8:03 pm

Marcin Cieslak

LDEV-3315, LDEV-3367: Refactor SecurityService methods. Replace Monitoring and Gradebook own security code with SecurityService checks.

Options
    • -9
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -8
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
    • -7
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
    • -1
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -2
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/security/ISecurityDAO.java
    • -11
    • +16
    /lams_common/src/java/org/lamsfoundation/lams/security/ISecurityService.java
    • -15
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/security/SecurityDAO.java
    • -43
    • +271
    /lams_common/src/java/org/lamsfoundation/lams/security/SecurityService.java
    • -18
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java
    • -18
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
    • -166
    • +177
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
    • -76
    • +43
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookLearningAction.java
    • -291
    • +279
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java
    • -24
    • +23
    /lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
    • -80
    • +1
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
  16. … 3 more files in changeset.
7:58 pm

Marcin Cieslak

LDEV-3315, LDEV-3367: Refactor SecurityService methods. Replace Monitoring and Gradebook own security code with SecurityService checks.

Options
    • binary
    /lams_build/lib/lams/lams-monitoring.jar
    • binary
    /lams_build/lib/lams/lams.jar
    • -9
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -8
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
    • -7
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
    • -1
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -2
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/security/ISecurityDAO.java
    • -11
    • +16
    /lams_common/src/java/org/lamsfoundation/lams/security/ISecurityService.java
    • -15
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/security/SecurityDAO.java
    • -43
    • +271
    /lams_common/src/java/org/lamsfoundation/lams/security/SecurityService.java
    • -18
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java
    • -18
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
    • -166
    • +177
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
    • -76
    • +43
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookLearningAction.java
    • -291
    • +279
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java
  16. … 5 more files in changeset.
7:23 am

Andrey Balan

file patch20141023.sql was added on branch lams2_head_wildfly on 2014-10-29 19:58:21 +0000

Options
    • -0
    • +0
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/patch20141023.sql
7:23 am

Andrey Balan

LDEV-3326

1) after the view all responses is pressed, even on refresh you shouldn't be able to re-edit your take.

2) Unlike Q&A, your answer must be included in the stats.

3) In the paging component that shows free text, the text displayed there ignores CRs.

4) make the paging component page wide instead and just get rid of the "Open response" label

5) put the number of answers that we are displaying

Options
    • -1
    • +2
    /lams_tool_survey/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    /lams_tool_survey/conf/xdoclet/struts-actions.xml
    • -2
    • +4
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java
    • -0
    • +1
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml
    • -4
    • +4
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyAnswerDAO.java
    • -4
    • +6
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyUserDAO.java
    • -14
    • +11
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAnswerDAOHibernate.java
    • -24
    • +36
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyUserDAOHibernate.java
    • -0
    • +1
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/patch20141023.sql
    • -2
    • +20
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyUser.java
    • -18
    • +23
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java
    • -47
    • +56
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
    • -4
    • +2
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/ChartAction.java
    • -29
    • +33
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java
    • -3
    • +2
    /lams_tool_survey/web/pages/learning/learning.jsp
  16. … 3 more files in changeset.
5:38 am

marek

LDEV-3333: remove org.jboss.as.jdr and org.jboss.as.pojo from LAMS standalone.xml

Options
    • -4
    • +0
    /lams_build/conf/standalone.xml
4:44 am

marek

LDEV-3333: remove org.jboss.as.jaxrs, org.jboss.as.sar and org.wildfly.extension.batch extensions from jboss standalone.xml

Options
    • -16
    • +3
    /lams_build/conf/standalone.xml
12:44 am

Ernie Ghiglione

LDEV-3372: Improve warning message for LiveEdit

Options
    • -2
    • +2
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
12:44 am

Ernie Ghiglione

LDEV-3372: Improve warning message for LiveEdit

Options
    • -2
    • +2
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
12:26 am

Ernie Ghiglione

LDEV-3372: Improve warning message for LiveEdit

Options
    • -5
    • +8
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -3
    • +8
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +8
    /lams_monitoring/conf/language/lams/ApplicationResources_es_ES.properties
12:25 am

Ernie Ghiglione

LDEV-3372: Improve warning message for LiveEdit

Options
    • -2
    • +2
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +2
    /lams_monitoring/conf/language/lams/ApplicationResources_es_ES.properties
Tuesday 28 Oct 2014
8:58 pm

Ernie Ghiglione

LDEV-3328: adding branching within branching test. Validates LDEV-3362

Options
    • -0
    • +60
    /lams_tests/tests/org/lamsfoundation/lams/author/BranchingTests.java
    • -1
    • +19
    /lams_tests/tests/org/lamsfoundation/lams/pages/author/FLAPage.java
6:47 am

Andrey Balan

file advanceoptions.jsp was added on branch lams2_head_wildfly on 2014-10-29 19:58:21 +0000

Options
    • -0
    • +0
    /lams_tool_survey/web/pages/monitoring/advanceoptions.jsp
6:47 am

Andrey Balan

LDEV-3326 added advanced option to include other users results after survey responses are sent

Options
    • -1
    • +5
    /lams_tool_survey/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +17
    /lams_tool_survey/conf/xdoclet/struts-actions.xml
    • -1
    • +9
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java
    • -10
    • +18
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyAnswerDAO.java
    • -17
    • +66
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAnswerDAOHibernate.java
    • -0
    • +14
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/patch20141023.sql
    • -72
    • +80
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dto/AnswerDTO.java
    • -6
    • +14
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.java
    • -92
    • +100
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.java
    • -4
    • +2
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyOption.java
    • -183
    • +191
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java
    • -4
    • +1
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveySession.java
    • -177
    • +182
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyUser.java
    • -3
    • +16
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java
    • -23
    • +41
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
  16. … 20 more files in changeset.
6:15 am

marek

LDEV-3333: remove 'org.jboss.as.mail' module from standalone.xml

Options
    • -6
    • +0
    /lams_build/conf/standalone.xml
5:46 am

marek

LDEV-3320: Switch TransactionManager used by LAMS to JTA. Update hibernate.properties to use JTA platform as transactions provier. Update hibernate.properties to use TransactionAwareSessionContext .

In order for Infinispan and Hibernate to correctly cooperate within transactions - it is recommended to use TransactionManager that supports JTATransactions (LAMS was using JDBCTransaction type). http://infinispan.org/docs/6.0.x/user_guide/user_guide.html#_jta_transactions_configuration

Options
    • -12
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml
5:35 am

marek

LDEV-3364: add javax.transactions dependency from WildFly for TransactionAwareSessionContext

Options
    • -0
    • +1
    /lams_common/.classpath
5:29 am

marek

LDEV-3364: add TransactionAwareSessionContext implementation to fix 'No Session Found for current thread' issue.

This is not yet bound to hibernate.properties

Options
    • -0
    • +162
    /lams_common/src/java/org/lamsfoundation/lams/util/hibernate/TransactionAwareSessionContext.java
5:29 am

marek

file TransactionAwareSessionContext.java was initially added on branch lams2_head_wildfly.

Options
    • -0
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/util/hibernate/TransactionAwareSessionContext.java
5:27 am

marek

LDEV-3333: Remove ejb module from LAMS deployment configuration

Options
    • -48
    • +0
    /lams_build/conf/standalone.xml
3:57 am

Ernie Ghiglione

LDEV-3370: Change iframe to img tag when prompting the integration to retrieve mark

Options
    • -1
    • +1
    /lams_learning/web/lessonComplete.jsp
    • -1
    • +1
    /lams_learning/web/mobile/lessonComplete.jsp
3:56 am

Ernie Ghiglione

LDEV-3370: Change iframe to img tag when prompting the integration to retrieve mark

Options
    • -1
    • +1
    /lams_learning/web/lessonComplete.jsp
    • -1
    • +1
    /lams_learning/web/mobile/lessonComplete.jsp
Monday 27 Oct 2014
6:38 am

Ernie Ghiglione

LDEV-3368: Adding wizard tests and tab components

Options
    • -11
    • +122
    /lams_tests/tests/org/lamsfoundation/lams/monitor/AddLessonTests.java
    • -1
    • +9
    /lams_tests/tests/org/lamsfoundation/lams/pages/monitor/addlesson/AddLessonPage.java
    • -0
    • +260
    /lams_tests/tests/org/lamsfoundation/lams/pages/monitor/addlesson/AdvancedTab.java
    • -0
    • +31
    /lams_tests/tests/org/lamsfoundation/lams/pages/monitor/addlesson/ClassTab.java
Sunday 26 Oct 2014
1:16 am

Marcin Cieslak

LDEV-3362: Support nested branching.

Options
    • -13
    • +31
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
1:16 am

Marcin Cieslak

LDEV-3021: Support empty branches.

Options
    • -75
    • +80
    /lams_central/web/includes/javascript/progressBar.js
1:14 am

Marcin Cieslak

LDEV-3362: Support nested branching.

Options
    • -13
    • +31
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
1:13 am

Marcin Cieslak

LDEV-3021: Support empty branches.

Options
    • -74
    • +79
    /lams_central/web/includes/javascript/progressBar.js
Saturday 25 Oct 2014
7:28 pm

Ernie Ghiglione

LDEV-3369: remove base url from the tiles template

Options
    • -1
    • +0
    /lams_admin/web/template.jsp
7:25 pm

Ernie Ghiglione

LDEV-3369: remove base url from the tiles template

Options
    • -1
    • +0
    /lams_admin/web/template.jsp
Friday 24 Oct 2014
10:04 pm

Ernie Ghiglione

LDEV-3368: Adding add lesson wizard tests (so far)

Options
    • -0
    • +325
    /lams_tests/tests/org/lamsfoundation/lams/monitor/AddLessonTests.java
    • -1
    • +24
    /lams_tests/tests/org/lamsfoundation/lams/pages/IndexPage.java
    • -0
    • +103
    /lams_tests/tests/org/lamsfoundation/lams/pages/monitor/addlesson/AddLessonPage.java
    • -0
    • +111
    /lams_tests/tests/org/lamsfoundation/lams/pages/monitor/addlesson/ClassTab.java
    • -0
    • +237
    /lams_tests/tests/org/lamsfoundation/lams/pages/monitor/addlesson/LessonTab.java