lams / lams_central / web

includes

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 15
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 32,906
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

Changeset MAIN:andreyb:20110406170454:1 does not match your current filter (clear filter).

Wednesday 06 Apr 2011
7:04 pm

Andrey Balan

file webcam.swf was initially added on branch lams2_3_release.

Options
    • binary
    ./flash/webcam.swf
7:04 pm

Andrey Balan

file webcam.js was initially added on branch lams2_3_release.

Options
    • -0
    • +0
    ./javascript/webcam.js
7:04 pm

Andrey Balan

file shutter.mp3 was initially added on branch lams2_3_release.

Options
    • binary
    ./sounds/shutter.mp3
Thursday 31 Mar 2011
7:43 pm

Andrey Balan

file jquery.blockUI.js was initially added on branch lams2_3_release.

Options
    • -0
    • +0
    ./javascript/jquery.blockUI.js
7:43 pm

Andrey Balan

LDEV-2657 Date and time restriction in activities

Options
    • -0
    • +493
    ./javascript/jquery.blockUI.js
  2. … 23 more files in changeset.
Wednesday 30 Mar 2011
1:10 am

Andrey Balan

file jquery-1.5.1.min.js was initially added on branch lams2_3_release.

Options
    • -0
    • +0
    ./javascript/jquery-1.5.1.min.js
1:10 am

Andrey Balan

file jquery-ui-timepicker-addon.js was initially added on branch lams2_3_release.

Options
    • -0
    • +0
    ./javascript/jquery-ui-timepicker-addon.js
1:10 am

Andrey Balan

file jquery-ui-1.8.11.custom.min.js was initially added on branch lams2_3_release.

Options
    • -0
    • +0
    ./javascript/jquery-ui-1.8.11.custom.min.js
1:10 am

Andrey Balan

LDEV-2657 introducing Date and time restriction in activities

Options
    • -0
    • +16
    ./javascript/jquery-1.5.1.min.js
    • -0
    • +165
    ./javascript/jquery-ui-1.8.11.custom.min.js
    • -0
    • +911
    ./javascript/jquery-ui-timepicker-addon.js
  4. … 30 more files in changeset.
Sunday 06 Mar 2011
10:55 am

Marcin Cieslak

LDEV-2642, LDEV-2646: Extend access control for Planner nodes.

Add a node's owner field.

Fix exporting/importing nodes.

Upgrade XStream from 1.1 to 1.1.3.

Options
    • -8
    • +46
    ./javascript/pedagogicalPlanner.js
  2. … 11 more files in changeset.
Monday 14 Feb 2011
12:45 am

Marcin Cieslak

LDEV-2646: Allow access control for viewing/editing a copy/original template in Planner nodes for Teachers.

Swap collapse/expand arrows - it seems more right now.

Some clean up - move PlannerActivityMetadata to a proper packet, change some labels etc.

Options
    • -0
    • +9
    ./javascript/pedagogicalPlanner.js
  2. … 20 more files in changeset.
Saturday 12 Feb 2011
7:37 pm

Marcin Cieslak

LDEV-2642, LDEV-2616:

Move Planner activity metadata (hidden, collapsed, expanded) to a separate table, as it may grow in the future and we don't want to make ToolActivity too complex.

Move Editing Advice content from Online Instructions in activities to the metadata table.

Allow editing the Editing Advice straight from the planner. Use jquery_ui instead of cluetip (dispose the last one completely).

While creating a node, the Learning Design is imported just once from ZIP into DB, instead of importing it each time someone opens it in Planner. This allows less unnecessary copies of the LD and allows easier modfication of the original design.

Change the way a Teacher gets a copy of the design. When opening the template in Planner, a copy is made in common folder ("Planner preview"). When the user saves the design, the same copy is *moved* to user's folder, rather than copying it again. Futhermore, each subsequent save modifies the same LD rather than making another copy.

Options
    • -543
    • +0
    ./javascript/jquery.cluetip.js
    • -31
    • +30
    ./javascript/pedagogicalPlanner.js
    • -0
    • +273
    ./javascript/jquery-ui/jquery-ui-1.7.3.custom.min.js
  4. … 17 more files in changeset.
