lams-github

lams_gradebook

Clone Tools

Stats

Commits this week: 0
Total Committers: 17
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 12 Dec 2010
3:31 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.
Sunday 05 Dec 2010
9:52 pm

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.
Tuesday 23 Nov 2010
7:36 pm

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
8:13 am

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.
Wednesday 17 Nov 2010
11:28 pm

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.
Monday 08 Nov 2010
12:28 pm

Andrey Balan

LDEV-2597 added Ability to export course gradebook into excel

*merge from lams2_3_release

Options
    • -0
    • +46
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java
    • -0
    • +36
    ./src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java
    • -0
    • +7
    ./web/gradebookCourseMonitor.jsp
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:52 pm

Marcin Cieslak

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

Options
    • -1
    • +1
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 3 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
    • -1
    • +1
    ./conf/xdoclet/servlet-mappings.xml
    • -8
    • +0
    ./conf/xdoclet/taglibs.xml
    • -129
    • +0
    ./web/WEB-INF/fckeditor/tlds/FCKeditor.tld
    • -2
    • +2
    ./web/WEB-INF/lams.tld
    • -0
    • +53
    ./web/WEB-INF/tags/CKEditor.tag
    • -54
    • +0
    ./web/WEB-INF/tags/FCKEditor.tag
  7. … 1091 more files in changeset.
Wednesday 19 May 2010
1:21 am

lfoxton

SIF-10 Adding date to lesson for release date of marks. So it can be used for sif publisher

Options
    • -277
    • +283
    ./src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java
  2. … 3 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.
Friday 13 Nov 2009
4:14 am

jliew

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

Options
    • -19
    • +19
    ./web/gradebookCourseLearner.jsp
    • -12
    • +12
    ./web/gradebookCourseMonitor.jsp
    • -36
    • +36
    ./web/gradebookMonitor.jsp
    • -12
    • +12
    ./web/includes/jsp/jqGridIncludes.jsp
  5. … 44 more files in changeset.
Monday 09 Nov 2009
7:48 am

jliew

translation update

Options
    • -0
    • +77
    ./conf/language/lams/ApplicationResources_fr_FR.properties
  2. … 31 more files in changeset.
Wednesday 29 Jul 2009
8:41 am

erniegx <ernieg@gmail.com>

Updating Japanese

Options
    • -10
    • +10
    ./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
  3. … 96 more files in changeset.
Thursday 16 Jul 2009
5:59 am

lfoxton

LDEV-2386 Fixing null pointer problem with gradebook caused by pre 2.3 lessons having their gradebook exported

Options
    • -4
    • +7
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
Monday 06 Jul 2009
9:25 am

jliew

merge lams2_3 to head

Options
    • -0
    • +2
    ./build.xml
    • -5
    • +13
    ./src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -3
    • +7
    ./src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java
    • -24
    • +109
    ./src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
    • -4
    • +19
    ./web/gradebookCourseLearner.jsp
    • -27
    • +28
    ./web/gradebookCourseMonitor.jsp
    • -127
    • +139
    ./web/includes/jsp/jqGridIncludes.jsp
  9. … 15 more files in changeset.
Sunday 05 Jul 2009
3:44 pm

erniegx <ernieg@gmail.com>

Adding Japanese. Updating Greek, English, Spanish, Norwegian

Options
    • -10
    • +27
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +26
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -10
    • +27
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -16
    • +16
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +77
    ./conf/language/lams/ApplicationResources_ja_JP.properties
    • -2
    • +26
    ./conf/language/lams/ApplicationResources_no_NO.properties
Friday 03 Jul 2009
7:02 am

jliew

Merge lams2_3 to head (continuing...)

Options
    • -0
    • +77
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +62
    ./conf/language/lams/ApplicationResources_ru_RU.properties
    • -1
    • +10
    ./web/WEB-INF/web.xml
  4. … 48 more files in changeset.
Thursday 02 Jul 2009
3:06 pm

Marcin Cieslak

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

Options
    • -74
    • +67
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
  2. … 85 more files in changeset.
11:59 am

jliew

more merging lams2_3 into head

Options
    • -0
    • +4
    ./web/WEB-INF/applicationContext.xml
    • -5
    • +0
    ./web/WEB-INF/web.xml
  3. … 31 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
    • -9
    • +8
    ./src/java/org/lamsfoundation/lams/gradebook/dto/GradebookGridRowDTO.java
  2. … 167 more files in changeset.
Wednesday 01 Jul 2009
4:48 am

jliew

Merge lams2_3 into head

Options
    • -5
    • +3
    ./.classpath
    • -1
    • +5
    ./conf/xdoclet/web-settings.xml
    • -0
    • +54
    ./src/java/org/lamsfoundation/lams/gradebook/dto/ExcelCell.java
    • -31
    • +98
    ./src/java/org/lamsfoundation/lams/gradebook/dto/GradebookGridRowDTO.java
    • -17
    • +15
    ./src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml
    • -32
    • +400
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -1
    • +83
    ./src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java
    • -3
    • +105
    ./src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
    • -25
    • +54
    ./src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java
    • -1
    • +1
    ./web/WEB-INF/jboss-web.xml
    • -51
    • +165
    ./web/gradebookMonitor.jsp
  12. … 115 more files in changeset.
Monday 20 Apr 2009
2:10 am

lfoxton

Merging lams_gradebook changes with head

LDEV-2213

LDEV-2214

LDEV-2212

LDEV-2207

Options
    • -1
    • +11
    ./src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/gradebook/dto/GradebookGridRowDTO.java
    • -2
    • +8
    ./src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBIDComparator.java
    • -3
    • +12
    ./src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBStartDateComparator.java
    • -19
    • +88
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java
    • -3
    • +17
    ./src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
    • -27
    • +62
    ./src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java
    • -1
    • +1
    ./web/gradebookCourseMonitor.jsp
    • -2
    • +61
    ./web/gradebookMonitor.jsp
Friday 17 Apr 2009
10:40 am

erniegx <ernieg@gmail.com>

Adding Norwegian and Greek updating ENglish

Options
    • -7
    • +16
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +53
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -6
    • +15
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +53
    ./conf/language/lams/ApplicationResources_no_NO.properties
Wednesday 15 Apr 2009
9:42 am

lfoxton

Merging to head

LDEV-2214 Adding sorting algorithm so activities are sorted by start date in gradebook if the learner has attempted them

Options
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -0
    • +59
    ./src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBStartDateComparator.java
    • -1
    • +6
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
    • -1
    • +0
    ./web/gradebookCourseLearner.jsp
    • -1
    • +0
    ./web/gradebookMonitor.jsp
7:48 am

lfoxton

Merging with head

LDEV-2189 Making links to learner only appear when the user has attempted or finished the activity. Also, tooloutputs are only fetched when the same criteria is fulfulled

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
    • -14
    • +20
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -1
    • +1
    ./web/gradebookCourseLearner.jsp
Tuesday 14 Apr 2009
8:12 am

lfoxton

LDEV-2212 displaying the appropriate lessons in the course views only if the user has permission

Options
    • -0
    • +8
    ./conf/xdoclet/web-security.xml
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml
    • -49
    • +66
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookLearningAction.java
    • -0
    • +8
    ./web/WEB-INF/web.xml
  6. … 1 more file in changeset.