lams-github / lams_central

web

Clone Tools

Stats

Commits this week: 0
Total Committers: 31
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
Sunday 06 Mar 2011
5:56 pm

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
    ./includes/javascript/pedagogicalPlanner.js
  2. … 11 more files in changeset.
Monday 14 Feb 2011
7: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
    • binary
    ./images/pedag_collapse.png
    • binary
    ./images/pedag_collapse_arrow.png
    • binary
    ./images/pedag_expand.png
    • binary
    ./images/pedag_expand_arrow.png
    • -0
    • +9
    ./includes/javascript/pedagogicalPlanner.js
  6. … 16 more files in changeset.
Sunday 13 Feb 2011
2:38 am

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
    • -7
    • +1
    ./css/pedagogicalPlanner.css
    • -0
    • +273
    ./includes/javascript/jquery-ui/jquery-ui-1.7.3.custom.min.js
    • -543
    • +0
    ./includes/javascript/jquery.cluetip.js
    • -31
    • +30
    ./includes/javascript/pedagogicalPlanner.js
  5. … 16 more files in changeset.
Sunday 12 Dec 2010
10: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
    ./includes/javascript/jquery.form.js
  2. … 2 more files in changeset.
10:31 pm

Marcin Cieslak

LDEV-2577: Fixed a bug preventing multiple CKEditor instances on one page to be properly reinitialized after form submit.

Options
    • -24
    • +15
    ./WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
10:17 pm

Marcin Cieslak

LDEV-2614: Added expand activity button. Collapse/expand activity state is now stored on "Save as Sequence" action.

Options
    • binary
    ./images/pedag_collapse.png
    • binary
    ./images/pedag_expand.png
    • -9
    • +71
    ./includes/javascript/pedagogicalPlanner.js
  4. … 6 more files in changeset.
Monday 06 Dec 2010
4:52 am

Marcin Cieslak

LDEV-2577: Added extra safety measure preventing plain textarea from being show instead of CKEditor instance.

Options
    • -1
    • +1
    ./WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
3:44 am

Marcin Cieslak

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

Options
    • -0
    • +1
    ./css/pedagogicalPlanner.css
    • binary
    ./images/pedag_collapse.png
    • -5
    • +22
    ./includes/javascript/pedagogicalPlanner.js
  4. … 2 more files in changeset.
1:18 am

Marcin Cieslak

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

Options
    • -8
    • +2
    ./includes/javascript/pedagogicalPlanner.js
12:37 am

Marcin Cieslak

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

Options
    • -1
    • +11
    ./css/pedagogicalPlanner.css
    • binary
    ./images/pedag_collapse.png
    • -0
    • +21
    ./includes/javascript/pedagogicalPlanner.js
Wednesday 24 Nov 2010
2:36 am

Marcin Cieslak

LDEV-2607: Hardcoded CKEditor width as a fix for Chrome inability to process "100%" width correctly.

Options
    • -1
    • +1
    ./WEB-INF/tags/CKEditor.tag
  2. … 26 more files in changeset.
Monday 22 Nov 2010
3:14 pm

Marcin Cieslak

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

Options
    • -0
    • +25
    ./ckeditor/plugins/movieplayer/LICENSE.TXT
    • binary
    ./ckeditor/plugins/movieplayer/filmreel.gif
    • binary
    ./ckeditor/plugins/movieplayer/filmreel.png
    • -0
    • +13
    ./ckeditor/plugins/movieplayer/lang/en.js
    • -0
    • +1
    ./ckeditor/plugins/movieplayer/movieplayer.html
    • -0
    • +1
    ./ckeditor/plugins/movieplayer/movieplayer.js
    • binary
    ./ckeditor/plugins/movieplayer/player_flv_maxi.swf
    • binary
    ./ckeditor/plugins/movieplayer/player_mp3_maxi.swf
    • -0
    • +5
    ./ckeditor/plugins/movieplayer/plugin.js
    • -2
    • +1
    ./includes/javascript/ckconfig_custom.js
3:13 pm

Marcin Cieslak

LDEV-2577: Set default height for CKEditor instances, as in IE it was minimal.

Options
    • -0
    • +4
    ./WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
Thursday 18 Nov 2010
6:28 am

Marcin Cieslak

LDEV-2595: As CSS parameter "display: none" does not work in IE, the initial textarea for CKEditor has height = 0px which does the trick instead.

Options
    • -1
    • +1
    ./WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
3:45 am

Andrey Balan

LDEV-2603 adding tool's images that will be used for SVG creation

