lams

lams_tool_wiki

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 11
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 31,832
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
Sunday 03 Jul 2011
3:30 am

Andrey Balan

LDEV-2664 LearnerFlashEnabled.tag has been reimplemented as Java class

(this is done in order to prevent updating list of mobile devices in all modules )

Options
    • -4
    • +9
    ./web/WEB-INF/lams.tld
    • -52
    • +0
    ./web/WEB-INF/tags/LearnerFlashEnabled.tag
  3. … 59 more files in changeset.
Friday 01 Jul 2011
1:01 am

Andrey Balan

LDEV-2664 check for mobile devices in LearnerFlashEnabled.tag

*merge from HEAD

Options
    • -3
    • +10
    ./web/WEB-INF/tags/LearnerFlashEnabled.tag
  2. … 26 more files in changeset.
Thursday 30 Jun 2011
11:28 pm

Andrey Balan

LDEV-2664 update LearnerFlashEnabled tag with detecting mobile devices

Options
    • -1
    • +9
    ./web/WEB-INF/tags/LearnerFlashEnabled.tag
  2. … 24 more files in changeset.
Monday 23 May 2011
2:48 pm

Ernie Ghiglione

Updating Norwegian

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_no_NO.properties
  2. … 6 more files in changeset.
Monday 04 Apr 2011
8:31 am

Ernie Ghiglione

Updating Norwegian

Options
    • -9
    • +9
    ./conf/language/lams/ApplicationResources_no_NO.properties
  2. … 7 more files in changeset.
Wednesday 16 Feb 2011
4:37 am

Andrey Balan

LDEV-1730 If Tool is not group do now show the group reference

Options
    • -1
    • +9
    ./src/java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java
    • -1
    • +5
    ./src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java
    • -1
    • +4
    ./src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java
    • -9
    • +11
    ./web/pages/monitoring/statistics.jsp
    • -3
    • +5
    ./web/pages/monitoring/wikiDisplay.jsp
Sunday 13 Feb 2011
2:53 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
    • -29
    • +5
    ./src/java/org/lamsfoundation/lams/tool/wiki/web/actions/PedagogicalPlannerAction.java
    • -1
    • +1
    ./web/pages/authoring/pedagogicalPlannerForm.jsp
  3. … 24 more files in changeset.
Sunday 12 Dec 2010
10:29 pm

Marcin Cieslak

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

Options
    • -7
    • +14
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
Monday 06 Dec 2010
4:48 am

Marcin Cieslak

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

Options
    • -1
    • +1
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
Wednesday 24 Nov 2010
2:34 am

Marcin Cieslak

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

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

Marcin Cieslak

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

Options
    • -0
    • +4
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
Saturday 20 Nov 2010
4:03 am

Ernie Ghiglione

LDEV-2598: Updating Norwegian

Options
    • -4
    • +4
    ./conf/language/lams/ApplicationResources_no_NO.properties
  2. … 1 more file in changeset.
Thursday 18 Nov 2010
6:19 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/WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
Friday 12 Nov 2010
10:34 pm

Ernie Ghiglione

LDEV-2598: Updating Norwegian, Maori

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_mi_NZ.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_no_NO.properties
Sunday 07 Nov 2010
7:22 pm

Ernie Ghiglione

LDEV-2598: English, Maori

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_mi_NZ.properties
5:22 pm

Marcin Cieslak

LDEV-2577: Removed some unnecessary code.

Options
    • -2
    • +1
    ./web/wikilink/plugin.js
Friday 05 Nov 2010
4:22 am

Marcin Cieslak

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

Options
    • -17
    • +27
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 28 more files in changeset.
Sunday 24 Oct 2010
9:36 pm

Marcin Cieslak

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

Options
    • -1
    • +2
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 36 more files in changeset.
Friday 22 Oct 2010
2:50 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/WEB-INF/tags/CKEditor.tag
  2. … 25 more files in changeset.
2:46 am

Marcin Cieslak

LDEV-2577: Workaround for Firefox limitation of inserting malicious HTML.

Options
    • -1
    • +7
    ./web/wikilink/wikilink.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
    • -131
    • +0
    ./web/wikilink/fck_wikilink.jsp
    • -19
    • +0
    ./web/wikilink/fckplugin.js
    • -0
    • +34
    ./web/wikilink/plugin.js
    • -0
    • +91
    ./web/wikilink/wikilink.js
    • -0
    • +55
    ./web/wikilink/wikilink.jsp
    • -7
    • +13
    ./web/wikilink/lang/en.js
  7. … 2 more files in changeset.
Sunday 10 Oct 2010
7:46 pm

