lams

lams_admin

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 14
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 37,858
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
Saturday 16 Oct 2010
1:03 am

Andrey Balan

LDEV-2509 Embedded SMTP server

*Merge from HEAD

Options
    • -0
    • +29
    ./web/config/editconfig.jsp
  2. … 17 more files in changeset.
Sunday 10 Oct 2010
7:46 pm

Marcin Cieslak

LDEV-2577: Removed quotation marks on "displayExpanded" option so it gets parsed correctly.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 27 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
    • -1
    • +1
    ./conf/xdoclet/servlet-mappings.xml
    • -8
    • +0
    ./conf/xdoclet/taglibs.xml
    • -16
    • +5
    ./web/loginmaintain.jsp
    • -2
    • +2
    ./web/WEB-INF/lams.tld
    • -129
    • +0
    ./web/WEB-INF/fckeditor/tlds/FCKeditor.tld
    • -0
    • +54
    ./web/WEB-INF/tags/CKEditor.tag
    • -54
    • +0
    ./web/WEB-INF/tags/FCKEditor.tag
  8. … 1090 more files in changeset.
Saturday 02 Oct 2010
5:01 am

Andrey Balan

LDEV-2519 added fields 'timezone' and 'enable flash for learner window' to Admin user edit page

Options
    • -1
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    ./conf/xdoclet/struts-forms.xml
    • -1
    • +17
    ./src/java/org/lamsfoundation/lams/admin/web/UserAction.java
    • -0
    • +33
    ./web/user.jsp
    • -0
    • +2
    ./web/WEB-INF/struts/struts-config.xml
4:30 am

Andrey Balan

LDEV-2544 Default Timezones

*merge from lams2_3_release

Options
    • -1
    • +16
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +6
    ./conf/xdoclet/struts-forms.xml
    • -1
    • +10
    ./src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java
    • -1
    • +7
    ./src/java/org/lamsfoundation/lams/admin/web/UserAction.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java
    • -0
    • +165
    ./src/java/org/lamsfoundation/lams/admin/web/action/TimezoneManagementAction.java
    • -0
    • +65
    ./web/timezoneManagement.jsp
    • -0
    • +64
    ./web/timezoneServerManagement.jsp
    • -0
    • +31
    ./web/WEB-INF/struts/struts-config.xml
    • -0
    • +10
    ./web/WEB-INF/tiles/tiles-defs.xml
  11. … 26 more files in changeset.
12:54 am

Andrey Balan

file timezoneManagement.jsp was initially added on branch lams2_3_release.

Options
    • -0
    • +0
    ./web/timezoneManagement.jsp
12:54 am

Andrey Balan

file timezoneServerManagement.jsp was initially added on branch lams2_3_release.

Options
    • -0
    • +0
    ./web/timezoneServerManagement.jsp
12:54 am

Andrey Balan

LDEV-2544 Default Timezones

*added ability to change server timezone

Options
    • -2
    • +9
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/admin/web/UserAction.java
    • -12
    • +60
    ./src/java/org/lamsfoundation/lams/admin/web/action/TimezoneManagementAction.java
    • -0
    • +65
    ./web/timezoneManagement.jsp
    • -0
    • +64
    ./web/timezoneServerManagement.jsp
    • -58
    • +0
    ./web/timezonemanagement.jsp
    • -318
    • +355
    ./web/WEB-INF/struts/struts-config.xml
    • -2
    • +7
    ./web/WEB-INF/tiles/tiles-defs.xml
  9. … 13 more files in changeset.
Wednesday 26 May 2010
4:38 am

Andrey Balan

LDEV-2564 add Option in "Edit configuration settings" for not displaying the "All My Lesson" option in My Profile tab

Options
    • -1
    • +2
    ./conf/language/lams/ApplicationResources.properties
  2. … 5 more files in changeset.
4:23 am

Andrey Balan

LDEV-2564 add Option in "Edit configuration settings" for not displaying the "All My Lesson" option in My Profile tab

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources.properties
  2. … 5 more files in changeset.
Friday 16 Apr 2010
2:15 pm

Ernie Ghiglione

Updating English, Spanish (Spain), Norwegian, French

Options
    • -2
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +4
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +12
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -2
    • +4
    ./conf/language/lams/ApplicationResources_no_NO.properties
Tuesday 13 Apr 2010
6:32 am

Ernie Ghiglione

Updating Greek and Norwegian

Options
    • -2
    • +10
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +10
    ./conf/language/lams/ApplicationResources_no_NO.properties
Monday 12 Apr 2010
11:02 am

jliew

LDEV-2489 backport clone lessons from head

Options
    • -0
    • +1
    ./.classpath
    • -1
    • +19
    ./src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java
    • -0
    • +233
    ./src/java/org/lamsfoundation/lams/admin/web/action/CloneLessonsAction.java
    • -0
    • +18
    ./web/WEB-INF/tiles/tiles-defs.xml
    • -0
    • +23
    ./web/organisation/cloneResult.jsp
    • -0
    • +194
    ./web/organisation/cloneStart.jsp
    • -0
    • +15
    ./web/organisation/list.jsp
    • -0
    • +26
    ./web/organisation/parts/availableLessons.jsp
    • -0
    • +15
    ./web/organisation/parts/breadcrumbs.jsp
    • -0
    • +34
    ./web/organisation/parts/selectLearners.jsp
    • -0
    • +34
    ./web/organisation/parts/selectStaff.jsp
  12. … 8 more files in changeset.
