lams-github

lams_admin

Clone Tools

Stats

Commits this week: 0
Total Committers: 23
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
Thursday 04 Nov 2010
9:24 pm

Marcin Cieslak

LDEV-2596: Forcing CKEditor be reinitialized after AJAX form submit.

Options
    • -17
    • +26
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 28 more files in changeset.
Tuesday 02 Nov 2010
12:06 am

Andrey Balan

LDEV-2489 Added a checkbox to the configure learners/staff popup that will check/uncheck all other boxes. Also investigated sorting and paging of the table.

*merge from lams2_3_release

Options
    • -0
    • +2
    ./web/organisation/cloneStart.jsp
    • -21
    • +81
    ./web/organisation/parts/selectLearners.jsp
    • -21
    • +78
    ./web/organisation/parts/selectStaff.jsp
Sunday 24 Oct 2010
3:39 pm

Marcin Cieslak

LDEV-2577: Readded videorecorder plugin. Readded missing contentFolderID parameter to CKEditor instances.

Options
    • -1
    • +2
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 36 more files in changeset.
Thursday 21 Oct 2010
8:57 pm

Marcin Cieslak

LDEV-2577, LDEV-2588: Fixed names of buttons that have changed from FCKEditor. CKEditor are hidden until they are completely initialized.

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

Andrey Balan

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

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    ./conf/xdoclet/struts-forms.xml
    • -0
    • +16
    ./src/java/org/lamsfoundation/lams/admin/web/UserAction.java
    • -0
    • +2
    ./web/WEB-INF/struts/struts-config.xml
    • -0
    • +33
    ./web/user.jsp
10:38 pm

Andrey Balan

LDEV-2544 Default Timezones *merge from lams2_3_release

Options
    • -0
    • +15
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +6
    ./conf/xdoclet/struts-forms.xml
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/admin/web/UserAction.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java
    • -0
    • +165
    ./src/java/org/lamsfoundation/lams/admin/web/action/TimezoneManagementAction.java
    • -0
    • +31
    ./web/WEB-INF/struts/struts-config.xml
    • -0
    • +10
    ./web/WEB-INF/tiles/tiles-defs.xml
    • -0
    • +65
    ./web/timezoneManagement.jsp
    • -0
    • +64
    ./web/timezoneServerManagement.jsp
  11. … 26 more files in changeset.
Tuesday 25 May 2010
10:48 pm

Andrey Balan

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

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
  2. … 5 more files in changeset.
Saturday 20 Mar 2010
12:38 pm

jliew

LDEV-2543 merge from branch

Options
    • -1
    • +1
    ./web/cleanup.jsp
Thursday 18 Mar 2010
1:59 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
2:22 am

erniegx <ernieg@gmail.com>

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

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

erniegx <ernieg@gmail.com>

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

Options
    • -4
    • +13
    ./src/java/org/lamsfoundation/lams/admin/web/action/EmailUserAction.java
  2. … 2 more files in changeset.
Tuesday 09 Mar 2010
8:14 pm

Andrey Balan

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

Options
    • -0
    • +1
    ./.classpath
    • -1
    • +4
    ./src/java/org/lamsfoundation/lams/admin/web/action/EmailUserAction.java
Sunday 07 Mar 2010
11:40 pm

erniegx <ernieg@gmail.com>

Updating English Clone lessons (LDEV-2489)

Options
    • -2
    • +24
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +24
    ./conf/language/lams/ApplicationResources_en_AU.properties
11:27 pm

erniegx <ernieg@gmail.com>

Updating labels for English Spanish (LDEV-2089)

Options
    • -191
    • +166
    ./conf/language/lams/ApplicationResources.properties
    • -190
    • +167
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -239
    • +263
    ./conf/language/lams/ApplicationResources_es_ES.properties
Saturday 06 Mar 2010
11:39 pm

Andrey Balan

LDEV-2089 added option to email the found user

Options
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java
    • -0
    • +137
    ./src/java/org/lamsfoundation/lams/admin/web/action/EmailUserAction.java
    • -0
    • +75
    ./src/java/org/lamsfoundation/lams/admin/web/form/EmailForm.java
    • -325
    • +349
    ./web/WEB-INF/struts/struts-config.xml
    • -0
    • +5
    ./web/WEB-INF/tiles/tiles-defs.xml
    • -0
    • +60
    ./web/emailuser.jsp
    • -0
    • +9
    ./web/usersearchlist.jsp
Friday 05 Mar 2010
4:19 pm

Andrey Balan

LDEV-2509 Embedded SMTP server

Options
    • -0
    • +29
    ./web/config/editconfig.jsp
  2. … 16 more files in changeset.
Wednesday 24 Feb 2010
2:54 am

lfoxton

SIF-4 Fixing the openid servlet so it correctly checks against the list of trusted servers

