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
Wednesday 18 Jul 2018
3:02 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

lams_build/3rdParty.userlibraries

lams_build/build.xml

lams_build/conf/j2ee/jboss-deployment-structure.xml

lams_build/lib/lams/lams.jar

lams_build/liblist.txt

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

Options
    • -14
    • +4
    ./src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java
    • -0
    • +295
    ./src/java/org/lamsfoundation/lams/admin/web/action/PolicyManagementAction.java
  3. … 25 more files in changeset.
Tuesday 17 Jul 2018
3:36 pm

Marcin Cieslak

LDEV-4617 Add an option to enable email verification on sign up

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/admin/web/action/SignupManagementAction.java
    • -0
    • +1
    ./web/WEB-INF/struts-config.xml
    • -0
    • +5
    ./web/css/admin.scss
    • -0
    • +6
    ./web/signupmanagement/add.jsp
    • -0
    • +4
    ./web/signupmanagement/list.jsp
  7. … 4 more files in changeset.
Monday 09 Jul 2018
7:13 pm

Andrey Balan

LDEV-4631 Set server timezone for users created via integrations/spreadsheet and signup pages

Options
    • -1
    • +4
    ./src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml
    • -28
    • +26
    ./src/java/org/lamsfoundation/lams/admin/service/ImportService.java
  3. … 5 more files in changeset.
Sunday 08 Jul 2018
7:18 pm

Marcin Cieslak

Merge branch 'LDEF-4627'

Options
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java
1:20 pm

Andrey Balan

LDEV-4628 Set default timezone when creating a user

* Also fix an issue with storing server'd timezone containing

"+", e.g. "ETC+4"

Options
    • -1
    • +6
    ./src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java
    • -1
    • +2
    ./web/timezoneServerManagement.jsp
11:30 am

Marcin Cieslak

LDEV-4625 Use the default country when creating a new user by sysadmin

Options
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java
11:27 am

Marcin Cieslak

LDEV-4625 Make server country configurable

Also use default country in integrations

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/admin/web/action/ConfigAction.java
    • -0
    • +9
    ./web/config/items.jsp
  4. … 5 more files in changeset.
10:31 am

Marcin Cieslak

LDEV-4625 Use default country configured on server

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/admin/service/ImportService.java
  2. … 3 more files in changeset.
10:12 am

Marcin Cieslak

LDEV-4626 Use default country when importing users

Options
    • -1
    • +5
    ./src/java/org/lamsfoundation/lams/admin/service/ImportService.java
9:50 am

Marcin Cieslak

LDEV-4616 Do not look for removed locale when saving an org

Options
    • -23
    • +19
    ./src/java/org/lamsfoundation/lams/admin/web/action/OrgSaveAction.java
Saturday 07 Jul 2018
9:58 pm

Andrey Balan

LDEV-4624 Signup page to use system language for country list

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java
  2. … 4 more files in changeset.
5:51 pm

Marcin Cieslak

LDEV-4616 Remove locale from courses

Options
    • -1
    • +0
    ./conf/language/lams/ApplicationResources.properties
    • -15
    • +4
    ./src/java/org/lamsfoundation/lams/admin/service/ImportService.java
    • -21
    • +0
    ./src/java/org/lamsfoundation/lams/admin/web/action/OrgSaveAction.java
    • -14
    • +4
    ./src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java
    • -1
    • +0
    ./web/WEB-INF/struts-config.xml
    • -12
    • +0
    ./web/organisation/courseAdminEdit.jsp
    • -12
    • +0
    ./web/organisation/createOrEdit.jsp
    • -8
    • +0
    ./web/organisation/list.jsp
  9. … 5 more files in changeset.
9:20 am

Marcin Cieslak

LDEV-4615 Add create date on user page in admin

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java
    • -0
    • +12
    ./web/user.jsp
Thursday 05 Jul 2018
5:58 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4593: Adding English labels. LDEV-4605: removing country list from admin

Options
    • -18
    • +22
    ./conf/language/lams/ApplicationResources.properties
    • -255
    • +33
    ./conf/language/lams/ApplicationResources_en_AU.properties
5:56 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4593: Adding Spanish labels

Options
    • -2
    • +32
    ./conf/language/lams/ApplicationResources_es_ES.properties
5:33 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4614: Moving labels around

Moving labels for countries out of lams_admin and lams_central to lams_common instead.

Options
    • -251
    • +3
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -251
    • +3
    ./conf/language/lams/ApplicationResources_es_ES.properties
  3. … 6 more files in changeset.
2:02 pm

Andrey Balan

LDEV-4614 Sort country list by name rather than code

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java
    • -2
    • +2
    ./web/user.jsp
  3. … 5 more files in changeset.
Wednesday 04 Jul 2018
10:56 pm

