lams-github / lams_central / web

main.jsp

Clone Tools

Stats

Commits this week: 0
Total Committers: 18
Last Commit: 14 Mar 24
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
Tuesday 07 Apr 2020
11:29 am

Andrey Balan

LDEV-4995 Fix sticky footer

Options
    • -1
    • +1
    ./main.jsp
  2. … 1 more file in changeset.
3:24 am

Andrey Balan

LDEV-4995 Improve index page

* Add paging

* Sticky footer

* Cosmetic CSS improvements

Options
    • -194
    • +29
    ./main.jsp
  2. … 3 more files in changeset.
Saturday 04 Apr 2020
3:02 am

Andrey Balan

LDEV-4995 Introduce "fa-spin" icon back

Options
    • -5
    • +1
    ./main.jsp
  2. … 1 more file in changeset.
2:28 am

Andrey Balan

LDEV-4995 Improvements to the index page

* Make vertical scroller work properly even for orgs with lengthy names

* Vertically align fa-chevron-circle icon

* Remove "fa-spin". fadeOut, fadeIn the page instead

Options
    • -2
    • +5
    ./main.jsp
  2. … 4 more files in changeset.
Friday 03 Apr 2020
3:42 am

Andrey Balan

LDEV-4995 Improvements to the index page

* Fix offcanvas bar search and organisation tablesorter markup in case

of big amount of available organisations

* Optimise DB queries

* Introduce hasContributeActivities Lesson's flag

* Show "fa-spin" when loading an organisation

Options
    • -3
    • +2
    ./main.jsp
  2. … 19 more files in changeset.
Tuesday 31 Mar 2020
2:34 am

Andrey Balan

LDEV-4995 Improvements to the index page

* Fix favorite organisations markup

* Fix cards height

* Email notifications buttons moved under "Three dots" menu

* Hide reorder buttons for any order other than "Default" one

* Reintroduce chart labels

Options
    • -39
    • +20
    ./main.jsp
  2. … 5 more files in changeset.
Friday 27 Mar 2020
10:15 pm

Andrey Balan

LDEV-4995 Hide charts on a smaller devices in a list view mode

Options
    • -0
    • +4
    ./main.jsp
4:37 pm

Andrey Balan

LDEV-4995 Keep datatable buttons on one line even for smaller devices

Options
    • -7
    • +2
    ./main.jsp
3:43 am

Andrey Balan

LDEV-4995 Further development of index page

Options
    • -94
    • +161
    ./main.jsp
  2. … 16 more files in changeset.
Saturday 21 Mar 2020
1:47 pm

Andrey Balan

LDEV-4995 Move reordering icons to the end of the line

Options
    • -6
    • +8
    ./main.jsp
  2. … 1 more file in changeset.
3:22 am

Andrey Balan

LDEV-4995 Show exclamation sign button properly

Options
    • -1
    • +0
    ./main.jsp
  2. … 1 more file in changeset.
2:47 am

Andrey Balan

LDEV-4995 Upgrade to bootstrap 4

* Update LAMS code to use bootstrap 4

* Update and redesign index page

Options
    • -128
    • +435
    ./main.jsp
  2. … 198 more files in changeset.
Thursday 09 Jan 2020
8:59 am

Andrey Balan

Merge branch 'master' into v4.0

# Conflicts:

# lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_build/build.xml

# lams_build/liblist.txt

# lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

# lams_central/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_central/web/authoringConfirm.jsp

# lams_central/web/common/taglibs.jsp

# lams_central/web/includes/javascript/authoring/authoringGeneral.js

# lams_central/web/includes/javascript/outcome.js

# lams_central/web/outcome/outcomeEdit.jsp

# lams_central/web/outcome/outcomeManage.jsp

# lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

# lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java

# lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java

# lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp

# lams_tool_laqa/web/authoring/newQuestionBox.jsp

# lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp

# lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java

# lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java

# lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/web/pages/authoring/basic.jsp

# lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_www/web/WEB-INF/tags/OutcomeAuthor.tag

Options
    • -6
    • +4
    ./main.jsp
  2. … 94 more files in changeset.
