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
Wednesday 23 Feb 2011
11:20 pm

Marcin Cieslak

LDEV-2642, LDEV-2646: Move metadata to separate table. Use LD ID rather than ZIPed file for template. Initial access control.

Options
    • -0
    • +12
    ./org/lamsfoundation/lams/dbupdates/patch02040006.sql
Wednesday 16 Feb 2011
11:44 am

Andrey Balan

LDEV-2628 *constructing lesson finish callback URL

*merge from lams2_3_release

Options
    • -0
    • +13
    ./org/lamsfoundation/lams/integration/service/IIntegrationService.java
    • -0
    • +66
    ./org/lamsfoundation/lams/integration/service/IntegrationService.java
11:42 am

Andrey Balan

LDEV-1730 adding comments

Options
    • -1
    • +8
    ./org/lamsfoundation/lams/tool/service/ILamsToolService.java
11:33 am

Andrey Balan

LDEV-2628 *introduced new class which maps lessons with integration server

*merge from lams2_3_release

Options
    • -0
    • +1
    ./org/lamsfoundation/lams/commonContext.xml
    • -0
    • +14
    ./org/lamsfoundation/lams/dbupdates/patch02040006.sql
    • -0
    • +76
    ./org/lamsfoundation/lams/integration/ExtServerLessonMap.java
    • -0
    • +15
    ./org/lamsfoundation/lams/integration/ExtServerOrgMap.java
  5. … 5 more files in changeset.
Tuesday 15 Feb 2011
9:53 pm

Andrey Balan

LDEV-2643 adding table creation into autopatch

Options
    • -0
    • +10
    ./org/lamsfoundation/lams/dbupdates/patch02030501.sql
Monday 14 Feb 2011
12:45 am

Marcin Cieslak

LDEV-2646: Allow access control for viewing/editing a copy/original template in Planner nodes for Teachers.

Swap collapse/expand arrows - it seems more right now.

Some clean up - move PlannerActivityMetadata to a proper packet, change some labels etc.

Options
    • -122
    • +0
    ./org/lamsfoundation/lams/learningdesign/PlannerActivityMetadata.java
    • -5
    • +6
    ./org/lamsfoundation/lams/learningdesign/ToolActivity.java
    • -5
    • +5
    ./org/lamsfoundation/lams/learningdesign/dto/PlannerActivityMetadataDTO.java
    • -2
    • +2
    ./org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -0
    • +145
    ./org/lamsfoundation/lams/planner/PedagogicalPlannerActivityMetadata.java
    • -12
    • +26
    ./org/lamsfoundation/lams/planner/PedagogicalPlannerNodeRole.java
    • -5
    • +15
    ./org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.java
    • -6
    • +40
    ./org/lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java
  9. … 13 more files in changeset.
Saturday 12 Feb 2011
7:37 pm

Marcin Cieslak

LDEV-2642, LDEV-2616:

Move Planner activity metadata (hidden, collapsed, expanded) to a separate table, as it may grow in the future and we don't want to make ToolActivity too complex.

Move Editing Advice content from Online Instructions in activities to the metadata table.

Allow editing the Editing Advice straight from the planner. Use jquery_ui instead of cluetip (dispose the last one completely).

While creating a node, the Learning Design is imported just once from ZIP into DB, instead of importing it each time someone opens it in Planner. This allows less unnecessary copies of the LD and allows easier modfication of the original design.

Change the way a Teacher gets a copy of the design. When opening the template in Planner, a copy is made in common folder ("Planner preview"). When the user saves the design, the same copy is *moved* to user's folder, rather than copying it again. Futhermore, each subsequent save modifies the same LD rather than making another copy.

Options
    • -0
    • +122
    ./org/lamsfoundation/lams/learningdesign/PlannerActivityMetadata.java
    • -36
    • +13
    ./org/lamsfoundation/lams/learningdesign/ToolActivity.java
    • -4
    • +16
    ./org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -0
    • +118
    ./org/lamsfoundation/lams/learningdesign/dto/PlannerActivityMetadataDTO.java
    • -3
    • +9
    ./org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -13
    • +14
    ./org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.java
    • -24
    • +6
    ./org/lamsfoundation/lams/planner/dto/PedagogicalPlannerActivityDTO.java
    • -8
    • +8
    ./org/lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java
  9. … 12 more files in changeset.
Friday 11 Feb 2011
11:09 pm

Andrey Balan

LDEV-2628 *constructing lesson finish callback URL

Options
    • -0
    • +16
    ./org/lamsfoundation/lams/integration/service/IIntegrationService.java
    • -0
    • +66
    ./org/lamsfoundation/lams/integration/service/IntegrationService.java
11:09 pm

Andrey Balan

file ExtServerLessonMap.java was initially added on branch lams2_3_release.

Options
    • -0
    • +0
    ./org/lamsfoundation/lams/integration/ExtServerLessonMap.java
11:09 pm

Andrey Balan

LDEV-2628 *introduced new class which maps lessons with integration server

Options
    • -0
    • +1
    ./org/lamsfoundation/lams/commonContext.xml
    • -0
    • +3
    ./org/lamsfoundation/lams/dbupdates/patch02030501.sql
    • -0
    • +78
    ./org/lamsfoundation/lams/integration/ExtServerLessonMap.java
    • -0
    • +15
    ./org/lamsfoundation/lams/integration/ExtServerOrgMap.java
  5. … 5 more files in changeset.
Tuesday 08 Feb 2011
1:08 pm

Andrey Balan

LDEV-2639 adding autopatch script

*merge from lams2_3_release

Options
    • -0
    • +3
    ./org/lamsfoundation/lams/dbupdates/patch02040006.sql
  2. … 2 more files in changeset.
12:27 pm