Options
    • -1
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +5
    ./web/openidConfig.jsp
  4. … 1 more file in changeset.
Thursday 18 Feb 2010
6:43 am

lfoxton

SIF-4 Making single-signon capabilities for openid

Options
    • -0
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +5
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +112
    ./src/java/org/lamsfoundation/lams/admin/web/OpenIDConfigAction.java
    • -0
    • +43
    ./src/java/org/lamsfoundation/lams/admin/web/OpenIDConfigForm.java
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java
    • -266
    • +327
    ./web/WEB-INF/struts/struts-config.xml
    • -0
    • +60
    ./web/openidConfig.jsp
  8. … 25 more files in changeset.
Wednesday 03 Feb 2010
5:29 am

jliew

LDEV-2489 put clone lessons in a transaction

Options
    • -103
    • +6
    ./src/java/org/lamsfoundation/lams/admin/web/action/CloneLessonsAction.java
  2. … 3 more files in changeset.
Friday 22 Jan 2010
6:14 am

jliew

LDEV-2489 don't let non-sysadmins see clone lessons link; forgot to i18n'ise

Options
    • -2
    • +7
    ./web/organisation/list.jsp
3:59 am

jliew

LDEV-2489 ability to clone lessons from any other group

Options
    • -1
    • +23
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +23
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -324
    • +0
    ./src/java/org/lamsfoundation/lams/admin/web/action/CloneGroupAction.java
    • -0
    • +330
    ./src/java/org/lamsfoundation/lams/admin/web/action/CloneLessonsAction.java
    • -2
    • +2
    ./web/WEB-INF/tiles/tiles-defs.xml
    • -1
    • +10
    ./web/organisation/cloneResult.jsp
    • -32
    • +51
    ./web/organisation/cloneStart.jsp
    • -3
    • +3
    ./web/organisation/parts/availableLessons.jsp
    • -13
    • +0
    ./web/organisation/parts/cloneGroupAttributes.jsp
    • -15
    • +0
    ./web/organisation/parts/cloneGroupMembers.jsp
    • -5
    • +5
    ./web/organisation/parts/selectLearners.jsp
    • -5
    • +5
    ./web/organisation/parts/selectStaff.jsp
Thursday 21 Jan 2010
9:18 am

jliew

LDEV-2489 clone lessons progress

Options
    • -0
    • +1
    ./.classpath
    • -0
    • +18
    ./src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java
    • -0
    • +324
    ./src/java/org/lamsfoundation/lams/admin/web/action/CloneGroupAction.java
    • -0
    • +18
    ./web/WEB-INF/tiles/tiles-defs.xml
    • -0
    • +14
    ./web/organisation/cloneResult.jsp
    • -0
    • +175
    ./web/organisation/cloneStart.jsp
    • -0
    • +10
    ./web/organisation/list.jsp
    • -0
    • +26
    ./web/organisation/parts/availableLessons.jsp
    • -0
    • +15
    ./web/organisation/parts/breadcrumbs.jsp
    • -0
    • +13
    ./web/organisation/parts/cloneGroupAttributes.jsp
    • -0
    • +15
    ./web/organisation/parts/cloneGroupMembers.jsp
    • -0
    • +34
    ./web/organisation/parts/selectLearners.jsp
    • -0
    • +34
    ./web/organisation/parts/selectStaff.jsp
  14. … 4 more files in changeset.
Friday 27 Nov 2009
6:09 am

jliew

autoformat

Options
    • -92
    • +83
    ./src/java/org/lamsfoundation/lams/admin/web/UserOrgSaveAction.java
6:08 am

jliew

LDEV-2472 according to stacktrace, hibernate flushes session at beginning of findById(userId) call, so don't remove child object until after any hibernate ops

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/admin/web/UserOrgSaveAction.java
Friday 13 Nov 2009
4:14 am

jliew

LDEV-2459 use double quotes when enclosing i18n text in javascript

Options
    • -1
    • +1
    ./web/ldap.jsp
    • -9
    • +9
    ./web/organisation/list.jsp
    • -6
    • +6
    ./web/themeManagement.jsp
    • -2
    • +2
    ./web/userlist.jsp
    • -2
    • +2
    ./web/userorg.jsp
    • -1
    • +1
    ./web/usersearchlist.jsp
  7. … 42 more files in changeset.
Monday 09 Nov 2009
7:48 am

jliew

translation update

Options
    • -4
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -46
    • +91
    ./conf/language/lams/ApplicationResources_fr_FR.properties
  3. … 30 more files in changeset.
6:56 am

jliew

don't include classes in war file

Options
    • -2
    • +1
    ./build.xml
6:48 am

jliew

autoformat

Options
    • -166
    • +159
    ./src/java/org/lamsfoundation/lams/admin/web/action/LdapConfigAction.java