*merging from lams2_3_release

Options
    • binary
    ./images/svg/icon_assessment.png
    • binary
    ./images/svg/icon_branching.png
    • binary
    ./images/svg/icon_chat.png
    • binary
    ./images/svg/icon_daco.png
    • binary
    ./images/svg/icon_dimdim.png
    • binary
    ./images/svg/icon_dotLRNForum.png
    • binary
    ./images/svg/icon_eAdventure2.png
    • binary
    ./images/svg/icon_forum.png
    • binary
    ./images/svg/icon_forum_and_scribe.png
    • binary
    ./images/svg/icon_gate.png
    • binary
    ./images/svg/icon_gmap.png
    • binary
    ./images/svg/icon_grouping.png
    • binary
    ./images/svg/icon_groupreporting.png
    • binary
    ./images/svg/icon_htmlnb.png
    • binary
    ./images/svg/icon_imageGallery.png
  16. … 16 more files in changeset.
Saturday 13 Nov 2010
5:30 pm

Marcin Cieslak

LDEV-2577: Modified Equation plugin so it opens an existing image.

Options
    • -12
    • +49
    ./ckeditor/plugins/equation_html/plugin.js
Wednesday 10 Nov 2010
2:24 am

Marcin Cieslak

LDEV-2600: Committed missing changes for Paint plugin.

Options
    • -2
    • +2
    ./ckeditor/plugins/paint/content.jsp
    • -9
    • +14
    ./ckeditor/plugins/paint/plugin.js
Monday 08 Nov 2010
1:14 am

Marcin Cieslak

LDEV-2577: Readded Paint plugin.

Options
    • binary
    ./ckeditor/plugins/paint/CK Paint.swf
    • -0
    • +64
    ./ckeditor/plugins/paint/content.jsp
    • binary
    ./ckeditor/plugins/paint/icon.png
    • -0
    • +22
    ./ckeditor/plugins/paint/lang/en.js
    • -0
    • +43
    ./ckeditor/plugins/paint/plugin.js
    • -0
    • +5
    ./ckeditor/plugins/paint/swfobject.js
    • -1
    • +1
    ./includes/javascript/ckconfig_custom.js
Sunday 07 Nov 2010
4:40 pm

Marcin Cieslak

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

Options
    • binary
    ./ckeditor/plugins/equation_html/equation.gif
    • -0
    • +4
    ./ckeditor/plugins/equation_html/lang/en.js
    • -0
    • +67
    ./ckeditor/plugins/equation_html/plugin.js
    • -1
    • +1
    ./includes/javascript/ckconfig_custom.js
Friday 05 Nov 2010
4:24 am

Marcin Cieslak

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

Options
    • -17
    • +28
    ./WEB-INF/tags/CKEditor.tag
    • -0
    • +5
    ./includes/javascript/pedagogicalPlanner.js
  3. … 27 more files in changeset.
Thursday 28 Oct 2010
2:52 am

Marcin Cieslak

LDEV-2577: Changed position of dialogs from "fixed" to "absolute" to display them properly in iframes.

Options
    • -1
    • +1
    ./ckeditor/ckeditor.js
Sunday 24 Oct 2010
9:39 pm

Marcin Cieslak

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

Options
    • -1
    • +2
    ./WEB-INF/tags/CKEditor.tag
    • -0
    • +221
    ./ckeditor/plugins/videorecorder/VideoRecorderCKEditor.jsp
    • binary
    ./ckeditor/plugins/videorecorder/VideoRecorderCKEditor.swf
    • -0
    • +6
    ./ckeditor/plugins/videorecorder/history/history.css
    • -0
    • +662
    ./ckeditor/plugins/videorecorder/history/history.js
    • -0
    • +29
    ./ckeditor/plugins/videorecorder/history/historyFrame.html
    • binary
    ./ckeditor/plugins/videorecorder/icon.png
    • -0
    • +42
    ./ckeditor/plugins/videorecorder/lang/en.js
    • -0
    • +69
    ./ckeditor/plugins/videorecorder/plugin.js
    • -5
    • +1
    ./includes/javascript/ckconfig_custom.js
  11. … 27 more files in changeset.
Friday 22 Oct 2010
2:57 am

Marcin Cieslak

LDEV-2577, LDEV-2588: Fixed names of buttons that have changed from FCKEditor. CKEditor are hidden until they are completely initialized.

Options
    • -1
    • +1
    ./WEB-INF/tags/CKEditor.tag
    • -15
    • +26
    ./includes/javascript/ckconfig_custom.js
  3. … 23 more files in changeset.