Marcin Cieslak

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

Options
    • -1
    • +1
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
Wednesday 06 Oct 2010
6: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
    • -2
    • +2
    ./conf/xdoclet/servlet-mappings.xml
    • -1
    • +1
    ./conf/xdoclet/servlets.xml
    • -4
    • +0
    ./conf/xdoclet/taglibs.xml
    • -39
    • +41
    ./src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java
    • -2
    • +2
    ./test/java/org/lamsfoundation/lams/tool/wiki/selenium/TestWiki.java
    • -2
    • +2
    ./web/WEB-INF/lams.tld
    • -129
    • +0
    ./web/WEB-INF/fckeditor/tlds/FCKeditor.tld
    • -30
    • +30
    ./web/WEB-INF/struts/struts-config.xml
    • -0
    • +53
    ./web/WEB-INF/tags/CKEditor.tag
    • -54
    • +0
    ./web/WEB-INF/tags/FCKEditor.tag
    • -1
    • +0
    ./web/common/taglibs.jsp
    • -2
    • +3
    ./web/includes/javascript/wikiCommon.js
    • -1
    • +1
    ./web/pages/authoring/advanced.jsp
    • -19
    • +19
    ./web/pages/authoring/basic.jsp
    • -6
    • +6
    ./web/pages/authoring/pedagogicalPlannerForm.jsp
  16. … 1082 more files in changeset.
Friday 16 Apr 2010
3:05 pm

Ernie Ghiglione

Adding Spanish (Mexico), Updating German, Greek, English, Spanish (Spain), French, Italian, Japanese, Korean, Norwegian, Russian, Turkish

Options
    • -123
    • +123
    ./conf/language/lams/ApplicationResources.properties
    • -122
    • +122
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -122
    • +122
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -123
    • +123
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -123
    • +123
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +162
    ./conf/language/lams/ApplicationResources_es_MX.properties
    • -122
    • +122
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -122
    • +122
    ./conf/language/lams/ApplicationResources_it_IT.properties
    • -122
    • +122
    ./conf/language/lams/ApplicationResources_ja_JP.properties
    • -122
    • +122
    ./conf/language/lams/ApplicationResources_ko_KR.properties
    • -122
    • +122
    ./conf/language/lams/ApplicationResources_mi_NZ.properties
    • -122
    • +122
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -122
    • +122
    ./conf/language/lams/ApplicationResources_ru_RU.properties
    • -122
    • +122
    ./conf/language/lams/ApplicationResources_tr_TR.properties
3:03 pm

Ernie Ghiglione

file ApplicationResources_es_MX.properties was initially added on branch lams2_3_release.

Options
    • -0
    • +0
    ./conf/language/lams/ApplicationResources_es_MX.properties
  2. … 2 more files in changeset.
Thursday 18 Mar 2010
8:58 pm

Andrey Balan

LDEV-2329 When editing in monitor if press the "Cancel" button, the define_later flag *does* get removed.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/AuthoringButton.tag
  2. … 28 more files in changeset.
8:13 pm

Andrey Balan

LDEV-2329 When editing in monitor if press the "Cancel" button, the define_later flag *does* get removed.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/AuthoringButton.tag
  2. … 28 more files in changeset.
Wednesday 03 Mar 2010
2:57 pm

Ernie Ghiglione

Adding German

Options
    • -0
    • +162
    ./conf/language/lams/ApplicationResources_de_DE.properties
2:54 pm

Ernie Ghiglione

Updating translations for LAMS 2.3.4

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +4
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_it_IT.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_ja_JP.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_ko_KR.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_mi_NZ.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_ru_RU.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_tr_TR.properties
  13. … 27 more files in changeset.
Friday 19 Feb 2010
12:57 pm

Ernie Ghiglione

LDEV-2514: updating all labels for 2.3.4 release

Options
    • -122
    • +122
    ./conf/language/lams/ApplicationResources.properties
    • -127
    • +127
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -122
    • +122
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -121
    • +121
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -129
    • +129
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -130
    • +130
    ./conf/language/lams/ApplicationResources_it_IT.properties
    • -131
    • +131
    ./conf/language/lams/ApplicationResources_ja_JP.properties
    • -123
    • +123
    ./conf/language/lams/ApplicationResources_ko_KR.properties
    • -126
    • +126
    ./conf/language/lams/ApplicationResources_mi_NZ.properties
    • -127
    • +127
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -130
    • +130
    ./conf/language/lams/ApplicationResources_ru_RU.properties
    • -130
    • +130
    ./conf/language/lams/ApplicationResources_tr_TR.properties
  13. … 88 more files in changeset.