lams-github

Clone Tools

Stats

Commits this week: 0
Total Committers: 50
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
Tuesday 21 Oct 2014
6:27 pm

Marcin Cieslak

LDEV-3315: Add security service and use it in vital entry points.

Options
    • -1
    • +22
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -7
    • +29
    /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
    • -11
    • +32
    /lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
    • -0
    • +21
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +39
    /lams_common/src/java/org/lamsfoundation/lams/security/ISecurityDAO.java
    • -0
    • +59
    /lams_common/src/java/org/lamsfoundation/lams/security/ISecurityService.java
    • -0
    • +123
    /lams_common/src/java/org/lamsfoundation/lams/security/SecurityDAO.java
    • -0
    • +37
    /lams_common/src/java/org/lamsfoundation/lams/security/SecurityException.java
    • -0
    • +138
    /lams_common/src/java/org/lamsfoundation/lams/security/SecurityService.java
    • -47
    • +58
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
    • -0
    • +6
    /lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioServiceProxy.java
    • -28
    • +29
    /lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
    • -0
    • +1
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
    • -3
    • +10
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -7
    • +33
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
12:33 pm

erniegx <ernieg@gmail.com>

LDEV-3328: Adding import designs from zip files

Options
    • -0
    • +151
    /lams_tests/tests/org/lamsfoundation/lams/author/ImportDesignTests.java
    • -2
    • +12
    /lams_tests/tests/org/lamsfoundation/lams/pages/author/FLAPage.java
    • -0
    • +136
    /lams_tests/tests/org/lamsfoundation/lams/pages/author/ImportDesignPage.java
3:15 am

erniegx <ernieg@gmail.com>

LDEV-3328: Adding conditional gates LDEV3350: confirms that the gates are saving properly now too!

Point for functional test! ;-)

Options
    • -6
    • +58
    /lams_tests/tests/org/lamsfoundation/lams/author/GatesTests.java
    • -4
    • +59
    /lams_tests/tests/org/lamsfoundation/lams/pages/author/GatePropertyPage.java
1:31 am

erniegx <ernieg@gmail.com>

LDEV-3328: Adding tool based branching

Options
    • -1
    • +177
    /lams_tests/tests/org/lamsfoundation/lams/author/BranchingTests.java
    • -9
    • +84
    /lams_tests/tests/org/lamsfoundation/lams/pages/author/BranchingPropertiesPage.java
    • -0
    • +452
    /lams_tests/tests/org/lamsfoundation/lams/pages/author/ConditionsPropertiesPage.java
Monday 20 Oct 2014
6:07 pm

Marcin Cieslak

LDEV-3115: Do not escape HTML tags in info dialog showing LD validation error.

Options
    • -1
    • +1
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
6:01 pm

Marcin Cieslak

LDEV-3349: Fix processing bug so the LD can get to validator.

Options
    • -4
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
5:50 pm

Marcin Cieslak

LDEV-3350: Fix missing label and conditions processing for condition gate.

Options
    • -26
    • +24
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
5:27 pm

Marcin Cieslak

LDEV-3315: Add utility methods for security. Use the new SecurityService in several places.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -1
    • +22
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/security/ISecurityDAO.java
    • -7
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/security/ISecurityService.java
    • -3
    • +23
    /lams_common/src/java/org/lamsfoundation/lams/security/SecurityDAO.java
    • -2
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/security/SecurityService.java
    • -1
    • +2
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
    • -3
    • +10
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -3
    • +11
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
5:25 pm

Marcin Cieslak

LDEV-3353: Hide the button.

Options
    • -14
    • +16
    /lams_tool_notebook/web/pages/learning/notebook.jsp
Sunday 19 Oct 2014
10:53 pm

erniegx <ernieg@gmail.com>

LDEV-3328: Adding all activities as constants

Options
    • -1
    • +39
    /lams_tests/tests/org/lamsfoundation/lams/author/util/AuthorConstants.java
10:52 pm

erniegx <ernieg@gmail.com>

LDEV-3328: Adding instructor and learner choice branching

Options
    • -10
    • +335
    /lams_tests/tests/org/lamsfoundation/lams/author/BranchingTests.java
    • -0
    • +65
    /lams_tests/tests/org/lamsfoundation/lams/pages/author/BranchingPropertiesPage.java
10:51 pm

erniegx <ernieg@gmail.com>

LDEV-3328: general refactoring and including drawBranchingFromActivity

Options
    • -20
    • +75
    /lams_tests/tests/org/lamsfoundation/lams/pages/author/FLAPage.java
4:35 pm

marek

LDEV-3332: revert spring-beans schema declaration in application context xml files. export spring meta-inf in jboss-deployment-structure.xml

It is way more elegant approach to fix an issue with spring-beans.xsd loading from internet.

Options
    • -1
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml
    • -1
    • +1
    /lams_build/conf/j2ee/jboss-deployment-structure.xml
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/webApplicationContext.xml
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
    • -1
    • +1
    /lams_central/web/WEB-INF/applicationContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/messageContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml
    • -1
    • +1
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml
  16. … 63 more files in changeset.
