lams-github

lams_tool_wiki

Clone Tools

Stats

Commits this week: 0
Total Committers: 20
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 21 Oct 2010
8:46 pm

Marcin Cieslak

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

Options
    • -1
    • +7
    ./web/wikilink/wikilink.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
    • -131
    • +0
    ./web/wikilink/fck_wikilink.jsp
    • -19
    • +0
    ./web/wikilink/fckplugin.js
    • -7
    • +13
    ./web/wikilink/lang/en.js
    • -0
    • +34
    ./web/wikilink/plugin.js
    • -0
    • +91
    ./web/wikilink/wikilink.js
    • -0
    • +55
    ./web/wikilink/wikilink.jsp
  7. … 2 more files in changeset.
Sunday 10 Oct 2010
1:48 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
12: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
    • -2
    • +2
    ./conf/xdoclet/servlet-mappings.xml
    • -1
    • +1
    ./conf/xdoclet/servlets.xml
    • -4
    • +0
    ./conf/xdoclet/taglibs.xml
    • -38
    • +40
    ./src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java
    • -2
    • +2
    ./test/java/org/lamsfoundation/lams/tool/wiki/selenium/TestWiki.java
    • -129
    • +0
    ./web/WEB-INF/fckeditor/tlds/FCKeditor.tld
    • -2
    • +2
    ./web/WEB-INF/lams.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.
Thursday 18 Mar 2010
1:59 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.
Monday 16 Nov 2009
3:26 am

jliew

LDEV-2459 LDEV-2462 use double quotes when enclosing i18n text in javascript

Options
    • -1
    • +1
    ./web/pages/authoring/basic.jsp
Friday 13 Nov 2009
4:14 am

jliew

LDEV-2459 use double quotes when enclosing i18n text in javascript

Options
    • -1
    • +1
    ./web/pages/authoring/advanced.jsp
    • -9
    • +9
    ./web/pages/authoring/basic.jsp
    • -11
    • +11
    ./web/pages/learning/wiki.jsp
    • -11
    • +11
    ./web/pages/monitoring/wikiDisplay.jsp
  5. … 44 more files in changeset.
Monday 09 Nov 2009
7:48 am

jliew

translation update

Options
    • -0
    • +162
    ./conf/language/lams/ApplicationResources_fr_FR.properties
  2. … 31 more files in changeset.
Wednesday 16 Sep 2009
6:39 am

erniegx <ernieg@gmail.com>

LDEV-2152: Changes to make it work with IE6

Options
    • -1
    • +1
    ./web/pages/learning/notebook.jsp
    • -2
    • +6
    ./web/pages/learning/parts/finishButton.jsp
    • -1
    • +1
    ./web/pages/learning/runOffline.jsp
Friday 04 Sep 2009
6:01 am

jliew

merge LDEV-2436 from branch

Options
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
Friday 28 Aug 2009
6:46 am

erniegx <ernieg@gmail.com>

Updating Japanese

Options
    • -10
    • +10
    ./conf/language/lams/ApplicationResources_ja_JP.properties
  2. … 12 more files in changeset.
Tuesday 04 Aug 2009
2:16 pm

Andrey Balan

LDEV-2372 modifications to selenium tests (according to the last changes in selenium core classes)

Options
    • -6
    • +4
    ./test/java/org/lamsfoundation/lams/tool/wiki/selenium/TestWiki.java
  2. … 3 more files in changeset.
Thursday 30 Jul 2009
8:23 pm

Andrey Balan

LDEV-2372 modified ant builds to support Selenium tests also added selenium server port property to common.properties

Options
    • -0
    • +30
    ./build.xml
  2. … 4 more files in changeset.
Wednesday 29 Jul 2009
8:41 am

erniegx <ernieg@gmail.com>

Updating Japanese

Options
    • -56
    • +56
    ./conf/language/lams/ApplicationResources_ja_JP.properties
  2. … 6 more files in changeset.
Tuesday 28 Jul 2009
4:20 pm

Andrey Balan

LDEV-2387 simplified rendering of FCKEditor

* removed commented JS part from FCKEditor jsp tag

* removed fckeditorheader.jsp

* got rid of any references to fckeditor.js, fckcontroller.js, fckeditor.css

Options
    • -23
    • +0
    ./web/WEB-INF/tags/FCKEditor.tag
    • -6
    • +1
    ./web/WEB-INF/tags/headItems.tag
    • -5
    • +0
    ./web/common/learnerheader.jsp
    • -1
    • +0
    ./web/pages/monitoring/headItems.jsp
  5. … 94 more files in changeset.