Tuesday 31 Dec 2019
7:35 pm

Andrey Balan

LDEV-4932 Add CSRF to monitor and central

* Add CSRF protection to:

- Change lesson status (incl. remove)

- Remove lesson using main.jsp button

- Rename lesson

* Start using /common/taglibs.jsp in lams_central

Options
    • -6
    • +4
    ./main.jsp
  2. … 23 more files in changeset.
Thursday 19 Dec 2019
2:54 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4931 Adding ids to support Admin tests

Options
    • -1
    • +1
    ./main.jsp
  2. … 7 more files in changeset.
Friday 08 Nov 2019
4:29 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

lams_central/web/main.jsp

lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_lamc/web/authoring/itemlist.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java

lams_tool_scratchie/web/pages/authoring/start.jsp

lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

Options
    • -339
    • +336
    ./main.jsp
  2. … 27 more files in changeset.
Monday 14 Oct 2019
12:36 pm

Andrey Balan

Merge branch 'master' into develop

Options
    • -0
    • +3
    ./main.jsp
11:38 am

Andrey Balan

LDEV-4873 Revert LAMS copyright label removal

Options
    • -0
    • +3
    ./main.jsp
  2. … 1 more file in changeset.
Sunday 13 Oct 2019
9:02 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'master' into develop

Options
    • -2
    • +2
    ./main.jsp
8:42 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4877 Bootstrap tourist replaced tour for Bootstrap 3.4.1

Options
    • -2
    • +2
    ./main.jsp
  2. … 8 more files in changeset.
Friday 11 Oct 2019
10:46 pm

Andrey Balan

Merge branch 'master' into develop

Conflicts:

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java

Options
    • -6
    • +0
    ./main.jsp
  2. … 4 more files in changeset.
10:42 pm

Andrey Balan

LDEV-4873 Remove version numbering from login and main pages

And add it instead to sysadmin.jsp

Options
    • -6
    • +0
    ./main.jsp
  2. … 2 more files in changeset.
Friday 14 Jun 2019
7:11 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'develop' into LDEV-4759

# Conflicts:

# lams_central/web/authoring/template/tool/mcquestion.jsp

# lams_central/web/authoringConfirm.jsp

# lams_central/web/css/_learner_base.scss

# lams_central/web/profile/editprofile.jsp

# lams_learning/web/optionsActivity.jsp

# lams_monitoring/web/monitor.jsp

# lams_monitoring/web/tblmonitor/sequence.jsp

# lams_monitoring/web/tblmonitor/teams.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/common/monitoringheader.jsp

# lams_tool_preview/web/pages/monitoring/criteria.jsp

# lams_tool_preview/web/pages/monitoring/reflections.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp

# lams_tool_task/web/common/monitorheader.jsp

Options
    • -3
    • +1
    ./main.jsp
  2. … 94 more files in changeset.
Wednesday 05 Jun 2019
10:17 am

Marcin Cieslak

LDEV-4828 Add QB collections link on index page

Options
    • -331
    • +339
    ./main.jsp
  2. … 3 more files in changeset.
Wednesday 13 Mar 2019
2:20 pm

Marcin Cieslak

LDEV-4788 All learning outcomes are now global

Options
    • -3
    • +1
    ./main.jsp
  2. … 21 more files in changeset.
Tuesday 26 Feb 2019
10:18 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Fixing responsive behaviour on front page and tabs.

Options
    • -2
    • +3
    ./main.jsp
  2. … 43 more files in changeset.
Friday 22 Feb 2019
12:51 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Gradebook and jqGrid restyled.

Options
    • -3
    • +5
    ./main.jsp
  2. … 50 more files in changeset.
Wednesday 20 Feb 2019
4:58 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Main page restyled.

Options
    • -21
    • +17
    ./main.jsp
  2. … 9 more files in changeset.
Sunday 10 Feb 2019
1:06 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Tour and portrait pop ups appear correctly.

Options
    • -3
    • +3
    ./main.jsp
  2. … 43 more files in changeset.
Thursday 07 Feb 2019
9:09 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Main page functional

Options
    • -11
    • +12
    ./main.jsp
  2. … 35 more files in changeset.