2:29 pm

erniegx <ernieg@gmail.com>

LDEV-3322: changing branching label to work better with functional testing

Options
    • -2
    • +2
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
2:28 pm

erniegx <ernieg@gmail.com>

LDEV-3322: changing branching label to work better with functional testing

Options
    • -2
    • +2
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
2:26 pm

erniegx <ernieg@gmail.com>

LDEV-3328: Including delete activity and branching

Options
    • -7
    • +51
    /lams_tests/tests/org/lamsfoundation/lams/pages/author/FLAPage.java
2:25 pm

erniegx <ernieg@gmail.com>

LDEV-3328: Including delete activity in canvas

Options
    • -2
    • +5
    /lams_tests/tests/org/lamsfoundation/lams/author/AuthorTests.java
2:22 pm

erniegx <ernieg@gmail.com>

LDEV-3328: Branching tests

- Set group based branching

- Set learner's choice branching

- Set instructor's choice branching

- Set learner's output branching

Options
    • -0
    • +340
    /lams_tests/tests/org/lamsfoundation/lams/author/BranchingTests.java
    • -0
    • +201
    /lams_tests/tests/org/lamsfoundation/lams/pages/author/BranchingPropertiesPage.java
5:17 am

marek

LDEV-3332: fix tiles-config.dtd version used.

LAMS is shipped with tiles 1.1 version (included in struts). Fix tiles configuration to use tiles-config-1_1.dtd. This was another resource, that was loaded from internet during Wildfly startup (since used dtd version was not present in struts.jar).

It should be now possible to start Wildfly with LAMS without internet connection.

Options
    • -2
    • +2
    /lams_admin/web/WEB-INF/tiles-defs.xml
    • -2
    • +2
    /lams_central/web/WEB-INF/tiles-defs.xml
    • -2
    • +2
    /lams_gradebook/web/WEB-INF/tiles-defs.xml
    • -2
    • +2
    /lams_learning/web/WEB-INF/tiles-defs.xml
    • -2
    • +2
    /lams_monitoring/web/WEB-INF/tiles-defs.xml
    • -2
    • +2
    /lams_tool_bbb/web/WEB-INF/tiles-defs.xml
    • -2
    • +2
    /lams_tool_chat/web/WEB-INF/tiles-defs.xml
    • -2
    • +2
    /lams_tool_forum/web/WEB-INF/tiles-defs.xml
    • -2
    • +2
    /lams_tool_gmap/web/WEB-INF/tiles-defs.xml
    • -2
    • +2
    /lams_tool_kaltura/web/WEB-INF/tiles-defs.xml
    • -2
    • +2
    /lams_tool_leader/web/WEB-INF/tiles-defs.xml
    • -2
    • +2
    /lams_tool_mindmap/web/WEB-INF/tiles-defs.xml
    • -2
    • +2
    /lams_tool_nb/web/WEB-INF/tiles-defs.xml
    • -2
    • +2
    /lams_tool_notebook/web/WEB-INF/tiles-defs.xml
    • -2
    • +2
    /lams_tool_pixlr/web/WEB-INF/tiles-defs.xml
  16. … 4 more files in changeset.
4:29 am

marek

LDEV-3332: fix spring contexts declaration to find spring-beans-4.0.xsd locally at classpath.

Having spring module defined as a set of spring jars (as we do have in Wildfly), it is impossible for spring to resolve xsd schema mapping file 'spring.schemas' correctly. With set of jars, we have 5 instances of this file (with different content) under the same path 'META-INF/spring.schemas'. This ended up in spring not beeing able to map spring-beans-4.0.xsd URL path to local resource location. Finally, this xsd was loaded from internet - and that significantly slowed Wildfly startup.

With this fix LAMS is way (depends on internet connection) faster to start.

Options
    • -1
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/webApplicationContext.xml
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
    • -1
    • +1
    /lams_central/web/WEB-INF/applicationContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/messageContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml
    • -1
    • +1
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml
    • -1
    • +1
    /lams_contentrepository/web/WEB-INF/applicationContext.xml
  16. … 62 more files in changeset.
Saturday 18 Oct 2014
2:44 am

erniegx <ernieg@gmail.com>

LDEV-3322: adding id attributes to facilitate functional testing

Options
    • -5
    • +5
    /lams_central/web/authoring/authoring.jsp
2:43 am

erniegx <ernieg@gmail.com>

LDEV-3322: committing missing FLA label

Options
    • -7
    • +10
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -2
    • +197
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
2:41 am

erniegx <ernieg@gmail.com>

LDEV-3322: adding id attributes to facilitate functional testing

Options
    • -5
    • +5
    /lams_central/web/authoring/authoring.jsp
2:40 am

erniegx <ernieg@gmail.com>

LDEV-3322: committing missing FLA label

Options
    • -2
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +193
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
2:07 am

erniegx <ernieg@gmail.com>

