lams / lams_tool_wiki / src / java

org

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 9
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 7,821
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
Tuesday 11 Feb 2014
9:59 pm

Marcin Cieslak

LDEV-3171: Remove users from activities. Fix several bugs.

Options
    • -9
    • +12
    ./lamsfoundation/lams/tool/wiki/service/WikiService.java
  2. … 34 more files in changeset.
Monday 03 Feb 2014
1:18 am

Marcin Cieslak

LDEV-3171: Give a Monitor an option to remove learner's content from activities when moving him backwards in a sequence.

Implementation of content-removing method for most of tools.

Options
    • -1
    • +35
    ./lamsfoundation/lams/tool/wiki/service/WikiService.java
  2. … 59 more files in changeset.
Saturday 18 Jan 2014
6:18 am

Andrey Balan

LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options

Options
    • -11
    • +2
    ./lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml
    • -35
    • +0
    ./lamsfoundation/lams/tool/wiki/dao/IWikiAttachmentDAO.java
    • -3
    • +1
    ./lamsfoundation/lams/tool/wiki/dao/IWikiDAO.java
    • -35
    • +0
    ./lamsfoundation/lams/tool/wiki/dao/hibernate/WikiAttachmentDAO.java
    • -21
    • +2
    ./lamsfoundation/lams/tool/wiki/dao/hibernate/WikiDAO.java
    • -0
    • +19
    ./lamsfoundation/lams/tool/wiki/dbupdates/patch20140102.sql
    • -101
    • +0
    ./lamsfoundation/lams/tool/wiki/dto/WikiAttachmentDTO.java
    • -61
    • +1
    ./lamsfoundation/lams/tool/wiki/dto/WikiDTO.java
    • -116
    • +2
    ./lamsfoundation/lams/tool/wiki/model/Wiki.java
    • -222
    • +0
    ./lamsfoundation/lams/tool/wiki/model/WikiAttachment.java
    • -30
    • +1
    ./lamsfoundation/lams/tool/wiki/service/IWikiService.java
    • -0
    • +43
    ./lamsfoundation/lams/tool/wiki/service/WikiContentVersionFilter.java
    • -161
    • +7
    ./lamsfoundation/lams/tool/wiki/service/WikiService.java
    • -3
    • +1
    ./lamsfoundation/lams/tool/wiki/util/WikiConstants.java
    • -224
    • +1
    ./lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java
  16. … 155 more files in changeset.
Monday 06 Jan 2014
4:42 pm

Marcin Cieslak

LDEV-3163: Make LAMS use ServerURL when providing URLs.

Options
    • -2
    • +3
    ./lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java
  2. … 40 more files in changeset.
Tuesday 30 Jul 2013
7:10 am

Marcin Cieslak

LDEV-3070: Use tool content title as lesson name instead of showing prompt pop up. Skip "Reedit"/"Cancel" page.

Options
    • -2
    • +6
    ./lamsfoundation/lams/tool/wiki/service/WikiService.java
  2. … 35 more files in changeset.
Wednesday 17 Jul 2013
4:45 pm

Andrey Balan

LDEV-3078 start uploading images to www/secure/runtime/ instead of using 32-character contentFolderId

Options
    • -0
    • +17
    ./lamsfoundation/lams/tool/wiki/dbupdates/patch20130716.sql
    • -12
    • +1
    ./lamsfoundation/lams/tool/wiki/dto/WikiSessionDTO.java
    • -18
    • +2
    ./lamsfoundation/lams/tool/wiki/model/WikiSession.java
    • -1
    • +11
    ./lamsfoundation/lams/tool/wiki/service/IWikiService.java
    • -4
    • +7
    ./lamsfoundation/lams/tool/wiki/service/WikiService.java
    • -2
    • +3
    ./lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java
    • -4
    • +1
    ./lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java
    • -20
    • +20
    ./lamsfoundation/lams/tool/wiki/web/actions/WikiPageAction.java
    • -44
    • +1
    ./lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java
  10. … 1 more file in changeset.
Thursday 04 Jul 2013
7:34 pm

Marcin Cieslak

LDEV-3061: Allow emailing learners from Monitor.

Fix issues with EventNotificationService.

Move emailing module from Admin to Central.

Options
    • -6
    • +6
    ./lamsfoundation/lams/tool/wiki/web/actions/WikiPageAction.java
  2. … 37 more files in changeset.
