Activity lams-github/lams

LDEV-1989 Stopped author from doing cut/copy/paste (keyboard shortcut) actions on activities when a dialog is open as it was messing with cut/copy/paste of text in the dialogs

- binary
./lams_authoring.swf
- History
- Source
- Diff
./lams_authoring.swf
- binary
./lams_authoring_library.swf
- History
- Source
- Diff
./lams_authoring_library.swf
… 1 more file in changeset.

5:03 am

dcarlier

More
f2d8824
changed 1 file
v4.7, v4.8

LDEV-1974 Removed unwanted text

- -1
- +1
./login.jsp
- History
- Source
- Diff
./login.jsp

5:02 am

lfoxton

More
8885946
changed 1 file
v4.7, v4.8

Updating jquery-latest.pack.js to 1.2.6 to cater for the new ui dialog widget

- -4
- +4
./includes/javascript/jquery-latest.pack.js
- History
- Source
- Diff
./includes/.../jquery-latest.pack.js

5:01 am

lfoxton

More
fae4e28
added 7 files
v4.7, v4.8

Adding jQuery dialog widget to central

- -0
- +150
./css/jquery-ui/dialog.css
- History
- Source
./css/jquery-ui/dialog.css
- binary
./css/jquery-ui/images/222222_11x11_icon_close.gif
- History
- Source
./css/jquery-ui/.../222222_11x11_icon_close.gif
- binary
./css/jquery-ui/images/222222_11x11_icon_resize_se.gif
- History
- Source
./css/jquery-ui/.../222222_11x11_icon_resize_se.gif
- binary
./css/jquery-ui/images/454545_11x11_icon_close.gif
- History
- Source
./css/jquery-ui/.../454545_11x11_icon_close.gif
- binary
./css/jquery-ui/images/888888_11x11_icon_close.gif
- History
- Source
./css/jquery-ui/.../888888_11x11_icon_close.gif
- binary
./css/jquery-ui/images/e6e6e6_40x100_textures_02_glass_75.png
- History
- Source
./css/.../e6e6e6_40x100_textures_02_glass_75.png
- -0
- +101
./includes/javascript/jquery-ui/ui.dialog-1.5.2.min.js
- History
- Source
./includes/javascript/.../ui.dialog-1.5.2.min.js

4:53 am

dcarlier

More
2b36ca7
changed 3 files
v4.7, v4.8

LDEV-1974 Updated flash player detection script to adobe detection kit

- -0
- +276
./includes/javascript/AC_OETags.js
- History
- Source
./includes/javascript/AC_OETags.js
- -75
- +0
./includes/javascript/flash_detect.js
- History
- Source
- Diff
./includes/javascript/flash_detect.js
- -11
- +10
./login.jsp
- History
- Source
- Diff
./login.jsp

12:40 am

dcarlier

More
26fcfdc
changed 3 files
v4.7, v4.8

LDEV-1949 Added "(default)" text to closed gate state for condition gates

- binary
./lams_authoring.swf
- History
- Source
- Diff
./lams_authoring.swf
- binary
./lams_authoring_library.swf
- History
- Source
- Diff
./lams_authoring_library.swf
… 1 more file in changeset.

12:11 am

dcarlier

More
26907bf
changed 3 files
v4.7, v4.8

LDEV-1949 Fixed crash on double click in author for condition gates

- binary
./lams_authoring.swf
- History
- Source
- Diff
./lams_authoring.swf
- binary
./lams_authoring_library.swf
- History
- Source
- Diff
./lams_authoring_library.swf
… 1 more file in changeset.

7:13 am

dcarlier

More
e76b614
changed 4 files
v4.7, v4.8

LDEV-1936 Flash support for conditions of type OUTPUT_STRING added. For example see notebook tool.

- binary
./lams_authoring.swf
- History
- Source
- Diff
./lams_authoring.swf
- binary
./lams_authoring_library.swf
- History
- Source
- Diff
./lams_authoring_library.swf
… 2 more files in changeset.

12:22 am

dcarlier

More
066d4ae
changed 3 files
v4.7, v4.8

LDEV-1859 Fixed Connecting branches incorrectly disallowed for branching within branching within branching

- binary
./lams_authoring.swf
- History
- Source
- Diff
./lams_authoring.swf
- binary
./lams_authoring_library.swf
- History
- Source
- Diff
./lams_authoring_library.swf
… 1 more file in changeset.

