lams-github / lams_tool_wiki

src

Clone Tools

Stats

Commits this week: 0
Total Committers: 17
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
Monday 19 Mar 2012
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
    ./java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiPageDAO.java
    • -0
    • +18
    ./java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20120315.sql
    • -1
    • +11
    ./java/org/lamsfoundation/lams/tool/wiki/dto/WikiPageDTO.java
    • -0
    • +13
    ./java/org/lamsfoundation/lams/tool/wiki/model/WikiPage.java
    • -0
    • +7
    ./java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java
    • -0
    • +5
    ./java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
    • -9
    • +35
    ./java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java
    • -3
    • +3
    ./java/org/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
    • -1
    • +3
    ./java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java
    • -6
    • +19
    ./java/org/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
    • -0
    • +1
    ./java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java
    • -0
    • +7
    ./java/org/lamsfoundation/lams/tool/wiki/web/actions/WikiPageAction.java
  3. … 1 more file in changeset.
Monday 20 Feb 2012
4:26 am

erniegx <ernieg@gmail.com>

LDEV-2807: Support for MySQL 5.5

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20090121_updateFrom22.sql
  2. … 52 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
    • -0
    • +8
    ./java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java
    • -0
    • +4
    ./java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
    • -0
    • +1
    ./java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java
    • -0
    • +3
    ./java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java
  5. … 2 more files in changeset.
Sunday 13 Feb 2011
2:55 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
    • -28
    • +4
    ./java/org/lamsfoundation/lams/tool/wiki/web/actions/PedagogicalPlannerAction.java
  2. … 25 more files in changeset.
Wednesday 06 Oct 2010
6: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
    • -38
    • +40
    ./java/org/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
    • -3
    • +4
    ./java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
Monday 27 Jul 2009
6:21 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
    • -14
    • +16
    ./java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
  2. … 49 more files in changeset.
Tuesday 07 Jul 2009
8:52 am

jliew

change to ascii

Options
    • -38
    • +38
    ./java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20090121_updateFrom22.sql
  2. … 49 more files in changeset.
Thursday 02 Jul 2009
9:06 pm

Marcin Cieslak

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

Options
    • -17
    • +23
    ./java/org/lamsfoundation/lams/tool/wiki/service/WikiOutputFactory.java
    • -62
    • +56
    ./java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
  3. … 84 more files in changeset.
5:59 pm

jliew

more merging lams2_3 into head

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

jliew

Merge lams2_3 into head

Options
    • -4
    • +45
    ./java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiDAO.java
    • -2
    • +3
    ./java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
  3. … 124 more files in changeset.
Monday 20 Apr 2009
8:11 am

lfoxton

Merging wiki greek characters fix with head

Options
    • -0
    • +25
    ./java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20090121_updateFrom22.sql
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/wiki/dto/WikiPageContentDTO.java
    • -2
    • +4
    ./java/org/lamsfoundation/lams/tool/wiki/dto/WikiPageDTO.java
    • -0
    • +7
    ./java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/wiki/web/actions/WikiPageAction.java
  6. … 4 more files in changeset.
Thursday 26 Mar 2009
6:00 pm

jliew

merging improvements from lams2_3_spring_jboss_tune branch

Options
    • -22
    • +7
    ./java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml
  2. … 118 more files in changeset.
Monday 16 Mar 2009
1:56 pm

asukkar

Added repositoryService via spring

Removed calls to RepositoryProxy class.

LDEV-2171

Options
    • -1
    • +8
    ./java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
    • -0
    • +1
    ./java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml
  3. … 17 more files in changeset.
Saturday 14 Feb 2009
1:47 am

Marcin Cieslak

LDEV-1998: Added Pedagogical Planner editor with add/edit node functionality.

Options
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiPedagogicalPlannerForm.java
  2. … 46 more files in changeset.
Friday 30 Jan 2009
6:02 am

Marcin Cieslak

LDEV-1998: Added Editing advice for all tools. Added FCKEditor for Notebook, Chat and Submit Files.

Options
    • -50
    • +48
    ./java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java
    • -4
    • +28
    ./java/org/lamsfoundation/lams/tool/wiki/web/actions/PedagogicalPlannerAction.java
  3. … 44 more files in changeset.
Thursday 22 Jan 2009
6:17 am

Marcin Cieslak

LDEV-1998: Added support for Wiki tool.

Options
    • -0
    • +14
    ./java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20090121_updateFrom22.sql
    • -0
    • +105
    ./java/org/lamsfoundation/lams/tool/wiki/web/actions/PedagogicalPlannerAction.java
    • -0
    • +86
    ./java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiPedagogicalPlannerForm.java
  4. … 6 more files in changeset.
Thursday 15 Jan 2009
11:32 am

