lams-github

Clone Tools

Stats

Commits this week: 0
Total Committers: 50
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 22 Dec 2011
6:04 am

Andrey Balan

LDEV-2732 * adjusted assessment's CKEditor width to let it fit * moved css parameters to separate .css file

Options
    • -0
    • +6
    /lams_tool_assessment/web/includes/css/addQuestion.css
    • -7
    • +2
    /lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
    • -7
    • +2
    /lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp
    • -7
    • +2
    /lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
    • -7
    • +2
    /lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp
    • -7
    • +2
    /lams_tool_assessment/web/pages/authoring/parts/addordering.jsp
    • -7
    • +2
    /lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp
    • -7
    • +2
    /lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp
    • -2
    • +2
    /lams_tool_assessment/web/pages/authoring/parts/matchingpairoption.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/parts/numericaloption.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/parts/option.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/parts/orderingoption.jsp
    • -2
    • +2
    /lams_tool_assessment/web/pages/authoring/parts/shortansweroption.jsp
Tuesday 20 Dec 2011
4:21 pm

Marcin Cieslak

LDEV-2743: Change the way the function opening dialog gets registered in setup process.

Plugins Paint, MoviePlayer and WikiLink were bidning to their commands functions with the same name, causing clash and incorrect registration of one function to multiple plugins.

The function was removed from each Tool and an anonymous function was used instead.

Options
    • -5
    • +13
    /lams_central/web/ckeditor/plugins/movieplayer/plugin.js
    • -10
    • +13
    /lams_central/web/ckeditor/plugins/paint/plugin.js
    • -9
    • +14
    /lams_tool_wiki/web/wikilink/plugin.js
2:20 pm

Marcin Cieslak

LDEV-2746: Reapply changes made to previous 3.4.2 version: Add custom configuration file.

Changed position of dialogs from "fixed" to "absolute" to display them properly in iframes.

http://code.lamsfoundation.org/fisheye/changelog/lams/lams_central/web/ckeditor?cs=MAIN:marcin:20101027185233

Change link default target:

http://code.lamsfoundation.org/fisheye/changelog/lams/lams_central/web/ckeditor?cs=MAIN:marcin:20101006100917

Options
    • -1
    • +1
    /lams_central/web/ckeditor/ckeditor.js
    • -1
    • +3
    /lams_central/web/ckeditor/config.js
    • -2
    • +2
    /lams_central/web/ckeditor/plugins/link/dialogs/link.js
1:56 pm

Marcin Cieslak

LDEV-2746: Unmodified CKEditor version 3.6.2 with filemanager, movieplayer, videorecorder, pain and equation copied from previous version.

Options
    • -1
    • +1
    /lams_central/web/ckeditor/.htaccess
    • -10
    • +520
    /lams_central/web/ckeditor/CHANGES.html
    • -2
    • +2
    /lams_central/web/ckeditor/INSTALL.html
    • -10
    • +3
    /lams_central/web/ckeditor/LICENSE.html
    • -2
    • +2
    /lams_central/web/ckeditor/adapters/jquery.js
    • -4
    • +4
    /lams_central/web/ckeditor/ckeditor.asp
    • -131
    • +145
    /lams_central/web/ckeditor/ckeditor.js
    • -10
    • +10
    /lams_central/web/ckeditor/ckeditor.pack
    • -1
    • +1
    /lams_central/web/ckeditor/ckeditor.php
    • -4
    • +4
    /lams_central/web/ckeditor/ckeditor_basic.js
    • -2
    • +2
    /lams_central/web/ckeditor/ckeditor_basic_source.js
    • -54
    • +27
    /lams_central/web/ckeditor/ckeditor_php4.php
    • -53
    • +26
    /lams_central/web/ckeditor/ckeditor_php5.php
    • -4
    • +14
    /lams_central/web/ckeditor/ckeditor_source.js
    • -3
    • +1
    /lams_central/web/ckeditor/config.js
  16. … 144 more files in changeset.
Monday 19 Dec 2011
3:39 pm

Marcin Cieslak

LDEV-2732: Expand Vote Nomination CKEditor instance horizontally so it does show strange icons when shrinked.

Options
    • -1
    • +1
    /lams_tool_vote/web/authoring/BasicContent.jsp
    • -1
    • +0
    /lams_tool_vote/web/authoring/editNominationBox.jsp
    • -1
    • +0
    /lams_tool_vote/web/authoring/newNominationBox.jsp
3:30 pm

Marcin Cieslak

LDEV-2732: Copy the modified CKEditor tag to all Tools.