Tuesday 09 Apr 2013
8:45 pm

Marcin Cieslak

LDEV-3026: Add utilities for getting activity position. Make Tools position-aware and display different label if they are last in LD.

Options
    • -3
    • +10
    ./lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java
  2. … 182 more files in changeset.
Wednesday 27 Mar 2013
11:08 pm

Andrey Balan

LDEV-3010 added option to send emails with Html Content-type

Options
    • -3
    • +5
    ./lamsfoundation/lams/tool/wiki/web/actions/WikiPageAction.java
  2. … 24 more files in changeset.
Tuesday 11 Dec 2012
9:15 pm

Marcin Cieslak

LDEV-2912: Remove RAMS references from export servlets and Ant build files.

Options
    • -8
    • +6
    ./lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java
  2. … 3 more files in changeset.
Wednesday 21 Mar 2012
9:45 pm

Ernie Ghiglione

LDEV-2842: fixing typos

Options
    • -2
    • +2
    ./lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java
  2. … 3 more files in changeset.
Tuesday 20 Mar 2012
3:36 am

Marcin Cieslak

LDEV-2827: Add option to restore a page in Learner and Author.

Options
    • -2
    • +9
    ./lamsfoundation/lams/tool/wiki/service/IWikiService.java
    • -1
    • +6
    ./lamsfoundation/lams/tool/wiki/service/WikiService.java
    • -1
    • +33
    ./lamsfoundation/lams/tool/wiki/web/actions/WikiPageAction.java
  4. … 3 more files in changeset.
Monday 19 Mar 2012
11:00 pm

Marcin Cieslak

LDEV-2826: Limit range of pages searched for broken references.

Options
    • -3
    • +5
    ./lamsfoundation/lams/tool/wiki/dao/hibernate/WikiPageDAO.java
10:39 pm

Marcin Cieslak

LDEV-2826: Allow marking Wiki pages as removed instead of removing them completely.

Clear references to unexisting pages.

Fix refresh Wiki page list after removing one.

Options
    • -1
    • +23
    ./lamsfoundation/lams/tool/wiki/dao/hibernate/WikiPageDAO.java
    • binary
    ./lamsfoundation/lams/tool/wiki/dbupdates/patch20120315.sql
    • -1
    • +11
    ./lamsfoundation/lams/tool/wiki/dto/WikiPageDTO.java
    • -0
    • +13
    ./lamsfoundation/lams/tool/wiki/model/WikiPage.java
    • -1
    • +8
    ./lamsfoundation/lams/tool/wiki/service/IWikiService.java
    • -1
    • +6
    ./lamsfoundation/lams/tool/wiki/service/WikiService.java
    • -10
    • +36
    ./lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java
    • -4
    • +4
    ./lamsfoundation/lams/tool/wiki/web/actions/WikiPageAction.java
  9. … 6 more files in changeset.
Tuesday 13 Mar 2012
4:34 am

Marcin Cieslak

LDEV-2824: Revert changes made by previous attempt to workaround Chrome and Safari XSS detection.

Replace "javascript" word in submitted Wiki pages with another token and replace it back on server side, so returning code is not identical to submitted one and XSS protection does not kick in.

Clean up unnecessary methods and calls.

Options
    • -2
    • +4
    ./lamsfoundation/lams/tool/wiki/util/WikiConstants.java
    • -7
    • +20
    ./lamsfoundation/lams/tool/wiki/web/actions/WikiPageAction.java
  3. … 7 more files in changeset.
Saturday 10 Mar 2012
5:57 pm

Marcin Cieslak

LDEV-2824: Refresh view page after adding/editing it so Chrome does not block new javascript code.

Options
    • -1
    • +2
    ./lamsfoundation/lams/tool/wiki/util/WikiConstants.java
    • -1
    • +8
    ./lamsfoundation/lams/tool/wiki/web/actions/WikiPageAction.java
  3. … 1 more file in changeset.
Monday 20 Feb 2012
4:23 am

Ernie Ghiglione

LDEV-2807: Support for MySQL 5.5

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/wiki/dbupdates/patch20090121_updateFrom22.sql
  2. … 10 more files in changeset.
Wednesday 16 Feb 2011
4:37 am

Andrey Balan

LDEV-1730 If Tool is not group do now show the group reference