Andrey Balan

LDEV-4620 Submit Files tool to log release marks event

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
  2. … 6 more files in changeset.
Tuesday 03 Jul 2018
8:57 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4605: Adding country list in Greek

Options
    • -2
    • +251
    ./conf/language/lams/ApplicationResources_el_GR.properties
8:49 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4605: Adding country list in Spanish

Adding country list in Español

Options
    • -2
    • +251
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 1 more file in changeset.
Monday 02 Jul 2018
7:47 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4605 adding missing country/territory

I forgot to include BQ = Bonaire, Saint Eustatius and Saba. Glad no one noticed ;-)

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
  2. … 2 more files in changeset.
Friday 29 Jun 2018
11:37 pm

Andrey Balan

Merge branch 'LDEV-4605'

Options
    • -0
    • +250
    ./conf/language/lams/ApplicationResources_en_AU.properties
  2. … 1 more file in changeset.
11:35 pm

Andrey Balan

LDEV-4605 Codify country for users

Change the country field to ISO_3166-1 alpha-2 codes (two letters).

So in when editing the profile, a user should be able to set his/her

country based on the list of countries in the ISO list.

Country should be a compulsory when editing profile, editing user

as group manager and in signup pages.

For integrations, if the country is not passed, then we should default

to a default country server.

Options
    • -0
    • +250
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -18
    • +20
    ./src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java
    • -14
    • +6
    ./src/java/org/lamsfoundation/lams/admin/web/action/UserSaveAction.java
    • -114
    • +142
    ./web/user.jsp
  5. … 9 more files in changeset.
3:07 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4593: small UI changes

Adding a new label to explain the scope of minor changes to policies

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -10
    • +19
    ./web/policies/editPolicy.jsp
Thursday 28 Jun 2018
8:26 pm

Andrey Balan

Merge branch 'LDEV-4593'

Options
    • -0
    • +27
    ./conf/language/lams/ApplicationResources.properties
  2. … 5 more files in changeset.
8:18 pm

Andrey Balan

LDEV-4593 Further develop Policies & consents feature

* Remove "Create a new draft" functionality

* Add policy details page

Options
    • -1
    • +0
    ./conf/language/lams/ApplicationResources.properties
    • -47
    • +36
    ./src/java/org/lamsfoundation/lams/admin/web/action/PolicyManagementAction.java
    • -1
    • +0
    ./web/WEB-INF/struts-config.xml
    • -2
    • +1
    ./web/policies/editPolicy.jsp
    • -12
    • +3
    ./web/policies/policyTable.jsp
  6. … 5 more files in changeset.
12:54 am

Andrey Balan

LDEV-4593 Further develop Policies & consents feature

Options
    • -5
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -89
    • +102
    ./src/java/org/lamsfoundation/lams/admin/web/action/PolicyManagementAction.java
    • -37
    • +0
    ./src/java/org/lamsfoundation/lams/admin/web/dto/UserPolicyConsentDTO.java
    • -1
    • +6
    ./web/WEB-INF/struts-config.xml
    • -1
    • +1
    ./web/policies/editPolicy.jsp
    • -110
    • +24
    ./web/policies/policies.jsp
    • -0
    • +100
    ./web/policies/policyTable.jsp
    • -53
    • +85
    ./web/policies/userConsents.jsp
  9. … 6 more files in changeset.
Saturday 23 Jun 2018
2:23 am

Andrey Balan

LDEV-4593 Further develop Policies & consents feature

Options
    • -7
    • +6
    ./conf/language/lams/ApplicationResources.properties
    • -59
    • +87
    ./src/java/org/lamsfoundation/lams/admin/web/action/PolicyManagementAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java
    • -0
    • +37
    ./src/java/org/lamsfoundation/lams/admin/web/dto/UserPolicyConsentDTO.java
    • -0
    • +6
    ./web/WEB-INF/struts-config.xml
    • -2
    • +2
    ./web/WEB-INF/tiles-defs.xml
    • -138
    • +0
    ./web/policies/edit.jsp
    • -0
    • +143
    ./web/policies/editPolicy.jsp
    • -115
    • +0
    ./web/policies/list.jsp
    • -0
    • +164
    ./web/policies/policies.jsp
    • -81
    • +0
    ./web/policies/previousVersionsList.jsp
    • -0
    • +82
    ./web/policies/userConsents.jsp
  13. … 16 more files in changeset.
Thursday 14 Jun 2018
7:53 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating labels in various projects

English, Spanish and Greek

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -10
    • +11
    ./conf/language/lams/ApplicationResources_es_ES.properties
  5. … 10 more files in changeset.
Saturday 02 Jun 2018
4:40 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4594 Turn on/off the integration learner index page block

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
  2. … 8 more files in changeset.