Options
    • -0
    • +13
    /lams_admin/web/WEB-INF/tags/CKEditor.tag
    • -0
    • +13
    /lams_gradebook/web/WEB-INF/tags/CKEditor.tag
    • -0
    • +13
    /lams_learning/web/WEB-INF/tags/CKEditor.tag
    • -0
    • +13
    /lams_monitoring/web/WEB-INF/tags/CKEditor.tag
    • -0
    • +13
    /lams_openid/web/WEB-INF/tags/CKEditor.tag
    • -0
    • +13
    /lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag
    • -0
    • +13
    /lams_tool_bbb/web/WEB-INF/tags/CKEditor.tag
    • -0
    • +13
    /lams_tool_chat/web/WEB-INF/tags/CKEditor.tag
    • -0
    • +13
    /lams_tool_daco/web/WEB-INF/tags/CKEditor.tag
    • -0
    • +13
    /lams_tool_dimdim/web/WEB-INF/tags/CKEditor.tag
    • -0
    • +13
    /lams_tool_eadventure/web/WEB-INF/tags/CKEditor.tag
    • -0
    • +13
    /lams_tool_forum/web/WEB-INF/tags/CKEditor.tag
    • -0
    • +13
    /lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag
    • -0
    • +13
    /lams_tool_images/web/WEB-INF/tags/CKEditor.tag
    • -0
    • +13
    /lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag
  16. … 14 more files in changeset.
2:27 pm

Marcin Cieslak

LDEV-2739: Upgrade FCKEditor references to new CKEditor 3.x.

Options
    • -24
    • +39
    /lams_tool_bbb/web/WEB-INF/lams.tld
    • -8
    • +8
    /lams_tool_bbb/web/WEB-INF/web.xml
Friday 16 Dec 2011
9:20 pm

erniegx <ernieg@gmail.com>

LDEV-2741: One missing bit

Options
    • -7
    • +12
    /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
6:30 pm

Marcin Cieslak

LDEV-2741: Encode Organisation name before adding them as a javascript function parameter. For some reason the name needs to be encoded twice on Java side so it is encoded on JSP page as well.

Options
    • -20
    • +37
    /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
6:21 pm

Marcin Cieslak

LDEV-2738: Encode pixlrURL before setting as attribute.

Options
    • -1
    • +1
    /lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java
5:37 am

Marcin Cieslak

LDEV-2732: Add a new attribute in CKEditor tag which updates parent frame height to fit whole of its contents.

Options
    • -0
    • +13
    /lams_central/web/WEB-INF/tags/CKEditor.tag
    • -0
    • +13
    /lams_tool_vote/web/WEB-INF/tags/CKEditor.tag
    • -1
    • +4
    /lams_tool_vote/web/authoring/editNominationBox.jsp
    • -11
    • +3
    /lams_tool_vote/web/authoring/newNominationBox.jsp
2:37 am

erniegx <ernieg@gmail.com>

LDEV-2742: adding default avatar for users

Options
    • -0
    • +6
    /lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/util/WookieUtil.java
Thursday 15 Dec 2011
4:40 pm

Marcin Cieslak

LDEV-2671: Removing corrupted and unnecessary GIF icon.

Options
    • binary
    /lams_tool_bbb/web/images/success.gif
4:39 pm

Marcin Cieslak

LDEV-2739: Change the field name the servlet is looking for when uploading a file. Old FCKEditor seemed to use "NewFile", new CKEditor uses hardcoded "upload" name.

Options
    • -0
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java
5:46 am

Marcin Cieslak

LDEV-2739: Upgrade FCKEditor references to new CKEditor 3.x.

Options
    • -25
    • +36
    /lams_tool_wookie/web/WEB-INF/lams.tld
    • -77
    • +0
    /lams_tool_wookie/web/WEB-INF/tags/FCKEditor.tag
5:41 am

Marcin Cieslak

LDEV-2737: Fix BBB classpath to work with JBoss 5.

Options
    • -4
    • +11
    /lams_tool_bbb/.classpath
5:39 am

Marcin Cieslak

LDEV-2671: Removing corrupted PNG icon.

Options
    • binary
    /lams_tool_bbb/web/images/icon_bbb.png
Wednesday 14 Dec 2011
4:32 pm

Marcin Cieslak

LDEV-2739: Upgrade FCKEditor references to new CKEditor 3.x. Remove unnecessary CSS and JS files.