Friday 09 Apr 2010
1:52 pm

Ernie Ghiglione

LDEV-2544: Updating English, Spanish (Spain)

Options
    • -380
    • +406
    ./conf/language/lams/ApplicationResources.properties
    • -370
    • +406
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +10
    ./conf/language/lams/ApplicationResources_es_ES.properties
1:44 pm

Ernie Ghiglione

file ApplicationResources_es_MX.properties was initially added on branch lams2_3_release.

Options
    • -0
    • +0
    ./conf/language/lams/ApplicationResources_es_MX.properties
1:44 pm

Ernie Ghiglione

Adding Spanish Mexico Updating Gereman, Greek, Spanish-Spain, France, Norwegian

Options
    • -370
    • +398
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -370
    • +398
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -370
    • +398
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +448
    ./conf/language/lams/ApplicationResources_es_MX.properties
    • -370
    • +398
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -373
    • +401
    ./conf/language/lams/ApplicationResources_no_NO.properties
Wednesday 07 Apr 2010
4:31 am

Andrey Balan

LDEV-2519 added fields 'timezone' and 'enable flash for learner window' to admin user edit page

Options
    • -7
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    ./conf/xdoclet/struts-forms.xml
    • -1
    • +23
    ./src/java/org/lamsfoundation/lams/admin/web/UserAction.java
    • -0
    • +33
    ./web/user.jsp
    • -0
    • +2
    ./web/WEB-INF/struts/struts-config.xml
Friday 02 Apr 2010
4:13 am

Andrey Balan

LDEV-2544 adding comments

Options
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/admin/web/action/TimezoneManagementAction.java
  2. … 9 more files in changeset.
Thursday 01 Apr 2010
3:14 am

Andrey Balan

LDEV-2544 adding Timezone Manager

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +6
    ./conf/xdoclet/struts-forms.xml
    • -75
    • +30
    ./src/java/org/lamsfoundation/lams/admin/web/action/TimezoneManagementAction.java
    • -10
    • +11
    ./web/timezonemanagement.jsp
    • -1
    • +6
    ./web/WEB-INF/struts/struts-config.xml
  6. … 11 more files in changeset.
Wednesday 31 Mar 2010
7:50 am

Andrey Balan

file timezonemanagement.jsp was initially added on branch lams2_3_release.

Options
    • -0
    • +0
    ./web/timezonemanagement.jsp
7:50 am

Andrey Balan

file TimezoneManagementAction.java was initially added on branch lams2_3_release.

Options
    • -0
    • +0
    ./src/java/org/lamsfoundation/lams/admin/web/action/TimezoneManagementAction.java
7:49 am

Andrey Balan

LDEV-2544 adding Timezone Manager

Options
    • -1
    • +15
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +10
    ./src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java
    • -0
    • +162
    ./src/java/org/lamsfoundation/lams/admin/web/action/TimezoneManagementAction.java
    • -0
    • +57
    ./web/timezonemanagement.jsp
    • -280
    • +328
    ./web/WEB-INF/struts/struts-config.xml
    • -0
    • +5
    ./web/WEB-INF/tiles/tiles-defs.xml
  8. … 27 more files in changeset.
Saturday 20 Mar 2010
7:38 pm

jliew

LDEV-2543 merge from branch

Options
    • -1
    • +1
    ./web/cleanup.jsp
7:36 pm

jliew

LDEV-2543 fix old reference

Options
    • -1
    • +1
    ./web/cleanup.jsp
Thursday 18 Mar 2010
8:58 pm

Andrey Balan

LDEV-2329 When editing in monitor if press the "Cancel" button, the define_later flag *does* get removed.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/AuthoringButton.tag
  2. … 28 more files in changeset.
8:13 pm

Andrey Balan

LDEV-2329 When editing in monitor if press the "Cancel" button, the define_later flag *does* get removed.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/AuthoringButton.tag
  2. … 28 more files in changeset.
Thursday 11 Mar 2010
9:22 am

Ernie Ghiglione

LDEV-2089: put [ ] so it doesn't look like 'Login as Email'

Options
    • -6
    • +4
    ./web/usersearchlist.jsp
Wednesday 10 Mar 2010
2:19 pm

Andrey Balan

file EmailUserAction.java was added on branch lams2_3_release on 2010-10-16 11:21:55 +0000

Options
    • -0
    • +0
    ./src/java/org/lamsfoundation/lams/admin/web/action/EmailUserAction.java
2:18 pm

Ernie Ghiglione

LDEV-2089: added name support and strips html <BR> tags.

Options
    • -5
    • +14
    ./src/java/org/lamsfoundation/lams/admin/web/action/EmailUserAction.java
  2. … 2 more files in changeset.
3:14 am

Andrey Balan

LDEV-2089 send email using sysadmin email address(and not lams support one)

Options
    • -0
    • +1
    ./.classpath
    • -2
    • +5
    ./src/java/org/lamsfoundation/lams/admin/web/action/EmailUserAction.java