5:18 am

dcarlier

More
64f42c8
changed 22 files
v4.7, v4.8

LDEV-1949 Added support for condition (tool-output) based gates

- binary
./lams_authoring.swf
- History
- Source
- Diff
./lams_authoring.swf
- binary
./lams_authoring_library.swf
- History
- Source
- Diff
./lams_authoring_library.swf
… 20 more files in changeset.

12:48 am

LDEV-1947 Editing a competence title now not allowed to change to an existing title or blank, however having trouble making alert appear on on top of the CompetenceDefinitionDialog, so temporary solution is to close the CompetenceDefinitionDialog dialog and have alert appear over CompetenceEditorDialog

- binary
./lams_authoring.swf
- History
- Source
- Diff
./lams_authoring.swf
- binary
./lams_authoring_library.swf
- History
- Source
- Diff
./lams_authoring_library.swf
… 1 more file in changeset.

12:08 am

dcarlier

More
6ee8cd1
changed 3 files
v4.7, v4.8

LDEV-1979 Copying and pasting an activity now also copies the competence mappings across to the new activity

- binary
./lams_authoring.swf
- History
- Source
- Diff
./lams_authoring.swf
- binary
./lams_authoring_library.swf
- History
- Source
- Diff
./lams_authoring_library.swf
… 1 more file in changeset.

7:06 am

dcarlier

More
2dc5582
changed 8 files
v4.7, v4.8

LDEV-1948 Added View competence mappings to context menu, and fixed it so that it only appears in author/monitor when a tool activity is selected

- binary
./lams_authoring.swf
- History
- Source
- Diff
./lams_authoring.swf
- binary
./lams_authoring_library.swf
- History
- Source
- Diff
./lams_authoring_library.swf
… 6 more files in changeset.

7:34 am

dcarlier

More
41f90be
changed 3 files
v4.7, v4.8

LDEV-1925 Fixed up ? in ToolOutputConditionsDialog to label user defined

- binary
./lams_authoring.swf
- History
- Source
- Diff
./lams_authoring.swf
- binary
./lams_authoring_library.swf
- History
- Source
- Diff
./lams_authoring_library.swf
… 1 more file in changeset.

5:06 am

lfoxton

More
134b8c6
changed 8 files
v4.7, v4.8

LDEV-1977 make a lams-central action that takes a relative LAMS url and redirects to it, so the users are taken through the login page if neccessary.

- Adding checking to make sure that a user cannot access monitor unless they have permission, see LDEV-1978

- -0
- +17
./WEB-INF/struts/struts-config.xml
- History
- Source
- Diff
./WEB-INF/struts/struts-config.xml
- -0
- +20
./WEB-INF/web.xml
- History
- Source
- Diff
./WEB-INF/web.xml
… 6 more files in changeset.

4:15 am

paulg

More
3f521ad
changed 3 files
v4.7, v4.8

LDEV-1929 Fixed problem when launching preview from author

- binary
./lams_authoring.swf
- History
- Source
- Diff
./lams_authoring.swf
- binary
./lams_authoring_library.swf
- History
- Source
- Diff
./lams_authoring_library.swf
… 1 more file in changeset.

8:08 am

paulg

More
4b24094
changed 34 files
v4.7, v4.8

LDEV-1907 Show a plus sign "+" in the activity if it contains more than 10 learners

LDEV-1469 Progress Bar - rotate green triangles

LDEV-1929 Implement presence in learner (Flash and non-flash)

= TODO:

+ must refactor to use xmpp service to create users with admin account

+ fix IE to catch flashvars sent from javascript

+ find workaround to not commenting out sasl in jsjac lib

LDEV-1783 Improve the error message when a user tries to select an activity inside an optional activity/sequence via the progress bar

- -3
- +4
./includes/javascript/AC_RunActiveContent.js
- History
- Source
- Diff
./includes/.../AC_RunActiveContent.js
- -2
- +2
./learner.jsp
- History
- Source
- Diff
./learner.jsp
… 32 more files in changeset.

5:33 am

lfoxton

More
c6e94da
changed 9 files
v4.7, v4.8

Relocating the fckeditor wikilink plugin from lams_central to the wiki tool