Sunday 12 Dec 2010
3:35 pm

Marcin Cieslak

LDEV-2577: Upgraded jQuery Form plugin to the latest version which fixed a bug in file uploading - previously impacting Shared Resources in Planner.

The new version is compatible with jQuery 1.3.2 which LAMS currently is using and should be backwards compatible, but it has not been tested in other projects than lams_central - sorry!

Options
    • -485
    • +644
    ./javascript/jquery.form.js
  2. … 2 more files in changeset.
3:15 pm

Marcin Cieslak

LDEV-2614: Added expand activity button.

Collapse/expand activity state is now stored on "Save as Sequence" action.

Options
    • -9
    • +71
    ./javascript/pedagogicalPlanner.js
  2. … 8 more files in changeset.
Sunday 05 Dec 2010
8:44 pm

Marcin Cieslak

LDEV-2615: Added button and code allowing editing a single activity in Full Author.

Options
    • -5
    • +22
    ./javascript/pedagogicalPlanner.js
  2. … 4 more files in changeset.
6:18 pm

Marcin Cieslak

LDEV-2614: Finding items to hide using common class, rather than id.

Options
    • -8
    • +2
    ./javascript/pedagogicalPlanner.js
5:37 pm

Marcin Cieslak

LDEV-2614: Added a button to collapse an activity and hyperlink to expand it.

Options
    • -0
    • +21
    ./javascript/pedagogicalPlanner.js
  2. … 2 more files in changeset.
Monday 22 Nov 2010
8:14 am

Marcin Cieslak

LDEV-2577: Readded movieplayer plugin for CKEditor 3.x

Options
    • -2
    • +1
    ./javascript/ckconfig_custom.js
  2. … 9 more files in changeset.
Sunday 07 Nov 2010
6:14 pm

Marcin Cieslak

LDEV-2577: Readded Paint plugin.

Options
    • -1
    • +1
    ./javascript/ckconfig_custom.js
  2. … 6 more files in changeset.
9:40 am

Marcin Cieslak

LDEV-2577: Added a new version of equation plugin. This version requires a connection to the plugin's home page.

Options
    • -1
    • +1
    ./javascript/ckconfig_custom.js
  2. … 3 more files in changeset.
Thursday 04 Nov 2010
9:22 pm

Marcin Cieslak

LDEV-2596: Forcing CKEditor be reinitialized after AJAX form submit.

Options
    • -0
    • +5
    ./javascript/pedagogicalPlanner.js
  2. … 28 more files in changeset.
Sunday 24 Oct 2010
3:36 pm

Marcin Cieslak

LDEV-2577: Readded videorecorder plugin. Readded missing contentFolderID parameter to CKEditor instances.

Options
    • -5
    • +1
    ./javascript/ckconfig_custom.js
  2. … 36 more files in changeset.
Thursday 21 Oct 2010
8:50 pm

Marcin Cieslak

LDEV-2577, LDEV-2588:

Fixed names of buttons that have changed from FCKEditor.

CKEditor are hidden until they are completely initialized.

Options
    • -15
    • +26
    ./javascript/ckconfig_custom.js
  2. … 25 more files in changeset.
Tuesday 19 Oct 2010
7:08 pm

Andrey Balan

CLOUD-57 fixing planner error: losing notifyColseURL's query parameters when open in simple editor then full editor

Options
    • -1
    • +5
    ./javascript/pedagogicalPlanner.js
Monday 18 Oct 2010
10:51 pm

Marcin Cieslak

LDEV-2577: Rewrote WikiLink for new CKEditor.

For Firefox 3.6.10 inserting HTML is not working:

https://bugzilla.mozilla.org/show_bug.cgi?id=596300

https://bugzilla.mozilla.org/show_bug.cgi?id=597784

https://bugzilla.mozilla.org/show_bug.cgi?id=597784

Maybe future releases of FF will allow to insert any content into editor area.