Monday 27 Jul 2009
11:19 pm

Andrey Balan

LDEV-2372 Testing framework * modifications to tool's Selenium tests due to the changes in core classes * Assessment and Notebook tools: tests moved to the new packages

Options
    • -26
    • +12
    ./test/java/org/lamsfoundation/lams/tool/wiki/selenium/TestWiki.java
  2. … 5 more files in changeset.
12:21 am

Marcin Cieslak

LDEV-2374: - Vote now accepts nominations created by Teacher as well as ones derived from input. - Teacher can now limit number of Learners contributing to Vote's nomination pool. - Each tool now declares which DataOutputDefinitions it can accept for Data Flow.

Options
    • -14
    • +16
    ./src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
  2. … 49 more files in changeset.
Thursday 16 Jul 2009
7:39 am

lfoxton

LDEV-2372 Adding more tests to the wiki tool

Options
    • -41
    • +150
    ./test/java/org/lamsfoundation/lams/tool/wiki/selenium/TestWiki.java
Tuesday 14 Jul 2009
2:23 pm

erniegx <ernieg@gmail.com>

Updating Japanese

Options
    • -5
    • +5
    ./conf/language/lams/ApplicationResources_ja_JP.properties
  2. … 14 more files in changeset.
6:56 am

lfoxton

LDEV-2372 Adding more tests to the wiki tool

Options
    • -1
    • +5
    ./web/WEB-INF/web.xml
3:39 am

lfoxton

LDEV-2372 Moving the wiki testing class to a more understandable classpath

Options
    • -169
    • +0
    ./test/java/org/lamsfoundation/lams/tool/selenium/TestWiki.java
    • -0
    • +180
    ./test/java/org/lamsfoundation/lams/tool/wiki/selenium/TestWiki.java
Monday 13 Jul 2009
6:39 am

lfoxton

LDEV-2372 First draft of selenium testing for wiki tool

Options
    • -1
    • +11
    ./.classpath
    • -0
    • +35
    ./.project
    • -0
    • +169
    ./test/java/org/lamsfoundation/lams/tool/selenium/TestWiki.java
Tuesday 07 Jul 2009
2:52 am

jliew

change to ascii

Options
    • -38
    • +38
    ./src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20090121_updateFrom22.sql
  2. … 49 more files in changeset.
Sunday 05 Jul 2009
3:39 pm

erniegx <ernieg@gmail.com>

Adding Japanese. Updating Greek, English, Spanish, Italian, Maori, Norwegian, Russian, Turkish

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -18
    • +18
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -9
    • +9
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -21
    • +21
    ./conf/language/lams/ApplicationResources_it_IT.properties
    • -0
    • +162
    ./conf/language/lams/ApplicationResources_ja_JP.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_mi_NZ.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_ru_RU.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_tr_TR.properties
Thursday 02 Jul 2009
3:06 pm

Marcin Cieslak

LDEV-2374: Data flow between tools: framework and example for Q&A -> Vote.

Options
    • -0
    • +1
    ./.classpath
    • -17
    • +23
    ./src/java/org/lamsfoundation/lams/tool/wiki/service/WikiOutputFactory.java
    • -62
    • +56
    ./src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
  4. … 83 more files in changeset.
11:59 am

jliew

more merging lams2_3 into head

Options
    • -5
    • +5
    ./src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20090121_updateFrom22.sql
  2. … 32 more files in changeset.
10:19 am

jliew

Merge lams2_3 to head (including things not merged last time due to eclipse's merge wizard not handling the lams2_3 start point as expected)

Options
    • -1
    • +5
    ./conf/xdoclet/web-settings.xml
    • -5
    • +5
    ./db/sql/create_lams_tool_wiki.sql
    • -4
    • +0
    ./web/pages/wiki/compare.jsp
    • -5
    • +1
    ./web/pages/wiki/viewWiki.jsp
  5. … 164 more files in changeset.
Wednesday 01 Jul 2009
4:19 pm

Marcin Cieslak

Added missing library and fixed classpaths - changes needed after code merge.

Options
    • -4
    • +1
    ./.classpath
  2. … 17 more files in changeset.
4:48 am

jliew

Merge lams2_3 into head

Options
    • -4
    • +45
    ./src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiDAO.java
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
  3. … 124 more files in changeset.
Monday 20 Apr 2009
8:00 am

ruslan

LDEV-2225: Wiki monitor page now using appropriate CSS

Options
    • -1
    • +1
    ./web/layouts/defaultLayout.jsp