- -133
- +0
./fckeditor/editor/plugins/wikilink/fck_wikilink.jsp
- History
- Source
- Diff
./fckeditor/editor/.../fck_wikilink.jsp
- -18
- +0
./fckeditor/editor/plugins/wikilink/fckplugin.js
- History
- Source
- Diff
./fckeditor/editor/.../wikilink/fckplugin.js
- -8
- +0
./fckeditor/editor/plugins/wikilink/lang/en.js
- History
- Source
- Diff
./fckeditor/editor/plugins/.../lang/en.js
- binary
./fckeditor/editor/plugins/wikilink/wikilink.gif
- History
- Source
- Diff
./fckeditor/editor/.../wikilink/wikilink.gif
- -3
- +3
./includes/javascript/fckconfig_custom.js
- History
- Source
- Diff
./includes/javascript/fckconfig_custom.js
… 4 more files in changeset.

1:20 am

lfoxton

More
4b8cea7
changed 4 files
v4.7, v4.8

LDEV-1657 - Wikilinking, with dan's help, used an FCKEditor property to store the wikilink array and fix cross-browser problems

- -2
- +1
./fckeditor/editor/plugins/wikilink/fck_wikilink.jsp
- History
- Source
- Diff
./fckeditor/editor/.../fck_wikilink.jsp
… 3 more files in changeset.

6:50 am

asukkar

More
0adcfe0
changed 33 files
v4.7, v4.8

LDEV-1969

Moved jsjac library to lams central

- -0
- +506
./includes/javascript/jsjac.js
- History
- Source
./includes/javascript/jsjac.js
- -0
- +33
./includes/javascript/jsjac.packed.js
- History
- Source
./includes/javascript/jsjac.packed.js
… 31 more files in changeset.

5:10 am

lfoxton

More
86d1088
changed 1 file
v4.7, v4.8

changed call to parent window to: wikiArray = window.top.opener.parent.wikiLinkArray;

wikiArray = window.top.opener.top.wikiLinkArray; was not working in learner because of the frames

- -1
- +1
./fckeditor/editor/plugins/wikilink/fck_wikilink.jsp
- History
- Source
- Diff
./fckeditor/editor/.../fck_wikilink.jsp

5:01 am

lfoxton

More
326b1f4
changed 1 file
v4.7, v4.8

LDEV-1657 Fixed the problem with commas and inverted commas by replacing with escape characters. Also, the comma problem is solved by getting the javascript object directly from the window rather than saving it as a string in a hidden field, like so:

wikiArray = window.top.opener.top.wikiLinkArray;

- -2
- +7
./fckeditor/editor/plugins/wikilink/fck_wikilink.jsp
- History
- Source
- Diff
./fckeditor/editor/.../fck_wikilink.jsp

7:55 am

lfoxton

More
f3a88ad
changed 1 file
v4.7, v4.8

LDEV-1657 - Updating the wiki link plugin for the fckeditor.

To attempt to resolve issues with certain browsers, I removed any ajax calls to get the list of wiki links. Instead, they are retrieved from the opening page. ie a javascript array of wikilinks is created on the page where the fckeditor is, then it is retrieved by the plugin with the following command:

wikiArray = window.top.opener.top.document.getElementById("wikiLinks").value.split(',');

- -24
- +6
./fckeditor/editor/plugins/wikilink/fck_wikilink.jsp
- History
- Source
- Diff
./fckeditor/editor/.../fck_wikilink.jsp

8:06 am

dcarlier

More
502e886
changed 5 files
v4.7, v4.8

LDEV-1925 Added support for complex conditions

- binary
./lams_authoring.swf
- History
- Source
- Diff
./lams_authoring.swf
- binary
./lams_authoring_library.swf
- History
- Source
- Diff
./lams_authoring_library.swf
… 3 more files in changeset.

web

Stats

Commits this week: 0

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

asukkar

dcarlier

dcarlier

lfoxton

lfoxton

asukkar

dcarlier

dcarlier

lfoxton

lfoxton

dcarlier

dcarlier

dcarlier

dcarlier

dcarlier

dcarlier

dcarlier

dcarlier

dcarlier

dcarlier

lfoxton

paulg

paulg

lfoxton

lfoxton

asukkar

lfoxton

lfoxton

lfoxton

dcarlier