LDEV-3328: including the following Authoring Gate tests:

- Creates a design with a gate

- Adds title to gate

- Adds description to gate

- Sets gate type:

- permission

- synchronization

- condition

- schedule

Options
    • -49
    • +38
    /lams_tests/tests/org/lamsfoundation/lams/author/AuthorTests.java
    • -0
    • +342
    /lams_tests/tests/org/lamsfoundation/lams/author/GatesTests.java
    • -0
    • +41
    /lams_tests/tests/org/lamsfoundation/lams/author/util/AuthorConstants.java
    • -3
    • +44
    /lams_tests/tests/org/lamsfoundation/lams/pages/author/FLAPage.java
    • -0
    • +243
    /lams_tests/tests/org/lamsfoundation/lams/pages/author/GatePropertyPage.java
12:04 am

Marcin Cieslak

LDEV-3330: Check if an attribute key is not NULL beforing looking it up in the session.

WildFly is more restrictive when it comes to session attributes management. It does not allow looking up NULL keys, while JBoss 5 returned NULL value in this case.

Options
    • -1
    • +2
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
Friday 17 Oct 2014
11:33 pm

Andrey Balan

LDEV-3296 remove translations of the languages we don't support

Options
    • -5
    • +0
    /lams_central/web/ckeditor/lang/af.js
    • -5
    • +0
    /lams_central/web/ckeditor/lang/bn.js
    • -5
    • +0
    /lams_central/web/ckeditor/lang/bs.js
    • -5
    • +0
    /lams_central/web/ckeditor/lang/cy.js
    • -5
    • +0
    /lams_central/web/ckeditor/lang/en-ca.js
    • -5
    • +0
    /lams_central/web/ckeditor/lang/en-gb.js
    • -5
    • +0
    /lams_central/web/ckeditor/lang/en.js
    • -5
    • +0
    /lams_central/web/ckeditor/lang/eo.js
    • -5
    • +0
    /lams_central/web/ckeditor/lang/et.js
    • -5
    • +0
    /lams_central/web/ckeditor/lang/eu.js
    • -5
    • +0
    /lams_central/web/ckeditor/lang/fa.js
    • -5
    • +0
    /lams_central/web/ckeditor/lang/fi.js
    • -5
    • +0
    /lams_central/web/ckeditor/lang/fo.js
    • -5
    • +0
    /lams_central/web/ckeditor/lang/fr-ca.js
    • -5
    • +0
    /lams_central/web/ckeditor/lang/gl.js
  16. … 24 more files in changeset.
10:03 pm

erniegx <ernieg@gmail.com>

LDEV-3328: including the following Authoring tests:

- opening FLA

- create a design with 4 activities

- name and save design

- clear canvas

- reopen design

- arrange activities

- re-save design

- saveAs design

- change activity titles

- save (one click)

- Create group

- Assign group to activity

- Modify group settings

- Add design description

- Add design license

- Copy/paste activities

- Arrange design

- Save invalid design

Options
    • -27
    • +301
    /lams_tests/tests/org/lamsfoundation/lams/author/AuthorTests.java
    • -0
    • +127
    /lams_tests/tests/org/lamsfoundation/lams/pages/author/DescriptionPage.java
    • -182
    • +562
    /lams_tests/tests/org/lamsfoundation/lams/pages/author/FLAPage.java
5:55 pm

Marcin Cieslak

LDEV-3275: Add missing library dependencies.

Options
    • -0
    • +7
    /lams_build/build.xml
    • -0
    • +1
    /lams_build/conf/j2ee/jboss-deployment-structure.xml
    • -1
    • +12
    /lams_build/lib/batik/batik.module.xml
    • -2
    • +6
    /lams_build/lib/jakarta-commons/fileupload.module.xml
    • -0
    • +112
    /lams_build/lib/jdk/jdk.module.xml
    • -1
    • +2
    /lams_build/lib/struts/struts.module.xml
    • -0
    • +9
    /lams_build/lib/urlrewritefilter/urlrewrite.module.xml
    • -2
    • +11
    /lams_build/lib/wddx/wddx.module.xml
    • -0
    • +2
    /lams_build/lib/xml-commons/xmlcommons.module.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/util/svg/SVGGenerator.java
Thursday 16 Oct 2014
10:02 am

erniegx <ernieg@gmail.com>

LDEV-3328: adding tests for LAMS Authoring (FLA) using Page object model and pagefactory pattern

Options
    • -0
    • +227
    /lams_tests/tests/org/lamsfoundation/lams/author/AuthorTests.java
    • -0
    • +69
    /lams_tests/tests/org/lamsfoundation/lams/pages/AbstractPage.java
    • -0
    • +56
    /lams_tests/tests/org/lamsfoundation/lams/pages/IndexPage.java
    • -0
    • +47
    /lams_tests/tests/org/lamsfoundation/lams/pages/LoginPage.java
    • -0
    • +578
    /lams_tests/tests/org/lamsfoundation/lams/pages/author/FLAPage.java