lams-github / lams_common / src / java

org

Clone Tools

Stats

Commits this week: 0
Total Committers: 32
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
Friday 06 May 2011
9:19 am

erniegx <ernieg@gmail.com>

LDEV-2675: create dir if it doesn't exists

Options
    • -0
    • +7
    ./lamsfoundation/lams/learningdesign/service/LearningDesignService.java
Thursday 05 May 2011
5:23 pm

Andrey Balan

LDEV-2672 Ability for integrated servers to access learning design's SVGs

*merge from lams2_3_release branch

Options
    • -4
    • +2
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -0
    • +16
    ./lamsfoundation/lams/learningdesign/service/ILearningDesignService.java
    • -6
    • +75
    ./lamsfoundation/lams/learningdesign/service/LearningDesignService.java
  4. … 4 more files in changeset.
Sunday 10 Apr 2011
6:25 pm

Marcin Cieslak

LDEV-2646: Several fixes for Planner access control: "Viewing" and "removing" is for whole nodes, not just templates. Node's owner can not remove it if there are subnodes he doesn't have permissions to remove.

Options
    • -0
    • +5
    ./lamsfoundation/lams/dbupdates/patch02040006.sql
    • -11
    • +12
    ./lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java
  3. … 3 more files in changeset.
Friday 01 Apr 2011
11:16 pm

Andrey Balan

LDEV-2664 Switch learner interface for learners if they use a mobile device

*merge from lams2_3_release

Options
    • -0
    • +5
    ./lamsfoundation/lams/dbupdates/patch02040006.sql
  2. … 8 more files in changeset.
Sunday 06 Mar 2011
10:56 am

Marcin Cieslak

LDEV-2642, LDEV-2646: Extend access control for Planner nodes. Add a node's owner field. Fix exporting/importing nodes. Upgrade XStream from 1.1 to 1.1.3.

Options
    • -9
    • +34
    ./lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.java
    • -32
    • +98
    ./lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java
    • -6
    • +64
    ./lamsfoundation/lams/planner/dto/PedagogicalPlannerTemplateDTO.java
  4. … 9 more files in changeset.
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
    ./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
    ./lamsfoundation/lams/integration/service/IIntegrationService.java
    • -0
    • +66
    ./lamsfoundation/lams/integration/service/IntegrationService.java
11:42 am

Andrey Balan

LDEV-1730 adding comments

Options
    • -0
    • +7
    ./lamsfoundation/lams/tool/service/ILamsToolService.java
11:42 am

Andrey Balan

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

*merge from lams2_3_release

Options
    • -0
    • +1
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +14
    ./lamsfoundation/lams/dbupdates/patch02040006.sql
    • -0
    • +76
    ./lamsfoundation/lams/integration/ExtServerLessonMap.java
    • -0
    • +15
    ./lamsfoundation/lams/integration/ExtServerOrgMap.java
  5. … 5 more files in changeset.
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
    ./lamsfoundation/lams/learningdesign/PlannerActivityMetadata.java
    • -4
    • +5
    ./lamsfoundation/lams/learningdesign/ToolActivity.java
    • -4
    • +4
    ./lamsfoundation/lams/learningdesign/dto/PlannerActivityMetadataDTO.java
    • -2
    • +2
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -0
    • +145
    ./lamsfoundation/lams/planner/PedagogicalPlannerActivityMetadata.java
    • -11
    • +25
    ./lamsfoundation/lams/planner/PedagogicalPlannerNodeRole.java
    • -5
    • +15
    ./lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.java
    • -5
    • +39
    ./lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java
  9. … 13 more files in changeset.
Saturday 12 Feb 2011
7:38 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
    ./lamsfoundation/lams/learningdesign/PlannerActivityMetadata.java
    • -35
    • +12
    ./lamsfoundation/lams/learningdesign/ToolActivity.java
    • -3
    • +15
    ./lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -0
    • +118
    ./lamsfoundation/lams/learningdesign/dto/PlannerActivityMetadataDTO.java
    • -3
    • +9
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -13
    • +14
    ./lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.java
    • -23
    • +5
    ./lamsfoundation/lams/planner/dto/PedagogicalPlannerActivityDTO.java
    • -7
    • +7
    ./lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java
  9. … 12 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
    ./lamsfoundation/lams/dbupdates/patch02040006.sql
  2. … 2 more files in changeset.
Wednesday 05 Jan 2011
3:34 pm

erniegx <ernieg@gmail.com>

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

Options
    • -1
    • +1
    ./lamsfoundation/lams/util/svg/SVGGenerator.java
Sunday 12 Dec 2010
3:17 pm

Marcin Cieslak

LDEV-2614: Added expand activity button. Collapse/expand activity state is now stored on "Save as Sequence" action.