Options
    • -1
    • +9
    ./lamsfoundation/lams/tool/wiki/service/IWikiService.java
    • -1
    • +5
    ./lamsfoundation/lams/tool/wiki/service/WikiService.java
    • -1
    • +2
    ./lamsfoundation/lams/tool/wiki/util/WikiConstants.java
    • -1
    • +4
    ./lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java
  5. … 2 more files in changeset.
Sunday 13 Feb 2011
2:53 am

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
    • -29
    • +5
    ./lamsfoundation/lams/tool/wiki/web/actions/PedagogicalPlannerAction.java
  2. … 25 more files in changeset.
Wednesday 06 Oct 2010
6: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
    • -39
    • +41
    ./lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java
  2. … 1096 more files in changeset.
Friday 04 Sep 2009
12:01 pm

jliew

merge LDEV-2436 from branch

Options
    • -4
    • +5
    ./lamsfoundation/lams/tool/wiki/service/WikiService.java
11:09 am

jliew

LDEV-2436 wiki.getWikiPages not returning all wiki pages as expected; circumvent model to get req'd wiki pages

Options
    • -4
    • +5
    ./lamsfoundation/lams/tool/wiki/service/WikiService.java
Monday 27 Jul 2009
6:17 am

Marcin Cieslak

LDEV-2374:

- Vote now accepts nominations created by Teacher as well as ones derived from input.

- Teacher can now limit number of Learners contributing to Vote's nomination pool.

- Each tool now declares which DataOutputDefinitions it can accept for Data Flow.

Options
    • -15
    • +17
    ./lamsfoundation/lams/tool/wiki/service/WikiService.java
  2. … 49 more files in changeset.
Tuesday 07 Jul 2009
8:32 am

jliew

change to ascii

Options
    • -38
    • +38
    ./lamsfoundation/lams/tool/wiki/dbupdates/patch20090121_updateFrom22.sql
  2. … 26 more files in changeset.
Thursday 02 Jul 2009
8:59 pm

Marcin Cieslak

LDEV-2374: Data flow between tools: framework and example for Q&A -> Vote.

Options
    • -19
    • +25
    ./lamsfoundation/lams/tool/wiki/service/WikiOutputFactory.java
    • -63
    • +57
    ./lamsfoundation/lams/tool/wiki/service/WikiService.java
  3. … 84 more files in changeset.
5:54 pm

jliew

more merging lams2_3 into head

Options
    • -5
    • +5
    ./lamsfoundation/lams/tool/wiki/dbupdates/patch20090121_updateFrom22.sql
  2. … 39 more files in changeset.
Wednesday 01 Jul 2009
10:39 am

jliew

Merge lams2_3 into head

Options
    • -5
    • +46
    ./lamsfoundation/lams/tool/wiki/dao/hibernate/WikiDAO.java
    • -3
    • +4
    ./lamsfoundation/lams/tool/wiki/service/WikiService.java
  3. … 161 more files in changeset.
Wednesday 17 Jun 2009
2:20 pm

lfoxton

LDEV-2055 Fixing (once again) the non-uniue result that occures sometimes in wiki tool. Now each time you save the wiki it goes through the list an checks for duplicates, deleting them when they are found. This should prevent it happening in the future

Options
    • -5
    • +46
    ./lamsfoundation/lams/tool/wiki/dao/hibernate/WikiDAO.java
    • -2
    • +4
    ./lamsfoundation/lams/tool/wiki/service/WikiService.java
Wednesday 06 May 2009
10:00 am

lfoxton

Fixing wiki update scripts to use useful names for unique keys, indexes and foreign keys for wiki_page table

Options
    • -5
    • +5
    ./lamsfoundation/lams/tool/wiki/dbupdates/patch20090121_updateFrom22.sql
  2. … 1 more file in changeset.
Monday 20 Apr 2009
8:11 am

lfoxton

Merging wiki greek characters fix with head

Options
    • -0
    • +25
    ./lamsfoundation/lams/tool/wiki/dbupdates/patch20090121_updateFrom22.sql
    • -1
    • +1
    ./lamsfoundation/lams/tool/wiki/dto/WikiPageContentDTO.java
    • -2
    • +4
    ./lamsfoundation/lams/tool/wiki/dto/WikiPageDTO.java
    • -1
    • +8
    ./lamsfoundation/lams/tool/wiki/service/WikiService.java
    • -2
    • +2
    ./lamsfoundation/lams/tool/wiki/web/actions/WikiPageAction.java
  6. … 4 more files in changeset.