lams-github

lams_tool_daco

Clone Tools

Stats

Commits this week: 0
Total Committers: 18
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
Monday 08 Nov 2010
12:52 pm

Andrey Balan

LDEV-2562 Summary page in Learner shows other people's submissions now

*merge from lams2_3_release

Options
    • -4
    • +2
    ./src/java/org/lamsfoundation/lams/tool/daco/dao/DacoAnswerDAO.java
    • -8
    • +0
    ./src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoAnswerDAOHibernate.java
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/tool/daco/model/DacoAnswer.hbm.xml
    • -1
    • +7
    ./src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java
Thursday 04 Nov 2010
9:24 pm

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
3:39 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.
Thursday 21 Oct 2010
8:57 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
    • -1
    • +1
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 24 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
    • -0
    • +53
    ./web/WEB-INF/tags/CKEditor.tag
    • -54
    • +0
    ./web/WEB-INF/tags/FCKEditor.tag
    • -129
    • +0
    ./web/WEB-INF/tlds/fckeditor/FCKeditor.tld
    • -2
    • +2
    ./web/WEB-INF/tlds/lams/lams.tld
    • -8
    • +1
    ./web/WEB-INF/web.xml
    • -2
    • +1
    ./web/common/taglibs.jsp
    • -1
    • +1
    ./web/pages/authoring/basic.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/addcheckbox.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/adddate.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/adddropdown.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/addfile.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/addimage.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/addlonglat.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/addnumber.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/addradio.jsp
  16. … 1082 more files in changeset.
Thursday 18 Mar 2010
3:01 pm

Andrey Balan

LDEV-2540 removed redundant JS lines

Options
    • -6
    • +0
    ./web/pages/authoring/definelater.jsp
2:59 pm

Andrey Balan

LDEV-2540 fixed 'definelater' forward

Options
    • -1
    • +1
    ./conf/xdoclet/struts-actions.xml
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 07 Dec 2009
8:54 am

jliew

LDEV-2474 merge from branch

Options
    • -14
    • +23
    ./src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java
Wednesday 02 Dec 2009
7:02 am

jliew

LDEV-2473 merged from branch

Options
    • -5
    • +9
    ./src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoAnswerDAOHibernate.java
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/parts/questionlist.jsp
  2. … 47 more files in changeset.
Monday 09 Nov 2009
7:48 am

jliew

translation update

Options
    • -0
    • +256
    ./conf/language/lams/ApplicationResources_fr_FR.properties
  2. … 31 more files in changeset.
Monday 14 Sep 2009
7:26 am

erniegx <ernieg@gmail.com>

LDEV-2152: Changes to make it work with IE6

Options
    • -2
    • +2
    ./web/pages/learning/learning.jsp
    • -1
    • +1
    ./web/pages/learning/notebook.jsp
    • -1
    • +1
    ./web/pages/learning/runoffline.jsp
  4. … 12 more files in changeset.
Friday 28 Aug 2009
6:46 am

erniegx <ernieg@gmail.com>

Updating Japanese

Options
    • -8
    • +8
    ./conf/language/lams/ApplicationResources_ja_JP.properties
  2. … 12 more files in changeset.
Wednesday 29 Jul 2009
8:13 am

erniegx <ernieg@gmail.com>

Updating Japanese

Options
    • -65
    • +65
    ./conf/language/lams/ApplicationResources_ja_JP.properties
  2. … 22 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/fckeditorheader.jsp
    • -1
    • +0
    ./web/pages/authoring/authoring.jsp
    • -1
    • +0
    ./web/pages/authoring/definelater.jsp
  6. … 93 more files in changeset.
Monday 27 Jul 2009
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
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java
  2. … 49 more files in changeset.
Tuesday 14 Jul 2009
2:28 pm

erniegx <ernieg@gmail.com>

Adding Japanese

Options
    • -0
    • +256
    ./conf/language/lams/ApplicationResources_ja_JP.properties
  2. … 5 more files in changeset.