Options
    • -1
    • +40
    ./lamsfoundation/lams/learningdesign/ToolActivity.java
    • -10
    • +50
    ./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
    • -1
    • +12
    ./lamsfoundation/lams/planner/dto/PedagogicalPlannerActivityDTO.java
  2. … 4 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
    ./lamsfoundation/lams/integration/service/IntegrationService.java
    • -65
    • +0
    ./lamsfoundation/lams/usermanagement/User.java
    • -0
    • +1
    ./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
    • -0
    • +3
    ./lamsfoundation/lams/util/svg/SVGConstants.java
    • -97
    • +126
    ./lamsfoundation/lams/util/svg/SVGGenerator.java
Friday 05 Nov 2010
1:19 am

Andrey Balan

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

*merge from lams2_3_release

Options
    • -3
    • +5
    ./lamsfoundation/lams/lesson/dao/ILessonDAO.java
    • -3
    • +14
    ./lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
    • -2
    • +2
    ./lamsfoundation/lams/lesson/service/ILessonService.java
    • -2
    • +2
    ./lamsfoundation/lams/lesson/service/LessonService.java
  5. … 4 more files in changeset.
Wednesday 20 Oct 2010
11:28 pm

Andrey Balan

LDEV-2576 UTF-8 emails being sent correct now

Options
    • -6
    • +10
    ./lamsfoundation/lams/util/Emailer.java
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
    • -2
    • +2
    ./lamsfoundation/lams/util/WebUtil.java
  2. … 1096 more files in changeset.
Monday 04 Oct 2010
5:32 pm

Andrey Balan

LDEV-2550 Developed new event logging mechanism *merge from lams2_3_release

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

Andrey Balan

LDEV-2544 Default Timezones *merge from lams2_3_release

Options
    • -0
    • +23
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +76
    ./lamsfoundation/lams/dbupdates/patch02040006.sql
    • -0
    • +126
    ./lamsfoundation/lams/timezone/Timezone.java
    • -0
    • +74
    ./lamsfoundation/lams/timezone/dao/ITimezoneDAO.java
    • -0
    • +73
    ./lamsfoundation/lams/timezone/dao/hibernate/TimezoneDAO.java
    • -0
    • +127
    ./lamsfoundation/lams/timezone/dto/TimezoneDTO.java
    • -0
    • +66
    ./lamsfoundation/lams/timezone/service/ITimezoneService.java
    • -0
    • +101
    ./lamsfoundation/lams/timezone/service/TimezoneService.java
    • -0
    • +53
    ./lamsfoundation/lams/timezone/util/TimezoneComparator.java
    • -0
    • +52
    ./lamsfoundation/lams/timezone/util/TimezoneDTOComparator.java
    • -35
    • +8
    ./lamsfoundation/lams/usermanagement/User.java
    • -3
    • +3
    ./lamsfoundation/lams/workspace/dto/FolderContentDTO.java
  13. … 24 more files in changeset.
Tuesday 14 Sep 2010
1:27 pm

Andrey Balan

LDEV-2572 fixing minor bugs

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

Andrey Balan

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

Options
    • -14
    • +16
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -1
    • +0
    ./lamsfoundation/lams/util/svg/ActivityTreeNodeComparator.java
    • -2
    • +2
    ./lamsfoundation/lams/util/svg/SVGConstants.java
    • -29
    • +143
    ./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
    ./lamsfoundation/lams/util/svg/ActivityTreeNodeComparator.java
    • -1
    • +5
    ./lamsfoundation/lams/util/svg/SVGGenerator.java
12:26 pm

Andrey Balan

LDEV-2572 fixed handling of overlapped activities

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

Andrey Balan

LDEV-2572 updating image links

Options
    • -2
    • +2
    ./lamsfoundation/lams/util/svg/SVGGenerator.java
Friday 03 Sep 2010
7:40 pm

Andrey Balan

LDEV-2574 support for width, height and scale parameters

Options
    • -0
    • +2
    ./lamsfoundation/lams/util/svg/SVGConstants.java
    • -8
    • +24
    ./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
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -2
    • +2
    ./lamsfoundation/lams/util/svg/SVGConstants.java
    • -11
    • +9
    ./lamsfoundation/lams/util/svg/SVGGenerator.java
2:11 pm

Andrey Balan

LDEV-2572 * fixing complex activities inside complex ones * refactoring

Options
    • -49
    • +159
    ./lamsfoundation/lams/util/svg/ActivityTreeNode.java
    • -0
    • +2
    ./lamsfoundation/lams/util/svg/SVGConstants.java
    • -216
    • +154
    ./lamsfoundation/lams/util/svg/SVGGenerator.java
    • -1
    • +0
    ./lamsfoundation/lams/util/svg/SVGTrigonometryUtils.java