Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-2719: Invalidating session in LoginRequestServlet removes SSO cookie as well. Way to remove a cookie has been adjusted for Firefox needs.

  1. … 1 more file in changeset.
LDEV-2711: Forbid accessing lesson level gradebook by learners. Allow setting courseName without prefix. Fix a bug when accessing course level gradebook by learners.

  1. … 2 more files in changeset.
LDEV-2711: Add "mode=gradebook" parameter value to LoginRequestServlet so it redirects user straight to Gradebook servlet after authentication. Modify parameters veryfied by Gradebook servlet on access to keep them coherent with LoginRequestServlet.

  1. … 1 more file in changeset.
CNG-2: Use existing LoginRequestServlet to authenticate users in Mindapp, rarther that do own implementation.

CNG-1: Add basic MinApp integration implementation to public CVS. Temporarily override security for several servlets until OpenID support is introduced. Allow hiding chosen buttons in Planner using URL parameter. Allow overriding Back button target in Planner using URL parameter.

  1. … 33 more files in changeset.
LDEV-2704 Weaken foreign key's constraints due to problems with learning designs removal

*merge from lams2_3_release

LDEV-2664 LearnerFlashEnabled.tag has been reimplemented as Java class (this is done in order to prevent updating list of mobile devices in all modules )

*merged from lams2_3_release

  1. … 60 more files in changeset.
Fixing syntax

Fixing missign foreign keys setting for update

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

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

*merge from lams2_3_release branch

  1. … 4 more files in changeset.
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.

    • -11
    • +12
    ./lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java
  1. … 3 more files in changeset.
LDEV-2664 Switch learner interface for learners if they use a mobile device

*merge from lams2_3_release

  1. … 8 more files in changeset.
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.

    • -9
    • +34
    ./lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.java
    • -32
    • +98
    ./lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java
  1. … 9 more files in changeset.
LDEV-2642, LDEV-2646: Move metadata to separate table. Use LD ID rather than ZIPed file for template. Initial access control.

LDEV-2628 *constructing lesson finish callback URL

*merge from lams2_3_release

LDEV-1730 adding comments

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

*merge from lams2_3_release

    • -0
    • +1
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +76
    ./lamsfoundation/lams/integration/ExtServerLessonMap.java
  1. … 5 more files in changeset.
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.

    • -0
    • +145
    ./lamsfoundation/lams/planner/PedagogicalPlannerActivityMetadata.java
    • -11
    • +25
    ./lamsfoundation/lams/planner/PedagogicalPlannerNodeRole.java
    • -5
    • +15
    ./lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.java
  1. … 13 more files in changeset.
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.

    • -0
    • +122
    ./lamsfoundation/lams/learningdesign/PlannerActivityMetadata.java
    • -13
    • +14
    ./lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.java
  1. … 12 more files in changeset.
LDEV-2639 adding autopatch script

*merge from lams2_3_release

  1. … 2 more files in changeset.
LDEV-2603: fixes problem in unix where image can't be found (applying it to HEAD)

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

  1. … 7 more files in changeset.
LDEV-2615: Added button and code allowing editing a single activity in Full Author.

  1. … 4 more files in changeset.
LDEV-2538 respects server's default enable_flash setting when new users are created

*merge from lams2_3_release

  1. … 2 more files in changeset.
LDEV-2603 fixed Exporting sequences error due to PNG creation

*merge from lams2_3_release

    • -97
    • +126
    ./lamsfoundation/lams/util/svg/SVGGenerator.java
LDEV-2548 Ability for a course manager to see *all* lessons...

*merge from lams2_3_release

    • -3
    • +5
    ./lamsfoundation/lams/lesson/dao/ILessonDAO.java
  1. … 4 more files in changeset.
LDEV-2576 UTF-8 emails being sent correct now

    • -6
    • +10
    ./lamsfoundation/lams/util/Emailer.java
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.

    • -2
    • +2
    ./lamsfoundation/lams/util/WebUtil.java
  1. … 1096 more files in changeset.
LDEV-2550 Developed new event logging mechanism *merge from lams2_3_release

    • -0
    • +26
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +157
    ./lamsfoundation/lams/logevent/LogEvent.java
    • -0
    • +70
    ./lamsfoundation/lams/logevent/dao/ILogEventDAO.java
    • -0
    • +71
    ./lamsfoundation/lams/logevent/service/ILogEventService.java
    • -0
    • +127
    ./lamsfoundation/lams/logevent/service/LogEventService.java
  1. … 12 more files in changeset.