lams-github

lams_learning

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
Thursday 12 Jul 2007
8:59 am

fmalikoff

Refactoring code so that all screens can update the progress bar.

Options
    • -2
    • +13
    ./conf/xdoclet/struts-forms.xml
    • -96
    • +0
    ./src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java
    • -3
    • +5
    ./src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java
    • -3
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java
    • -6
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -3
    • +5
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java
    • -10
    • +12
    ./src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -4
    • +3
    ./src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/learning/web/action/LessonCompleteActivityAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java
    • -11
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java
    • -3
    • +8
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java
  16. … 4 more files in changeset.
Wednesday 04 Jul 2007
11:33 am

fmalikoff

Branching: Branching activities always have a grouping during a lesson, as this is set up at lesson creation time. But they might not have any groups!

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
Tuesday 03 Jul 2007
10:05 am

fmalikoff

Branching: moved the types to the BranchingActivity so they can be accessed from learner and monitor.

Options
    • -7
    • +3
    ./src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java
Friday 29 Jun 2007
3:29 pm

fmalikoff

Branching: Added a new field firstActivity to the SequenceActivity, so Flash can easily indicate where to start in a sequence activity. That way, the logic works in the same way as it does in a learning design.

Options
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java
  2. … 2 more files in changeset.
1:35 pm

fmalikoff

Branching: Added a new field firstActivity to the SequenceActivity, so Flash can easily indicate where to start in a sequence activity. That way, the logic works in the same way as it does in a learning design.

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java
Thursday 28 Jun 2007
10:08 pm

fmalikoff

Branching: Getting the progress engine working so it will display the branch activities if the sequence/branch contains one or no activities

Options
    • -0
    • +2
    ./build.xml
2:50 pm

fmalikoff

Stop it deploying the classes directory under WEB-INF - this can give us class conflicts as the code ends up in two places.

Options
    • -0
    • +2
    ./build.xml
    • -2
    • +6
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +5
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +9
    ./conf/xdoclet/struts-forms.xml
    • -20
    • +18
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -36
    • +23
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -0
    • +17
    ./src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -18
    • +121
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -8
    • +0
    ./src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java
    • -50
    • +70
    ./src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java
    • -9
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
  16. … 11 more files in changeset.
Thursday 14 Jun 2007
2:12 pm

jliew

update lams:help tag with style attribute, mainly for lams_admin to display properly

Options
    • -0
    • +8
    ./web/WEB-INF/lams.tld
  2. … 16 more files in changeset.
Tuesday 12 Jun 2007
7:43 am

fmalikoff

LDEV-1134: Dummying up a branching page for the progress engine.

Options
    • -0
    • +106
    ./web/branchingActivity.jsp
7:43 am

fmalikoff

LDEV-1134: Dummying up a branching page for the progress engine. Had missed the entry for the abstract branching class in the Hibernate file when I switched from 1 branching class to 3.

Options
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -0
    • +121
    ./src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java
  4. … 4 more files in changeset.
Friday 08 Jun 2007
9:44 am

fmalikoff

LDEV-1255: Moving the code for stopping jsps caching to a new custom tag, so that it can be applied consistently across all pages. Moved the utf-8 statements to the same tag so we don't have to remember to put them in all pages.

Options
    • -2
    • +0
    ./web/WEB-INF/tags/headItems.tag
  2. … 184 more files in changeset.
Tuesday 05 Jun 2007
1:54 pm

fmalikoff

LDEV-1255: Moving the code for stopping jsps caching to a new custom tag, so that it can be applied consistently across all pages.

Options
    • -0
    • +4
    ./web/WEB-INF/lams.tld
    • -0
    • +41
    ./web/WEB-INF/tags/Head.tag
    • -3
    • +2
    ./web/controlFrame.jsp
    • -3
    • +2
    ./web/exportPortfolio/main.jsp
    • -3
    • +2
    ./web/exportPortfolio/notebook.jsp
    • -18
    • +6
    ./web/exportWaitingPage.jsp
    • -3
    • +2
    ./web/layout/gateLayout.jsp
    • -3
    • +2
    ./web/layout/groupWaitLayout.jsp
    • -3
    • +2
    ./web/layout/layout.jsp
    • -3
    • +2
    ./web/main.jsp
    • -4
    • +2
    ./web/requestURL.jsp
  12. … 35 more files in changeset.
Friday 01 Jun 2007
3:28 pm

mseaton

updated dictionary load url to include build no/version param

Options
    • binary
    ./web/lams_learner.swf
  2. … 6 more files in changeset.
11:48 am

erniegx <ernieg@gmail.com>

Updating Danish, Greek and Italian

Options
    • -17
    • +19
    ./conf/language/lams/ApplicationResources_da_DK.properties
    • -8
    • +8
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -31
    • +33
    ./conf/language/lams/ApplicationResources_it_IT.properties
  4. … 3 more files in changeset.
10:26 am

mseaton

updated learner to jump to active/current activity pos on startup

Options
    • binary
    ./web/lams_learner.swf
  2. … 1 more file in changeset.
Tuesday 29 May 2007
7:13 pm

fmalikoff