Andrey Balan

LDEV-2639 adding autopatch script

Options
    • -0
    • +12
    ./org/lamsfoundation/lams/dbupdates/patch02030501.sql
  2. … 1 more file in changeset.
12:27 pm

Andrey Balan

file patch02030501.sql was initially added on branch lams2_3_release.

Options
    • -0
    • +0
    ./org/lamsfoundation/lams/dbupdates/patch02030501.sql
Wednesday 05 Jan 2011
3:34 pm

Ernie Ghiglione

LDEV-2603: fixes problem in unix where image can't be found (applying it to HEAD)

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/util/svg/SVGGenerator.java
3:53 am

Ernie Ghiglione

LDEV-2603: fixes problem in unix where image can't be found

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/util/svg/SVGGenerator.java
Sunday 12 Dec 2010
3:15 pm

Marcin Cieslak

LDEV-2614: Added expand activity button.

Collapse/expand activity state is now stored on "Save as Sequence" action.

Options
    • -2
    • +41
    ./org/lamsfoundation/lams/learningdesign/ToolActivity.java
    • -11
    • +51
    ./org/lamsfoundation/lams/planner/dto/PedagogicalPlannerActivityDTO.java
  3. … 7 more files in changeset.
Sunday 05 Dec 2010
8:44 pm

Marcin Cieslak

LDEV-2615: Added button and code allowing editing a single activity in Full Author.

Options
    • -2
    • +13
    ./org/lamsfoundation/lams/planner/dto/PedagogicalPlannerActivityDTO.java
  2. … 4 more files in changeset.
Tuesday 30 Nov 2010
1:11 pm

Andrey Balan

LDEV-2613 updating versions and dictionary dates for 2.3.5

Options
    • -0
    • +5
    ./org/lamsfoundation/lams/dbupdates/patch02030500.sql
  2. … 2 more files in changeset.
Thursday 25 Nov 2010
9:45 pm

Andrey Balan

LDEV-2538 respects server's default enable_flash setting when new users are created

*merge from lams2_3_release

Options
    • -0
    • +3
    ./org/lamsfoundation/lams/integration/service/IntegrationService.java
    • -66
    • +1
    ./org/lamsfoundation/lams/usermanagement/User.java
    • -1
    • +2
    ./org/lamsfoundation/lams/usermanagement/service/LdapService.java
  4. … 2 more files in changeset.
8:47 pm

Andrey Balan

LDEV-2538 respects server's default enable_flash setting when new users are created

Options
    • -0
    • +3
    ./org/lamsfoundation/lams/integration/service/IntegrationService.java
    • -66
    • +1
    ./org/lamsfoundation/lams/usermanagement/User.java
    • -1
    • +2
    ./org/lamsfoundation/lams/usermanagement/service/LdapService.java
  4. … 2 more files in changeset.
Wednesday 17 Nov 2010
9:22 pm

Andrey Balan

LDEV-2603 fixed Exporting sequences error due to PNG creation

*merge from lams2_3_release

Options
    • -1
    • +4
    ./org/lamsfoundation/lams/util/svg/SVGConstants.java
    • -98
    • +127
    ./org/lamsfoundation/lams/util/svg/SVGGenerator.java
8:31 pm

Andrey Balan

LDEV-2603 fixed Exporting sequences error due to PNG creation

Options
    • -1
    • +4
    ./org/lamsfoundation/lams/util/svg/SVGConstants.java
    • -98
    • +127
    ./org/lamsfoundation/lams/util/svg/SVGGenerator.java
Friday 05 Nov 2010
1:18 am

Andrey Balan

LDEV-2548 Ability for a course manager to see *all* lessons...

*merge from lams2_3_release

Options
    • -4
    • +6
    ./org/lamsfoundation/lams/lesson/dao/ILessonDAO.java
    • -4
    • +15
    ./org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
    • -3
    • +3
    ./org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -3
    • +3
    ./org/lamsfoundation/lams/lesson/service/LessonService.java
  5. … 4 more files in changeset.
Thursday 04 Nov 2010
6:04 pm

Andrey Balan

LDEV-2548 Ability for a course manager to see *all* lessons...

Options
    • -4
    • +6
    ./org/lamsfoundation/lams/lesson/dao/ILessonDAO.java
    • -4
    • +15
    ./org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
    • -3
    • +3
    ./org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -3
    • +3
    ./org/lamsfoundation/lams/lesson/service/LessonService.java
  5. … 6 more files in changeset.
3:45 pm

Ernie Ghiglione

LDEV-2587: Adding e-adventure tool to LAMS default tools

Options
    • -1
    • +3
    ./org/lamsfoundation/lams/beanRefContext.xml
    • -0
    • +2
    ./org/lamsfoundation/lams/commonContext.xml
  3. … 2 more files in changeset.
Friday 22 Oct 2010
3:40 pm

Andrey Balan

LDEV-2576 UTF-8 emails being sent correct now

*merge from HEAD

Options
    • -5
    • +9
    ./org/lamsfoundation/lams/util/Emailer.java
Wednesday 20 Oct 2010
11:28 pm

Andrey Balan

LDEV-2576 UTF-8 emails being sent correct now

Options
    • -6
    • +10
    ./org/lamsfoundation/lams/util/Emailer.java
Saturday 16 Oct 2010
1:20 pm

Andrey Balan

LDEV-2089 Email messaging

*Merge from HEAD

Options
    • -0
    • +1
    ./org/lamsfoundation/lams/commonContext.xml
    • -2
    • +3
    ./org/lamsfoundation/lams/events/DeliveryMethodMail.java
    • -0
    • +133
    ./org/lamsfoundation/lams/util/Emailer.java
  4. … 10 more files in changeset.
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.