lfoxton

LDEV-2084 Wiki teacher notification link fails because it does not have the contentFolderID, fixed

Options
    • -1
    • +2
    ./java/org/lamsfoundation/lams/tool/wiki/web/actions/WikiPageAction.java
Friday 14 Nov 2008
3:29 pm

lfoxton

LDEV-2020 adding refresh button to learner and monitor for wiki

Options
    • -0
    • +2
    ./java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java
    • -1
    • +10
    ./java/org/lamsfoundation/lams/tool/wiki/web/forms/MonitoringForm.java
  3. … 8 more files in changeset.
Monday 03 Nov 2008
11:33 am

lfoxton

A small fix to make the export servlet replace fckeditor image paths using the serverurlcontext from the configuration table rather than the request

Options
    • -13
    • +6
    ./java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java
Friday 31 Oct 2008
8:03 am

lfoxton

LDEV-1987 Export portfolio not exporting images

this was related to LDEV-1971:, the image urls were not being adjusted properly in export becuse the "lams/www/secure" url was instead "rams/www/sevure" because this tool was developed in rams.

now the "lams" bit is retrieved from the request context using:

request.getContextPath().substring(0, 5);

Options
    • -7
    • +16
    ./java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java
  2. … 1 more file in changeset.
Tuesday 21 Oct 2008
1:11 pm

lfoxton

LDEV-1977 improving the redirect servlet yet again, now the parameters are all hashed using Base64, so that users cannot recognise patterns in our tool's monitor and learner urls and attempt to access contetn they are not authorised for.

Now applying the changes to the wiki tool, instead of sending separate parameters, they are all sent in the hash

Options
    • -12
    • +12
    ./java/org/lamsfoundation/lams/tool/wiki/web/actions/WikiPageAction.java
11:40 am

lfoxton

Adding notifications to add, remove and revert wiki page

Options
    • -0
    • +19
    ./java/org/lamsfoundation/lams/tool/wiki/web/actions/WikiPageAction.java
  2. … 5 more files in changeset.
11:20 am

lfoxton

LDEV-1972 - adding notifications for the wiki tool

implemented for teachers and students

Required the completion of LDEV1977, which allowed direct linking to the wiki from outside LAMS, so the link could be sent in emails

Options
    • -0
    • +11
    ./java/org/lamsfoundation/lams/tool/wiki/dto/WikiDTO.java
    • -0
    • +11
    ./java/org/lamsfoundation/lams/tool/wiki/dto/WikiUserDTO.java
    • -0
    • +15
    ./java/org/lamsfoundation/lams/tool/wiki/model/Wiki.java
    • -6
    • +39
    ./java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java
    • -59
    • +45
    ./java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
    • -0
    • +4
    ./java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java
    • -14
    • +8
    ./java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java
    • -13
    • +25
    ./java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java
    • -1
    • +3
    ./java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java
    • -41
    • +170
    ./java/org/lamsfoundation/lams/tool/wiki/web/actions/WikiPageAction.java
    • -0
    • +10
    ./java/org/lamsfoundation/lams/tool/wiki/web/forms/AuthoringForm.java
    • -0
    • +11
    ./java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml
  13. … 10 more files in changeset.
Wednesday 15 Oct 2008
1:21 pm

lfoxton

Cleanup and commenting

Options
    • -1
    • +47
    ./java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java
    • -135
    • +128
    ./java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
    • -2
    • +44
    ./java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java
    • -15
    • +46
    ./java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java
    • -1
    • +29
    ./java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java
    • -1
    • +43
    ./java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java
10:59 am

lfoxton

LDEV-1966 Implemented a special workspace folder for each session of the wiki

Monitor and learner modules adjuested to point to this folder

Export portfolio adjusted to export folder images and point to the correct location

Options
    • -4
    • +16
    ./java/org/lamsfoundation/lams/tool/wiki/dto/WikiSessionDTO.java
    • -1
    • +17
    ./java/org/lamsfoundation/lams/tool/wiki/model/WikiSession.java
    • -1
    • +4
    ./java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
    • -2
    • +3
    ./java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java
    • -0
    • +4
    ./java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java
    • -5
    • +63
    ./java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java
  7. … 5 more files in changeset.
Tuesday 14 Oct 2008
12:14 pm

lfoxton

Adding reflection to export portfolio

Options
    • -1
    • +34
    ./java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java
  2. … 1 more file in changeset.
10:11 am

lfoxton

LDEV-1954 Do export portfolio

Done for teacher.

Also fixed problem with grouping causing wiki pages to be copied for each new group.

Options
    • -0
    • +7
    ./java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
    • -0
    • +1
    ./java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java
    • -13
    • +42
    ./java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java
  4. … 3 more files in changeset.