Options
    • -55
    • +0
    /lams_central/web/css/ckeditor_style.css
    • -211
    • +0
    /lams_central/web/includes/javascript/ckcontroller.js
    • -1
    • +1
    /lams_tool_assessment/web/WEB-INF/web.xml
    • -2
    • +2
    /lams_tool_bbb/conf/xdoclet/servlet-mappings.xml
    • -1
    • +1
    /lams_tool_bbb/conf/xdoclet/servlets.xml
    • -5
    • +0
    /lams_tool_bbb/conf/xdoclet/taglibs.xml
    • -129
    • +0
    /lams_tool_bbb/web/WEB-INF/fckeditor/tlds/FCKeditor.tld
    • -1
    • +14
    /lams_tool_bbb/web/WEB-INF/tags/AuthoringButton.tag
    • -0
    • +75
    /lams_tool_bbb/web/WEB-INF/tags/CKEditor.tag
    • -1
    • +1
    /lams_tool_bbb/web/WEB-INF/tags/Passon.tag
    • -4
    • +3
    /lams_tool_bbb/web/WEB-INF/tags/TabName.tag
    • -0
    • +136
    /lams_tool_bbb/web/WEB-INF/tags/TextSearch.tag
    • -6
    • +1
    /lams_tool_bbb/web/WEB-INF/tags/headItems.tag
    • -4
    • +0
    /lams_tool_bbb/web/common/simpleHeader.jsp
    • -2
    • +1
    /lams_tool_bbb/web/common/taglibs.jsp
  16. … 18 more files in changeset.
3:47 pm

Marcin Cieslak

LDEV-2737: Fix Eadventure project name.

Options
    • -1
    • +1
    /lams_tool_eadventure/.project
3:13 pm

Marcin Cieslak

LDEV-2739: Upgrade FCKEditor references to new CKEditor 3.x.

Options
    • -11
    • +16
    /lams_tool_eadventure/web/WEB-INF/tags/AuthoringButton.tag
    • -0
    • +75
    /lams_tool_eadventure/web/WEB-INF/tags/CKEditor.tag
    • -54
    • +0
    /lams_tool_eadventure/web/WEB-INF/tags/FCKEditor.tag
    • -1
    • +1
    /lams_tool_eadventure/web/WEB-INF/tags/Passon.tag
    • -4
    • +3
    /lams_tool_eadventure/web/WEB-INF/tags/TabName.tag
    • -0
    • +136
    /lams_tool_eadventure/web/WEB-INF/tags/TextSearch.tag
    • -129
    • +0
    /lams_tool_eadventure/web/WEB-INF/tlds/fckeditor/FCKeditor.tld
    • -29
    • +39
    /lams_tool_eadventure/web/WEB-INF/tlds/lams/lams.tld
    • -7
    • +0
    /lams_tool_eadventure/web/WEB-INF/web.xml
    • -1
    • +0
    /lams_tool_eadventure/web/common/taglibs.jsp
    • -1
    • +1
    /lams_tool_eadventure/web/pages/authoring/authoring.jsp
    • -2
    • +2
    /lams_tool_eadventure/web/pages/authoring/basic.jsp
    • -1
    • +1
    /lams_tool_eadventure/web/pages/authoring/definelater.jsp
    • -7
    • +7
    /lams_tool_eadventure/web/pages/authoring/pedagogicalPlannerForm.jsp
    • -2
    • +15
    /lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag
  16. … 15 more files in changeset.
3:08 pm

Marcin Cieslak

LDEV-2737: Add unusual package path of .hbm files of Eadventure Tool.

Options
    • -257
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
Tuesday 13 Dec 2011
5:54 am

Andrey Balan

WVI-20 Server-to-server calls between StepWise Aup and Lams

*merge from lams2_3_release

Options
    • -0
    • +480
    /lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterAction.java
Monday 12 Dec 2011
5:21 pm

Marcin Cieslak

LDEV-2737: Change Eadventure web.xml file to comply with LAMS 2.4 Tool Application Context discovery mechanism. Add missing abstract methods implementation. Remove several libraries as they interfere with endorsed XML libraries on JBoss 5.

Options
    • -12
    • +8
    /lams_tool_eadventure/.classpath
    • -3
    • +0
    /lams_tool_eadventure/build.xml
    • binary
    /lams_tool_eadventure/lib/jaxen/sax.jar
    • binary
    /lams_tool_eadventure/lib/jaxen/saxpath.jar
    • binary
    /lams_tool_eadventure/lib/reload_2_0_1/jdom.jar
    • binary
    /lams_tool_eadventure/lib/reload_2_0_1/moonunitsrc.jar
    • binary
    /lams_tool_eadventure/lib/reload_2_0_1/reload-diva.jar
    • binary
    /lams_tool_eadventure/lib/reload_2_0_1/reload-editor.jar
    • binary
    /lams_tool_eadventure/lib/reload_2_0_1/xml-apis.jar
    • -50
    • +55
    /lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureOutputFactory.java
    • -15
    • +13
    /lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java
    • -6
    • +3
    /lams_tool_eadventure/web/WEB-INF/web.xml
4:52 pm

Marcin Cieslak