Options
    • -3
    • +4
    ./javascript/ckconfig_custom.js
  2. … 7 more files in changeset.
Sunday 10 Oct 2010
2:41 pm

Marcin Cieslak

LDEV-2577: Reverted CKEditor skin back to "office2003".

Options
    • -1
    • +1
    ./javascript/ckconfig_custom.js
Wednesday 06 Oct 2010
12:09 pm

Marcin Cieslak

LDEV-2577

The new CKEditor does not have Java Integration library (yet). We have been

using it to:

a) get the tag library to create our own tag <lams:FCKeditor>

But the new CKEditor uses AJAX to get the contents, so the library is

not needed anymore.

The references to it has been deleted from every tool.

FCKEditor.tag has been rewritten to use the new syntax.

b) get a FCKEditor internal file manager by a Connector from the jar

The new CKEditor does not provide a file manager - the license became

commercial and the whole thing became a separate project, CKFinder.

There were alternatives suggested on the web:

jasfinder - http://sourceforge.net/projects/jasfinder/support

kcfinder - http://kcfinder.sunhater.com/

some other - http://www.miguelmanchego.com/2009/gestor-de-archivos-ckeditor/

but we have already nicely integrated with the old file manager. This page:

http://jacek-kromski.jogger.pl/2009/09/25/integracja-ckeditor-z-przegladarka-plikow-z-fckeditor/

in polish says how to use the file manager from the old FCKEditor.

The steps that have to be done:

- download the new CKEditor

- download the old FCKEditor

- copy the filemanager to ckeditor directory

- in the file browser/default/frmresourceslist.html, line 92 (with SetUrl call) needs to be replaced to:

window.top.opener.CKEDITOR.tools.callFunction( window.top.document.CKEditorFuncNum, fileUrl, '' );

- in the file browser/default/browser.html add in line 80:

document.CKEditorFuncNum = GetUrlParam( 'CKEditorFuncNum');

FCKeditor has been used in version 2.6.6, the last one before switching to CKEditor project.

Changes required to use newer version of Java Integration library

for FCKEditor so it was upgraded to the latest (for FCKEditor, because one for CKEditor does not exist) version 2.6.

This also required the Prototype to be upgraded to the latest 1.6.1.

The CKEditor code also needed to be changed, so if another upgrade to a newer version occurs, we need to remember to repeat these steps:

http://cksource.com/forums/viewtopic.php?f=5&t=15750

It says:

/ckeditor/plugins/link/dialogs/link.js

Changes

label:a.lang.common.target,'default':'notSet' --> label:a.lang.common.target,'default':'_blank'

label:a.lang.link.targetFrameName,'default':'' --> label:a.lang.link.targetFrameName,'default':'_blank'

It is also worth mentioning that if you include the ckeditor.js file twice in the same page, sometimes it causes trouble, thus detection in the CKEditor.tag files.

Options
    • -0
    • +50
    ./javascript/ckconfig_custom.js
    • -0
    • +211
    ./javascript/ckcontroller.js
    • -49
    • +0
    ./javascript/fckconfig_custom.js
    • -212
    • +0
    ./javascript/fckcontroller.js
    • -1098
    • +4191
    ./javascript/prototype.js
  6. … 1092 more files in changeset.
Tuesday 10 Aug 2010
9:55 am

Andrey Balan

LDEV-2571 planner now supports requestSrc and notifyCloseURL URL parameters

Options
    • -0
    • +1
    ./javascript/pedagogicalPlanner.js
Friday 06 Aug 2010
2:49 pm

Andrey Balan

LDEV-2571 planner now supports requestSrc and notifyCloseURL URL parameters

Options
    • -3
    • +16
    ./javascript/pedagogicalPlanner.js
  2. … 2 more files in changeset.
Friday 12 Mar 2010
6:31 pm

Andrey Balan

LDEV-2534 designs saved in planner/opened in "Full Author" are getting saved now in user's personal folder

(merge to lams2_3_release branch)

Options
    • -4
    • +16
    ./javascript/pedagogicalPlanner.js
  2. … 1 more file in changeset.