Tuesday 07 Jul 2009
2:52 am

jliew

change to ascii

Options
    • -4
    • +4
    ./db/clear_old_learning_session.sql
    • -896
    • +896
    ./db/model/daco.clay
    • -82
    • +82
    ./db/sql/activity_insert.sql
    • -123
    • +123
    ./db/sql/create_lams_tool_daco.sql
    • -8
    • +8
    ./db/sql/drop_lams_tool_daco.sql
    • -18
    • +18
    ./db/sql/library_insert.sql
    • -62
    • +62
    ./db/sql/tool_insert.sql
    • -17
    • +17
    ./src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20081114_updateFrom21.sql
    • -13
    • +13
    ./src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20090326_updateFrom22.sql
  10. … 41 more files in changeset.
Monday 06 Jul 2009
9:25 am

jliew

merge lams2_3 to head

Options
    • -8
    • +1
    ./web/includes/css/daco.css
  2. … 22 more files in changeset.
Sunday 05 Jul 2009
3:34 pm

erniegx <ernieg@gmail.com>

Updating Greek, English, Spanish, Maori, Norwegian

Options
    • -12
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -12
    • +12
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -12
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -9
    • +9
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_mi_NZ.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_no_NO.properties
Thursday 02 Jul 2009
3:06 pm

Marcin Cieslak

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

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/daco/service/DacoOutputFactory.java
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java
  3. … 84 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
    • -30
    • +4
    ./web/includes/css/daco.css
    • -4
    • +4
    ./web/pages/learning/learning.jsp
  3. … 166 more files in changeset.
Wednesday 01 Jul 2009
4:48 am

jliew

Merge lams2_3 into head

Options
    • -4
    • +7
    ./.classpath
    • -5
    • +6
    ./src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoAnswerDAOHibernate.java
    • -1
    • +6
    ./web/WEB-INF/web.xml
  4. … 123 more files in changeset.
Friday 17 Apr 2009
10:55 am

erniegx <ernieg@gmail.com>

Updating labels to head

Options
    • -11
    • +11
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 10 more files in changeset.
Monday 06 Apr 2009
7:09 pm

Marcin Cieslak

LDEV-2080: For all remaining tools - changed the way Hibernate properties are declared. Even for tools that did not need it the file was changed, so usage is the same everywhere.

Options
    • -2
    • +2
    ./build.xml
    • -0
    • +12
    ./conf/hibernate/mappings/hibernate.cfg.xml
    • -5
    • +0
    ./conf/hibernate/mappings/hibernate.properties
  4. … 55 more files in changeset.
Friday 03 Apr 2009
8:35 am

erniegx <ernieg@gmail.com>

Updating Greek and Maori

Options
    • -4
    • +5
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_mi_NZ.properties
  3. … 2 more files in changeset.
Monday 30 Mar 2009
11:59 pm

Marcin Cieslak

LDEV-2041: Added localised number formatting in export.

Options
    • -0
    • +22
    ./src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java
Friday 27 Mar 2009
7:26 pm

Marcin Cieslak

LDEV-2041: Added full functionality of exporting to XLS/CSV to Daco tool.

Options
    • -1
    • +1
    ./build.properties
    • -0
    • +11
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +11
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +4
    ./conf/xdoclet/struts-actions.xml
    • -7
    • +9
    ./db/sql/create_lams_tool_daco.sql
    • -0
    • +24
    ./src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20090326_updateFrom22.sql
    • -143
    • +157
    ./src/java/org/lamsfoundation/lams/tool/daco/model/DacoAnswer.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/daco/web/action/LearningAction.java
    • -1
    • +188
    ./src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java
    • -0
    • +51
    ./web/pages/export/exportToSpreadsheet.jsp
    • -0
    • +6
    ./web/pages/monitoring/summary.jsp
  13. … 3 more files in changeset.