LDEV-2735: Add specific package path for Eadventure tool.

Options
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml
5:30 am

erniegx <ernieg@gmail.com>

Commiting eadventure tool to HEAD

Options
    • -0
    • +26
    /lams_tool_eadventure/.classpath
    • -0
    • +3
    /lams_tool_eadventure/.cvsignore
    • -0
    • +43
    /lams_tool_eadventure/.project
    • -0
    • +60
    /lams_tool_eadventure/axisclient.properties
    • -0
    • +71
    /lams_tool_eadventure/axisservice.properties
    • -0
    • +25
    /lams_tool_eadventure/build.properties
    • -0
    • +509
    /lams_tool_eadventure/build.xml
    • -0
    • +1
    /lams_tool_eadventure/conf/hibernate/mappings/.cvsignore
    • -0
    • +13
    /lams_tool_eadventure/conf/hibernate/mappings/hibernate.cfg.xml
    • -0
    • +4
    /lams_tool_eadventure/conf/jar/META-INF/MANIFEST.MF
    • -0
    • +222
    /lams_tool_eadventure/conf/language/lams/ApplicationResources.properties
    • -0
    • +222
    /lams_tool_eadventure/conf/language/lams/ApplicationResources_el_GR.properties
    • -0
    • +222
    /lams_tool_eadventure/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +222
    /lams_tool_eadventure/conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +222
    /lams_tool_eadventure/conf/language/lams/ApplicationResources_es_MX.properties
  16. … 239 more files in changeset.
Sunday 11 Dec 2011
4:51 am

Marcin Cieslak

LDEV-2737: Change Tools' web.xml files to comply with LAMS 2.4 Tool Application Context discovery mechanism. Add missing abstract methods implementation. Remove several libraries as they interfere with endorsed XML libraries on JBoss 5.

Options
    • -1
    • +5
    /lams_tool_bbb/conf/xdoclet/web-settings.xml
    • -1
    • +6
    /lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java
    • -14
    • +13
    /lams_tool_imscc/.classpath
    • -3
    • +0
    /lams_tool_imscc/build.xml
    • binary
    /lams_tool_imscc/lib/jaxen/jaxen-full.jar
    • binary
    /lams_tool_imscc/lib/jaxen/sax.jar
    • binary
    /lams_tool_imscc/lib/jaxen/saxpath.jar
    • binary
    /lams_tool_imscc/lib/reload_2_0_1/castor-0.9.5.3-xml.jar
    • binary
    /lams_tool_imscc/lib/reload_2_0_1/jdom.jar
    • binary
    /lams_tool_imscc/lib/reload_2_0_1/moonunitsrc.jar
    • binary
    /lams_tool_imscc/lib/reload_2_0_1/reload-diva.jar
    • binary
    /lams_tool_imscc/lib/reload_2_0_1/reload-editor.jar
    • binary
    /lams_tool_imscc/lib/reload_2_0_1/xercesImpl.jar
    • -1
    • +6
    /lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java
    • -22
    • +27
    /lams_tool_imscc/web/WEB-INF/web.xml
4:28 am

Marcin Cieslak

LDEV-2736: Remove patch upgrading to 20090726 version and move its contents to patch upgrading to 20110509 (LAMS 2.4), as these updates are needed for version higher than 20100309 (LAMS 2.3.5).

Options
    • -16
    • +0
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20090726_updateFrom23.sql
    • -0
    • +4
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20110509_updateTo236.sql
Saturday 10 Dec 2011
6:16 am

Andrey Balan

LDEV-2657 including jquery.js before monitorToolSummaryAdvanced.js

Options
    • -4
    • +4
    /lams_tool_sbmt/web/monitoring/parts/summary.jsp
Thursday 08 Dec 2011
4:33 pm

Marcin Cieslak

LDEV-2733: Removing patched 01, 03 and 05 as mentioned in previous JIRA comments. Removing only some parts of 06 script.

Options
    • -32
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040001.sql
    • -17
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040003.sql
    • -8
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040005.sql
    • -80
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040006.sql
3:23 am

Andrey Balan

LDEV-2717 Added passing mark feature to assessment tool

*merge from lams2_3_release

Options
    • -0
    • +1
    /lams_tool_assessment/db/sql/create_lams_tool_assessment.sql
    • -0
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20110413_updateTo236.sql
    • -0
    • +8
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml
    • -0
    • +16
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -0
    • +27
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -0
    • +7
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.java
    • -2
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -3
    • +10
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -2
    • +41
    /lams_tool_assessment/web/pages/authoring/advance.jsp
    • -0
    • +22
    /lams_tool_assessment/web/pages/authoring/basic.jsp
    • -4
    • +14
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -0
    • +17
    /lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp