lams / lams_common / src

java

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 22
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 81,741
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
Friday 15 Oct 2010
7:03 pm

Andrey Balan

LDEV-2509 Embedded SMTP server

*Merge from HEAD

Options
    • -0
    • +4
    ./org/lamsfoundation/lams/dbupdates/patch02030500.sql
    • -1
    • +3
    ./org/lamsfoundation/lams/util/ConfigurationKeys.java
  3. … 16 more files in changeset.
Wednesday 06 Oct 2010
12: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
    ./org/lamsfoundation/lams/util/WebUtil.java
  2. … 1096 more files in changeset.
Monday 04 Oct 2010
5:27 pm

Andrey Balan

LDEV-2550 Developed new event logging mechanism

*merge from lams2_3_release

Options
    • -0
    • +26
    ./org/lamsfoundation/lams/commonContext.xml
    • -0
    • +35
    ./org/lamsfoundation/lams/dbupdates/patch02040006.sql
    • -0
    • +157
    ./org/lamsfoundation/lams/logevent/LogEvent.java
    • -0
    • +70
    ./org/lamsfoundation/lams/logevent/dao/ILogEventDAO.java
    • -0
    • +71
    ./org/lamsfoundation/lams/logevent/dao/hibernate/LogEventDAO.java
    • -0
    • +71
    ./org/lamsfoundation/lams/logevent/service/ILogEventService.java
    • -0
    • +127
    ./org/lamsfoundation/lams/logevent/service/LogEventService.java
  8. … 12 more files in changeset.
Friday 01 Oct 2010
10:30 pm

Andrey Balan

LDEV-2544 Default Timezones

*merge from lams2_3_release

Options
    • -0
    • +23
    ./org/lamsfoundation/lams/commonContext.xml
    • -0
    • +76
    ./org/lamsfoundation/lams/dbupdates/patch02040006.sql
    • -0
    • +126
    ./org/lamsfoundation/lams/timezone/Timezone.java
    • -0
    • +74
    ./org/lamsfoundation/lams/timezone/dao/ITimezoneDAO.java
    • -0
    • +73
    ./org/lamsfoundation/lams/timezone/dao/hibernate/TimezoneDAO.java
    • -0
    • +127
    ./org/lamsfoundation/lams/timezone/dto/TimezoneDTO.java
    • -0
    • +66
    ./org/lamsfoundation/lams/timezone/service/ITimezoneService.java
    • -0
    • +101
    ./org/lamsfoundation/lams/timezone/service/TimezoneService.java
    • -0
    • +53
    ./org/lamsfoundation/lams/timezone/util/TimezoneComparator.java
    • -0
    • +52
    ./org/lamsfoundation/lams/timezone/util/TimezoneDTOComparator.java
    • -36
    • +9
    ./org/lamsfoundation/lams/usermanagement/User.java
    • -4
    • +4
    ./org/lamsfoundation/lams/workspace/dto/FolderContentDTO.java
  13. … 24 more files in changeset.
6:54 pm

Andrey Balan

LDEV-2544 Default Timezones

*added ability to change server timezone

Options
    • -35
    • +36
    ./org/lamsfoundation/lams/dbupdates/patch02030500.sql
    • -15
    • +45
    ./org/lamsfoundation/lams/timezone/Timezone.java
    • -2
    • +16
    ./org/lamsfoundation/lams/timezone/dao/ITimezoneDAO.java
    • -4
    • +24
    ./org/lamsfoundation/lams/timezone/dao/hibernate/TimezoneDAO.java
    • -2
    • +16
    ./org/lamsfoundation/lams/timezone/service/ITimezoneService.java
    • -4
    • +23
    ./org/lamsfoundation/lams/timezone/service/TimezoneService.java
    • -4
    • +4
    ./org/lamsfoundation/lams/timezone/util/TimezoneComparator.java
  8. … 14 more files in changeset.
Friday 17 Sep 2010
12:15 pm

Andrey Balan

LDEV-2030 fixing an error that occurs on updating user during LDAP sync

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
Tuesday 14 Sep 2010
2:35 pm

Andrey Balan

LDEV-2572 *merged to lams2_3_release

Options
    • -11
    • +16
    ./org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -0
    • +0
    ./org/lamsfoundation/lams/util/svg/ActivityTreeNode.java
    • -0
    • +61
    ./org/lamsfoundation/lams/util/svg/ActivityTreeNodeComparator.java
    • -3
    • +3
    ./org/lamsfoundation/lams/util/svg/SVGConstants.java
    • -34
    • +164
    ./org/lamsfoundation/lams/util/svg/SVGGenerator.java
    • -0
    • +0
    ./org/lamsfoundation/lams/util/svg/SVGTrigonometryUtils.java
1:27 pm

Andrey Balan

LDEV-2572 fixing minor bugs

Options
    • -6
    • +17
    ./org/lamsfoundation/lams/util/svg/SVGGenerator.java
  2. … 1 more file in changeset.
Monday 13 Sep 2010
8:05 pm

Andrey Balan

file ActivityTreeNodeComparator.java was added on branch lams2_3_release on 2010-09-14 12:35:04 +0000

Options
    • -0
    • +0
    ./org/lamsfoundation/lams/util/svg/ActivityTreeNodeComparator.java
8:05 pm

Andrey Balan

LDEV-2572 Add SVG *and PNG* images on export

Options
    • -14
    • +16
    ./org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -2
    • +1
    ./org/lamsfoundation/lams/util/svg/ActivityTreeNodeComparator.java
    • -3
    • +3
    ./org/lamsfoundation/lams/util/svg/SVGConstants.java
    • -30
    • +144
    ./org/lamsfoundation/lams/util/svg/SVGGenerator.java
Monday 06 Sep 2010
1:05 pm

Andrey Balan

LDEV-2572 supports ordering inside branching activity

Options
    • -0
    • +62
    ./org/lamsfoundation/lams/util/svg/ActivityTreeNodeComparator.java
    • -2
    • +6
    ./org/lamsfoundation/lams/util/svg/SVGGenerator.java
12:26 pm

Andrey Balan

LDEV-2572 fixed handling of overlapped activities

Options
    • -3
    • +4
    ./org/lamsfoundation/lams/util/svg/SVGGenerator.java
10:57 am

Andrey Balan

LDEV-2572 updating image links

Options
    • -3
    • +3
    ./org/lamsfoundation/lams/util/svg/SVGGenerator.java
Friday 03 Sep 2010
10:10 pm

Andrey Balan

LDEV-2572 Add SVG image on export

* Merge from HEAD

Options
    • -0
    • +23
    ./org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -0
    • +341
    ./org/lamsfoundation/lams/util/svg/ActivityTreeNode.java
    • -0
    • +66
    ./org/lamsfoundation/lams/util/svg/SVGConstants.java
    • -0
    • +659
    ./org/lamsfoundation/lams/util/svg/SVGGenerator.java
    • -0
    • +128
    ./org/lamsfoundation/lams/util/svg/SVGTrigonometryUtils.java
  6. … 17 more files in changeset.
7:35 pm

Andrey Balan

file SVGConstants.java was added on branch lams2_3_release on 2010-09-03 20:10:25 +0000

Options
    • -0
    • +0
    ./org/lamsfoundation/lams/util/svg/SVGConstants.java
7:35 pm

Andrey Balan

file SVGGenerator.java was added on branch lams2_3_release on 2010-09-03 20:10:25 +0000

Options
    • -0
    • +0
    ./org/lamsfoundation/lams/util/svg/SVGGenerator.java
7:35 pm

Andrey Balan

LDEV-2574 support for width, height and scale parameters

Options
    • -1
    • +3
    ./org/lamsfoundation/lams/util/svg/SVGConstants.java
    • -9
    • +25
    ./org/lamsfoundation/lams/util/svg/SVGGenerator.java
  3. … 4 more files in changeset.
3:45 pm

Andrey Balan

LDEV-2572 support for scale, width, height parameters

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -3
    • +3
    ./org/lamsfoundation/lams/util/svg/SVGConstants.java
    • -12
    • +10
    ./org/lamsfoundation/lams/util/svg/SVGGenerator.java