Wednesday 20 Oct 2010
1:08 am

Andrey Balan

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

Options
    • -1
    • +5
    ./includes/javascript/pedagogicalPlanner.js
Tuesday 19 Oct 2010
4:51 am

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
    • -0
    • +15
    ./WEB-INF/tags/CKEditor.tag
    • -3
    • +4
    ./includes/javascript/ckconfig_custom.js
  3. … 6 more files in changeset.
Sunday 10 Oct 2010
8:41 pm

Marcin Cieslak

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

Options
    • -1
    • +1
    ./includes/javascript/ckconfig_custom.js
7:59 pm

Marcin Cieslak

LDEV-2577: Reaapplying changes lost in the upgrade process.

LAMS special folder management:

MAIN:fmalikoff:20080108065842

http://lamscvs.melcoe.mq.edu.au/fisheye/changelog/lams/lams_central/web/fckeditor?cs=MAIN:fmalikoff:20080108065842

MAIN:fmalikoff:20080109053946

http://lamscvs.melcoe.mq.edu.au/fisheye/changelog/lams/lams_central/web/fckeditor?cs=MAIN:fmalikoff:20080109053946

Add delete option:

MAIN:mseaton:20090209050916

http://lamscvs.melcoe.mq.edu.au/fisheye/changelog/lams/lams_central/web/fckeditor?cs=MAIN:mseaton:20090209050916

These remain unimplemented:

MAIN:ernieg:20090207003837 (not sure if the license allows that, link doesn't work anyway)

http://lamscvs.melcoe.mq.edu.au/fisheye/changelog/lams/lams_central/web/fckeditor?cs=MAIN:ernieg:20090207003837

MAIN:fmalikoff:20080104074054

http://lamscvs.melcoe.mq.edu.au/fisheye/changelog/lams/lams_central/web/fckeditor?cs=MAIN:fmalikoff:20080104074054

MAIN:ernieg:20090213103501 (not sure if the changes are still needed)

http://lamscvs.melcoe.mq.edu.au/fisheye/changelog/lams/lams_central/web/fckeditor?cs=MAIN:ernieg:20090213103501

MAIN:mseaton:20060824040139 (this change seems unnecessary, as it removes upload from from filemanager and we do support uploading)

http://lamscvs.melcoe.mq.edu.au/fisheye/changelog/lams/lams_central/web/fckeditor?cs=MAIN:mseaton:20060824040139

Options
    • -1
    • +4
    ./ckeditor/filemanager/browser/default/browser.html
    • -1
    • +2
    ./ckeditor/filemanager/browser/default/frmfolders.html
    • -4
    • +28
    ./ckeditor/filemanager/browser/default/frmresourceslist.html
    • -0
    • +1
    ./ckeditor/filemanager/browser/default/frmupload.html
    • binary
    ./ckeditor/filemanager/browser/default/images/trash.gif
7:48 pm

Marcin Cieslak

LDEV-2577: Removed quotation marks on "displayExpanded" option so it gets parsed correctly.

Options
    • -1
    • +1
    ./WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
Wednesday 06 Oct 2010
6:18 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
    • -129
    • +0
    ./WEB-INF/fckeditor/tlds/FCKeditor.tld
    • -67
    • +67
    ./WEB-INF/lams.tld
    • -216
    • +216
    ./WEB-INF/struts/struts-config.xml
    • -0
    • +53
    ./WEB-INF/tags/CKEditor.tag
    • -54
    • +0
    ./WEB-INF/tags/FCKEditor.tag
    • -0
    • +24
    ./ckeditor/.htaccess
    • -0
    • +923
    ./ckeditor/CHANGES.html
    • -0
    • +92
    ./ckeditor/INSTALL.html
    • -0
    • +1334
    ./ckeditor/LICENSE.html
    • -0
    • +6
    ./ckeditor/adapters/jquery.js
    • -0
    • +955
    ./ckeditor/ckeditor.asp
    • -0
    • +135
    ./ckeditor/ckeditor.js
    • -0
    • +211
    ./ckeditor/ckeditor.pack
    • -0
    • +29
    ./ckeditor/ckeditor.php
    • -0
    • +8
    ./ckeditor/ckeditor_basic.js
  16. … 1082 more files in changeset.
Saturday 02 Oct 2010
4:38 am

Andrey Balan

LDEV-2544 Default Timezones *merge from lams2_3_release

Options
    • -4
    • +4
    ./editprofile.jsp
  2. … 35 more files in changeset.