LDEV-1241: Problem with progess engine getting stuck when a user is in a parallel activity within an optional activity required a change to the LearnerProgress.setProgressState() method call. Learner classes changed to match.

Options
    • -3
    • +8
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
2:17 pm

jliew

LDEV-1155 revert to storing temp portfolio on server as a constant 'export.zip'; URLEncoded the portfolio name when it is passed as a URL parameter (for i18n purposes); strip out punctuation chars from the export portfolio filename that is downloaded by users.

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/learning/export/ExportPortfolioConstants.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/export/service/IExportPortfolioService.java
    • -1
    • +9
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/ExportDownloadServlet.java
    • -13
    • +8
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
  6. … 1 more file in changeset.
Monday 28 May 2007
2:34 pm

mseaton

fixes from todays test session: learner progress to scroll to current act when initially loaded + fix double var use in learner tab and container depths

Options
    • binary
    ./web/lams_learner.swf
  2. … 4 more files in changeset.
Friday 25 May 2007
2:12 pm

erniegx <ernieg@gmail.com>

Updating Greek

Options
    • -2
    • +4
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 6 more files in changeset.
Wednesday 23 May 2007
8:04 am

fmalikoff

Debug statement no longer needed.

Options
    • -4
    • +0
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/CSSBundler.java
Tuesday 22 May 2007
2:06 pm

fmalikoff

LDEV-1225: While testing, found that the notSupported.jsp doesn't work properly. This page only appeared when the system tools (gates and grouping) don't work in export portfolio properly, so its not worth trying to fix it. Now if they don't work there is an entry in the main page but no "no supported" page.

Options
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/learning/export/ExportPortfolioConstants.java
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
    • -5
    • +0
    ./src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java
    • -61
    • +0
    ./web/exportPortfolio/notSupported.jsp
Friday 18 May 2007
4:03 pm

erniegx <ernieg@gmail.com>

Updating Greek and Norwegian

Options
    • -3
    • +5
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -9
    • +11
    ./conf/language/lams/ApplicationResources_no_NO.properties
  3. … 4 more files in changeset.
3:20 pm

fmalikoff

LDEV-1182 & LDEV-1126: Fixing up behaviour of the close.jsp - which is called when the user completes an activity that was already finished. There were problems with the parallel activities when one was finished and the user clicked resume (or restarted learner) and with force complete. Now instead of just showing the "close" message, it detects that it is not in the popup window and instead of trying to close it now forwards to the next appropriate screen.

Options
    • -2
    • +9
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java
    • -6
    • +6
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -3
    • +49
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
    • -1
    • +8
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java
    • -9
    • +13
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
    • -4
    • +20
    ./web/close.jsp
Wednesday 16 May 2007
7:43 am

fmalikoff

LDEV-1051 and LDEV-1198: Fixed the break out of frames logic for parallels at the end of a design and inside an optional activity.

Options
    • -7
    • +20
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -9
    • +6
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -1
    • +8
    ./src/java/org/lamsfoundation/lams/learning/web/form/OptionsActivityForm.java
    • -15
    • +22
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
    • -15
    • +28
    ./test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
    • -1
    • +2
    ./test/java/org/lamsfoundation/lams/learning/web/action/TestDisplayActivityAction.java
    • -0
    • +2
    ./web/optionsActivity.jsp
  10. … 4 more files in changeset.
Tuesday 15 May 2007
3:07 pm

fmalikoff

LDEV-1222: Notebook window wasn't popping up in a new window

Options
    • -1
    • +1
    ./web/exportPortfolio/main.jsp
Monday 14 May 2007
11:04 am

jliew

LDEV-1155 filename parameter in response parameter needs to be enclosed by quotes otherwise firefox truncates the filename when it encounters the first space

Options
    • -6
    • +2
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/ExportDownloadServlet.java
Wednesday 09 May 2007
4:20 pm

mseaton

merged SWF files (recompiled) from editonfly branch to HEAD

Options
    • binary
    ./web/lams_learner.swf
9:17 am

fmalikoff

Merging RAMS and Edit On Fly changes from branch to the head.

Options
    • -0
    • +3
    ./conf/xdoclet/struts-actions.xml
    • -1
    • +2
    ./conf/xdoclet/struts-forms.xml
    • -31
    • +110
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -13
    • +16
    ./src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -44
    • +80
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -2
    • +14
    ./src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java
    • -8
    • +10
    ./src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java
    • -25
    • +26
    ./src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
    • -2
    • +5
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -23
    • +44
    ./src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -7
    • +16
    ./src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -4
    • +0
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java
    • -76
    • +47
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
  16. … 225 more files in changeset.
Tuesday 08 May 2007
10:50 am

erniegx <ernieg@gmail.com>

Updating English

Options
    • -2
    • +4
    ./conf/language/rams/ApplicationResources.properties
    • -2
    • +4
    ./conf/language/rams/ApplicationResources_en_AU.properties
  3. … 6 more files in changeset.
10:40 am

erniegx <ernieg@gmail.com>

Updating English

Options
    • -3
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +5
    ./conf/language/lams/ApplicationResources_en_AU.properties
  3. … 6 more files in changeset.