2:11 pm

Andrey Balan

file ActivityTreeNode.java was added on branch lams2_3_release on 2010-09-03 20:10:25 +0000

Options
    • -0
    • +0
    ./org/lamsfoundation/lams/util/svg/ActivityTreeNode.java
2:11 pm

Andrey Balan

file SVGTrigonometryUtils.java was added on branch lams2_3_release on 2010-09-03 20:10:25 +0000

Options
    • -0
    • +0
    ./org/lamsfoundation/lams/util/svg/SVGTrigonometryUtils.java
2:11 pm

Andrey Balan

LDEV-2572

* fixing complex activities inside complex ones

* refactoring

Options
    • -50
    • +160
    ./org/lamsfoundation/lams/util/svg/ActivityTreeNode.java
    • -1
    • +3
    ./org/lamsfoundation/lams/util/svg/SVGConstants.java
    • -219
    • +157
    ./org/lamsfoundation/lams/util/svg/SVGGenerator.java
    • -2
    • +1
    ./org/lamsfoundation/lams/util/svg/SVGTrigonometryUtils.java
Wednesday 01 Sep 2010
7:55 pm

Andrey Balan

LDEV-2572 Added SVG image on export

Options
    • -0
    • +24
    ./org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -0
    • +231
    ./org/lamsfoundation/lams/util/svg/ActivityTreeNode.java
    • -0
    • +62
    ./org/lamsfoundation/lams/util/svg/SVGConstants.java
    • -0
    • +707
    ./org/lamsfoundation/lams/util/svg/SVGGenerator.java
    • -0
    • +129
    ./org/lamsfoundation/lams/util/svg/SVGTrigonometryUtils.java
  6. … 3 more files in changeset.
Wednesday 11 Aug 2010
1:02 pm

Andrey Balan

file Emailer.java was added on branch lams2_3_release on 2010-10-16 11:24:51 +0000

Options
    • -0
    • +0
    ./org/lamsfoundation/lams/util/Emailer.java
1:02 pm

Andrey Balan

LDEV-2089 removed inappropriate charset "text/plain"

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/util/Emailer.java
Tuesday 15 Jun 2010
11:29 pm

Andrey Balan

LDEV-2550 fix to sql patch

Options
    • -1
    • +10
    ./org/lamsfoundation/lams/dbupdates/patch02030500.sql
Tuesday 25 May 2010
10:38 pm

Andrey Balan

LDEV-2564 add Option in "Edit configuration settings" for not displaying the "All My Lesson" option in My Profile tab

Options
    • -0
    • +4
    ./org/lamsfoundation/lams/dbupdates/patch02040006.sql
    • -1
    • +3
    ./org/lamsfoundation/lams/util/ConfigurationKeys.java
  3. … 4 more files in changeset.
10:23 pm

Andrey Balan

LDEV-2564 add Option in "Edit configuration settings" for not displaying the "All My Lesson" option in My Profile tab

Options
    • -7
    • +8
    ./org/lamsfoundation/lams/dbupdates/patch02030500.sql
    • -1
    • +3
    ./org/lamsfoundation/lams/util/ConfigurationKeys.java
  3. … 4 more files in changeset.
Monday 24 May 2010
1:11 am

Andrey Balan

LDEV-2451 addLDAPUser now returns correct boolean

Options
    • -11
    • +15
    ./org/lamsfoundation/lams/usermanagement/service/LdapService.java
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
    • -0
    • +9
    ./org/lamsfoundation/lams/dbupdates/patch02040006.sql
    • -1
    • +15
    ./org/lamsfoundation/lams/lesson/Lesson.java
  3. … 2 more files in changeset.
Monday 17 May 2010
2:35 pm

Andrey Balan

LDEV-2550 further development of LAMS event logging mechanism

Options
    • -8
    • +6
    ./org/lamsfoundation/lams/logevent/LogEvent.java
    • -1
    • +32
    ./org/lamsfoundation/lams/logevent/service/LogEventService.java
  3. … 4 more files in changeset.