moodle.git
6 years agoMDL-47059 Grades: Update the grade_grade if the finalgrade/or the grademax has changed.
Damyon Wiese [Fri, 19 Sep 2014 02:27:05 +0000 (10:27 +0800)]
MDL-47059 Grades: Update the grade_grade if the finalgrade/or the grademax has changed.

Part of: MDL-46576

6 years agoMDL-47059 Grades: Make natural weights work with extra credit
Damyon Wiese [Fri, 19 Sep 2014 01:22:17 +0000 (09:22 +0800)]
MDL-47059 Grades: Make natural weights work with extra credit

Part of: MDL-46576

6 years agoMDL-47059 Grades: Make natural weights work with exclude empty grades
Damyon Wiese [Thu, 18 Sep 2014 08:53:08 +0000 (16:53 +0800)]
MDL-47059 Grades: Make natural weights work with exclude empty grades

Part of: MDL-46576

6 years agoMDL-47078 Grades: Allow users to have different max grades due to exclusions etc.
Damyon Wiese [Thu, 18 Sep 2014 07:45:16 +0000 (15:45 +0800)]
MDL-47078 Grades: Allow users to have different max grades due to exclusions etc.

This is about making this work with natural weightings.

Part of: MDL-46576

6 years agoMDL-47009 Grades: Improve natural weighting algorithm
Damyon Wiese [Thu, 18 Sep 2014 06:43:34 +0000 (14:43 +0800)]
MDL-47009 Grades: Improve natural weighting algorithm

It's still not perfect, but this is getting closer.

This is based on Johns work on MDL-47009 (just the algorithm). There are some additional
changes to scale the weights if they do not add up to 1.

Part of: MDL-46576

6 years agoMDL-47274 core_grades: Correct totals when excluding hidden items
Frederic Massart [Wed, 17 Sep 2014 05:57:25 +0000 (13:57 +0800)]
MDL-47274 core_grades: Correct totals when excluding hidden items

Part of: MDL-46576

6 years agoMDL-47056 core_grades: Prevent items being displayed as 'Error'
Frederic Massart [Tue, 16 Sep 2014 07:51:12 +0000 (15:51 +0800)]
MDL-47056 core_grades: Prevent items being displayed as 'Error'

Before this patch we would be marking some items as 'needsupdate'
during an update. Leaving them aside and not effectively updating
them.

Part of: MDL-46576

6 years agoMDL-47260 core_grades: Prevent notices when setting up other aggregation method
Frederic Massart [Tue, 16 Sep 2014 07:11:45 +0000 (15:11 +0800)]
MDL-47260 core_grades: Prevent notices when setting up other aggregation method

This partially reverts:

4927c3ff (MDL-47011)
6484d460 (MDL-47055)

Part of: MDL-46576

6 years agoMDL-46139 core_grades: adjust behat tests
Marina Glancy [Tue, 16 Sep 2014 08:01:20 +0000 (16:01 +0800)]
MDL-46139 core_grades: adjust behat tests

Part of MDL-46576

6 years agoMDL-46797 core_grades: adjust behat tests
Marina Glancy [Tue, 16 Sep 2014 06:22:31 +0000 (14:22 +0800)]
MDL-46797 core_grades: adjust behat tests

Part of MDL-46576

6 years agoMDL-46966 core_grades: adjust behat tests
Marina Glancy [Tue, 16 Sep 2014 06:16:42 +0000 (14:16 +0800)]
MDL-46966 core_grades: adjust behat tests

Part of MDL-46797

6 years agoMDL-47098 core_grades: Fields to adjust a category's weight
Frederic Massart [Thu, 4 Sep 2014 04:39:23 +0000 (12:39 +0800)]
MDL-47098 core_grades: Fields to adjust a category's weight

6 years agoMDL-47055 core_grade: fixed extra credit handling on the full setup page
Andrew Davis [Thu, 4 Sep 2014 02:17:03 +0000 (10:17 +0800)]
MDL-47055 core_grade: fixed extra credit handling on the full setup page

6 years agoMDL-46827 core_grades: Allow reset of weights on categories
Frederic Massart [Wed, 3 Sep 2014 08:33:38 +0000 (16:33 +0800)]
MDL-46827 core_grades: Allow reset of weights on categories

6 years agoMDL-46827 usability: New icon for reset actions
Barbara Ramiro [Wed, 3 Sep 2014 09:44:35 +0000 (17:44 +0800)]
MDL-46827 usability: New icon for reset actions

6 years agoMDL-47007 core_grade: weights now shown on edit screen as percentages
Jetha Chan [Wed, 3 Sep 2014 02:41:24 +0000 (10:41 +0800)]
MDL-47007 core_grade: weights now shown on edit screen as percentages

6 years agoMDL-47055 core_grade: implemented support for extra credit within natural weighting
Andrew Davis [Wed, 3 Sep 2014 02:24:51 +0000 (10:24 +0800)]
MDL-47055 core_grade: implemented support for extra credit within natural weighting

6 years agoMDL-47058 core_grades: allow alteration of weight
Mark Nelson [Wed, 3 Sep 2014 04:48:50 +0000 (21:48 -0700)]
MDL-47058 core_grades: allow alteration of weight

Part of MDL-46576

6 years agoMDL-47058 core_grades: removed unnecessary print_object call
Mark Nelson [Wed, 3 Sep 2014 04:47:38 +0000 (21:47 -0700)]
MDL-47058 core_grades: removed unnecessary print_object call

Part of MDL-46576.

6 years agoMDL-46576 core_grade: Simplify code, remove obsolete calculations
John Okely [Tue, 2 Sep 2014 02:18:33 +0000 (10:18 +0800)]
MDL-46576 core_grade: Simplify code, remove obsolete calculations

6 years agoMDL-46576: Fix natural weight maximums aggregation (MDL-47009)
John Okely [Tue, 2 Sep 2014 01:36:05 +0000 (09:36 +0800)]
MDL-46576: Fix natural weight maximums aggregation (MDL-47009)

6 years agoMDL-46576: Update reports so that they display natural weights properly (MDL-47009)
John Okely [Thu, 28 Aug 2014 08:45:57 +0000 (16:45 +0800)]
MDL-46576: Update reports so that they display natural weights properly (MDL-47009)

6 years agoMDL-47011 core_grade: added ability to un-override grade_item weight
Andrew Davis [Tue, 2 Sep 2014 02:17:46 +0000 (10:17 +0800)]
MDL-47011 core_grade: added ability to un-override grade_item weight

6 years agoMDL-46966 core_grade: altered the default value of grade_aggregations_visible so...
Andrew Davis [Mon, 1 Sep 2014 11:59:00 +0000 (19:59 +0800)]
MDL-46966 core_grade: altered the default value of grade_aggregations_visible so only natural is on by default

6 years agoMDL-47011 core_grade: added the ability to override grade_item weight
Andrew Davis [Sun, 31 Aug 2014 11:08:50 +0000 (19:08 +0800)]
MDL-47011 core_grade: added the ability to override grade_item weight

6 years agoMDL-47011 core_grade: added naive natural weight calculation to gradebook
Andrew Davis [Fri, 29 Aug 2014 02:36:01 +0000 (10:36 +0800)]
MDL-47011 core_grade: added naive natural weight calculation to gradebook

6 years agoMDL-46576 core_grades: Add weights to natural (MDL-47006)
John Okely [Thu, 28 Aug 2014 04:19:59 +0000 (12:19 +0800)]
MDL-46576 core_grades: Add weights to natural (MDL-47006)

6 years agoMDL-46576 code_grade: Rename "Sum of grades" aggregation to "Natural"
John Okely [Tue, 19 Aug 2014 03:37:00 +0000 (11:37 +0800)]
MDL-46576 code_grade: Rename "Sum of grades" aggregation to "Natural"

6 years agoMDL-46139 Grades: Add behat tests for the new columns in the user report
Damyon Wiese [Thu, 14 Aug 2014 04:06:00 +0000 (12:06 +0800)]
MDL-46139 Grades: Add behat tests for the new columns in the user report

6 years agoMDL-46139 Grades: Add new grade_grades aggregation columns to backup/restore.
Damyon Wiese [Wed, 13 Aug 2014 08:36:44 +0000 (16:36 +0800)]
MDL-46139 Grades: Add new grade_grades aggregation columns to backup/restore.

6 years agoMDL-46139 Grades: Change usedinaggregation column to 2 columns for status and weight.
Damyon Wiese [Wed, 13 Aug 2014 08:22:36 +0000 (16:22 +0800)]
MDL-46139 Grades: Change usedinaggregation column to 2 columns for status and weight.

6 years agoMDL-46139 Grades: Add contibution to course total column to user report
Damyon Wiese [Wed, 13 Aug 2014 06:23:59 +0000 (14:23 +0800)]
MDL-46139 Grades: Add contibution to course total column to user report

6 years agoMDL-46139 Grades: Show the aggregation details in the user report.
Damyon Wiese [Tue, 12 Aug 2014 02:40:51 +0000 (10:40 +0800)]
MDL-46139 Grades: Show the aggregation details in the user report.

6 years agoMDL-46139 Grades: Show the aggregation method in the alt text for the icon.
Damyon Wiese [Mon, 11 Aug 2014 03:32:53 +0000 (11:32 +0800)]
MDL-46139 Grades: Show the aggregation method in the alt text for the icon.

6 years agoMDL-46139 Grades: Add a column to grade_grades to record how a grade is aggregated
Damyon Wiese [Thu, 7 Aug 2014 08:33:09 +0000 (16:33 +0800)]
MDL-46139 Grades: Add a column to grade_grades to record how a grade is aggregated

6 years agoMDL-46139 Grades: Language change "weight -> calculated weight"
Damyon Wiese [Thu, 7 Aug 2014 02:03:24 +0000 (10:03 +0800)]
MDL-46139 Grades: Language change "weight -> calculated weight"

6 years agoweekly release 2.8dev
Dan Poltawski [Thu, 2 Oct 2014 14:18:52 +0000 (15:18 +0100)]
weekly release 2.8dev

6 years agoNOBUG: Fixed file access permissions
Dan Poltawski [Thu, 2 Oct 2014 14:18:51 +0000 (15:18 +0100)]
NOBUG: Fixed file access permissions

6 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Thu, 2 Oct 2014 14:18:48 +0000 (15:18 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

6 years agoMerge branch 'MDL-37707-master-fixup' of https://github.com/FMCorz/moodle
Dan Poltawski [Thu, 2 Oct 2014 08:48:25 +0000 (09:48 +0100)]
Merge branch 'MDL-37707-master-fixup' of https://github.com/FMCorz/moodle

6 years agoMerge branch 'MDL-46282-master-fix' of github.com:andrewnicols/moodle
Dan Poltawski [Thu, 2 Oct 2014 08:35:30 +0000 (09:35 +0100)]
Merge branch 'MDL-46282-master-fix' of github.com:andrewnicols/moodle

6 years agoRevert "MDL-32870 mod_lesson: added support for files to question answers and responses"
Dan Poltawski [Thu, 2 Oct 2014 08:09:16 +0000 (09:09 +0100)]
Revert "MDL-32870 mod_lesson: added support for files to question answers and responses"

This reverts commit d92f768baab86e95cafdfdbee1b54e5d2dbd055b.

6 years agoRevert "MDL-47395 added cli_error() visual cue"
Sam Hemelryk [Thu, 2 Oct 2014 04:39:49 +0000 (17:39 +1300)]
Revert "MDL-47395 added cli_error() visual cue"

This reverts commit eb60c78c771ee4acbfe3667a3cc44c2df61e1def.

6 years agoMerge branch 'MDL-47408-master' of https://github.com/DmitryNefedov/moodle
Sam Hemelryk [Thu, 2 Oct 2014 04:30:47 +0000 (17:30 +1300)]
Merge branch 'MDL-47408-master' of https://github.com/DmitryNefedov/moodle

6 years agoMDL-47408 user: Add checking before adding blog's link.
Dmitry Nefedov [Wed, 1 Oct 2014 08:53:31 +0000 (16:53 +0800)]
MDL-47408 user: Add checking before adding blog's link.

Checking enableblogs  and bloglevel, userid, constant  BLOG_USER_LEVEL.

6 years agoMDL-46282 core: Correct deletion of message datakeys
Andrew Nicols [Thu, 2 Oct 2014 03:50:15 +0000 (11:50 +0800)]
MDL-46282 core: Correct deletion of message datakeys

This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.

6 years agoRevert "MDL-45893 user_menu: revised based on action_menu"
Dan Poltawski [Wed, 1 Oct 2014 07:48:10 +0000 (08:48 +0100)]
Revert "MDL-45893 user_menu: revised based on action_menu"

Was not yet ready for the prime time.

This reverts commit dc4bff329dc2faf56445effebaa6790e0bc76713.
This reverts commit a535004e5c54689dc664d780b15900e1e6e19f83.
This reverts commit c8398fb95af3533a1945e0b4f45ac939f3044d8d.
This reverts commit d24b8e52d38526bf62612c3569db1d3174613c77.

Conflicts:
theme/bootstrapbase/less/moodle/modules.less
theme/bootstrapbase/style/moodle.css

6 years agoMerge branch 'MDL-47214-master' of github.com:andrewnicols/moodle
Dan Poltawski [Wed, 1 Oct 2014 07:37:43 +0000 (08:37 +0100)]
Merge branch 'MDL-47214-master' of github.com:andrewnicols/moodle

6 years agoMDL-47214 core: IPs should be cleaned
Andrew Nicols [Wed, 1 Oct 2014 07:27:35 +0000 (15:27 +0800)]
MDL-47214 core: IPs should be cleaned

6 years agoMDL-37707 mod_assign: Prevent user from changing grouping in team submissions
Frederic Massart [Wed, 1 Oct 2014 03:23:46 +0000 (11:23 +0800)]
MDL-37707 mod_assign: Prevent user from changing grouping in team submissions

6 years agoMerge branch 'master_MDL-47404' of https://github.com/danmarsden/moodle
Sam Hemelryk [Wed, 1 Oct 2014 02:37:56 +0000 (15:37 +1300)]
Merge branch 'master_MDL-47404' of https://github.com/danmarsden/moodle

6 years agoMDL-47404 filelib: Prevent flash from treating files as uploads
Dan Marsden [Wed, 1 Oct 2014 02:04:55 +0000 (15:04 +1300)]
MDL-47404 filelib: Prevent flash from treating files as uploads
added to send_stored_file as well.

6 years agoMerge branch '47428-28' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 30 Sep 2014 21:42:58 +0000 (23:42 +0200)]
Merge branch '47428-28' of git://github.com/samhemelryk/moodle

6 years agoMerge branch 'MDL-46282-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 30 Sep 2014 19:57:37 +0000 (08:57 +1300)]
Merge branch 'MDL-46282-master' of git://github.com/andrewnicols/moodle

Conflicts:
version.php

6 years agoMDL-42993 auth: spaces removed from usernames by default only
zbdd [Fri, 29 Aug 2014 02:19:37 +0000 (02:19 +0000)]
MDL-42993 auth: spaces removed from usernames by default only

Functionality by default does not change with this patch.
However spaces are no longer stripped when cleaning usernames IF
$CFG->extendedusernamechars has been set.

Also included 2 trim statements where small issues were found with reading
external usernames in that  were not filtered for trailing whitespaces.

6 years agoMerge branch 'MDL-46171-master-fix1' of http://github.com/damyon/moodle
Dan Poltawski [Tue, 30 Sep 2014 16:30:20 +0000 (17:30 +0100)]
Merge branch 'MDL-46171-master-fix1' of github.com/damyon/moodle

6 years agoMDL-46171 dml: DML unit test for tricky SQL in assign upgrade
Damyon Wiese [Tue, 30 Sep 2014 15:35:37 +0000 (23:35 +0800)]
MDL-46171 dml: DML unit test for tricky SQL in assign upgrade

This tests a workaround for set_field_select where the set table and from table are the same.

6 years agoMerge branch 'MDL-46171-master-fix1' of http://github.com/damyon/moodle
Dan Poltawski [Tue, 30 Sep 2014 15:02:09 +0000 (16:02 +0100)]
Merge branch 'MDL-46171-master-fix1' of github.com/damyon/moodle

6 years agoMerge branch 'MDL-45893-master-fix' of https://github.com/jethac/moodle
Dan Poltawski [Tue, 30 Sep 2014 13:35:29 +0000 (14:35 +0100)]
Merge branch 'MDL-45893-master-fix' of https://github.com/jethac/moodle

6 years agoMDL-45893 user_menu: fix to hide user_pictures from screen readers
Jetha Chan [Tue, 30 Sep 2014 13:15:44 +0000 (21:15 +0800)]
MDL-45893 user_menu: fix to hide user_pictures from screen readers

6 years agoMDL-46171 assign: Fix for the update script on MySQL.
Damyon Wiese [Tue, 30 Sep 2014 13:16:24 +0000 (21:16 +0800)]
MDL-46171 assign: Fix for the update script on MySQL.

6 years agoMerge branch '3034-28' of https://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 30 Sep 2014 13:04:24 +0000 (14:04 +0100)]
Merge branch '3034-28' of https://github.com/samhemelryk/moodle

6 years agoMDL-45893 behat: quick fix for usermenu logout button
Dan Poltawski [Tue, 30 Sep 2014 12:53:09 +0000 (13:53 +0100)]
MDL-45893 behat: quick fix for usermenu logout button

(This needs revisiting properly - I am not an xpath expert)

6 years agoMerge branch 'MDL-47385-master' of https://github.com/DmitryNefedov/moodle
Dan Poltawski [Tue, 30 Sep 2014 10:41:37 +0000 (11:41 +0100)]
Merge branch 'MDL-47385-master' of https://github.com/DmitryNefedov/moodle

6 years agoMDL-47195 force an upgrade for classloader changes
Dan Poltawski [Tue, 30 Sep 2014 10:38:17 +0000 (11:38 +0100)]
MDL-47195 force an upgrade for classloader changes

6 years agoMerge branch 'MDL-47195-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 30 Sep 2014 10:07:23 +0000 (11:07 +0100)]
Merge branch 'MDL-47195-master' of git://github.com/andrewnicols/moodle

6 years agoMerge branch 'm28_MDL-46127' of https://github.com/totara/moodle
Dan Poltawski [Tue, 30 Sep 2014 08:55:03 +0000 (09:55 +0100)]
Merge branch 'm28_MDL-46127' of https://github.com/totara/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

6 years agoMerge branch 'MDL-47294-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 30 Sep 2014 07:47:31 +0000 (08:47 +0100)]
Merge branch 'MDL-47294-master' of git://github.com/FMCorz/moodle

6 years agoMerge branch 'MDL-47200-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 30 Sep 2014 07:35:19 +0000 (08:35 +0100)]
Merge branch 'MDL-47200-master' of git://github.com/jleyva/moodle

Conflicts:
version.php

6 years agoMerge branch 'm28_MDL-47097' of https://github.com/totara/moodle
Dan Poltawski [Tue, 30 Sep 2014 07:30:59 +0000 (08:30 +0100)]
Merge branch 'm28_MDL-47097' of https://github.com/totara/moodle

6 years agoMerge branch 'MDL-32275-master' of git://github.com/gurgus/moodle
Dan Poltawski [Tue, 30 Sep 2014 07:29:02 +0000 (08:29 +0100)]
Merge branch 'MDL-32275-master' of git://github.com/gurgus/moodle

6 years agoMerge branch 'MDL-46171-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 30 Sep 2014 07:03:40 +0000 (08:03 +0100)]
Merge branch 'MDL-46171-master' of git://github.com/damyon/moodle

6 years agoMDL-46282 core: Add VERP API
Andrew Nicols [Wed, 9 Jul 2014 05:22:36 +0000 (13:22 +0800)]
MDL-46282 core: Add VERP API

This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.

6 years agoMerge branch 'MDL-46084-master' of https://github.com/sbourget/moodle
Sam Hemelryk [Mon, 29 Sep 2014 22:28:26 +0000 (11:28 +1300)]
Merge branch 'MDL-46084-master' of https://github.com/sbourget/moodle

6 years agoMerge branch 'MDL-47419-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 29 Sep 2014 21:35:47 +0000 (10:35 +1300)]
Merge branch 'MDL-47419-master' of git://github.com/ankitagarwal/moodle

6 years agoMDL-45893 user: fixed user menu for guest
Sam Hemelryk [Mon, 29 Sep 2014 21:25:23 +0000 (10:25 +1300)]
MDL-45893 user: fixed user menu for guest

6 years agoMerge branch 'm28_MDL-47170' of https://github.com/totara/moodle
Sam Hemelryk [Mon, 29 Sep 2014 21:03:06 +0000 (10:03 +1300)]
Merge branch 'm28_MDL-47170' of https://github.com/totara/moodle

6 years agoMDL-46652 output: more thorough custom menu multilang tests
Sam Hemelryk [Mon, 29 Sep 2014 20:54:08 +0000 (09:54 +1300)]
MDL-46652 output: more thorough custom menu multilang tests

6 years agoMerge branch 'MDL-46652-master' of git://github.com/jethac/moodle
Sam Hemelryk [Mon, 29 Sep 2014 20:52:54 +0000 (09:52 +1300)]
Merge branch 'MDL-46652-master' of git://github.com/jethac/moodle

6 years agoMerge branch 'MDL-47214-ClientIp-wrong-with-multiple-proxies' of https://github.com...
Sam Hemelryk [Mon, 29 Sep 2014 19:48:20 +0000 (08:48 +1300)]
Merge branch 'MDL-47214-ClientIp-wrong-with-multiple-proxies' of https://github.com/mhughes2k/moodle

6 years agoMerge branch 'MDL-46920-master' of git://github.com/jethac/moodle
Dan Poltawski [Mon, 29 Sep 2014 15:25:41 +0000 (16:25 +0100)]
Merge branch 'MDL-46920-master' of git://github.com/jethac/moodle

6 years agoMerge branch 'MDL-47069-master-plugin-dependency' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 29 Sep 2014 11:46:11 +0000 (12:46 +0100)]
Merge branch 'MDL-47069-master-plugin-dependency' of git://github.com/mudrd8mz/moodle

6 years agoMerge branch 'MDL-47163-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 29 Sep 2014 11:29:59 +0000 (12:29 +0100)]
Merge branch 'MDL-47163-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'MDL-47307-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 29 Sep 2014 11:04:01 +0000 (12:04 +0100)]
Merge branch 'MDL-47307-master' of git://github.com/FMCorz/moodle

6 years agoMerge branch 'MDL-47358-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 29 Sep 2014 10:58:14 +0000 (11:58 +0100)]
Merge branch 'MDL-47358-master' of git://github.com/FMCorz/moodle

6 years agoMerge branch 'MDL-47322-master' of https://github.com/sammarshallou/moodle
Dan Poltawski [Mon, 29 Sep 2014 10:12:29 +0000 (11:12 +0100)]
Merge branch 'MDL-47322-master' of https://github.com/sammarshallou/moodle

6 years agoMerge branch 'wip_MDL-47333_m28_fonts' of https://github.com/skodak/moodle
Dan Poltawski [Mon, 29 Sep 2014 09:42:50 +0000 (10:42 +0100)]
Merge branch 'wip_MDL-47333_m28_fonts' of https://github.com/skodak/moodle

6 years agoMerge branch 'MDL-45893-master-v2' of git://github.com/jethac/moodle
Dan Poltawski [Mon, 29 Sep 2014 09:30:42 +0000 (10:30 +0100)]
Merge branch 'MDL-45893-master-v2' of git://github.com/jethac/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

6 years agoMerge branch 'MDL-47033_master' of https://github.com/totara/openbadges
Sam Hemelryk [Mon, 29 Sep 2014 02:18:03 +0000 (15:18 +1300)]
Merge branch 'MDL-47033_master' of https://github.com/totara/openbadges

6 years agoMerge branch 'MDL-47295-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Mon, 29 Sep 2014 02:17:24 +0000 (15:17 +1300)]
Merge branch 'MDL-47295-master' of git://github.com/FMCorz/moodle

6 years agoMerge branch 'wip_MDL-47300_m28_tcpdf' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 29 Sep 2014 02:15:47 +0000 (15:15 +1300)]
Merge branch 'wip_MDL-47300_m28_tcpdf' of https://github.com/skodak/moodle

6 years agoMerge branch 'wip-MDL-47398-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 29 Sep 2014 01:35:06 +0000 (14:35 +1300)]
Merge branch 'wip-MDL-47398-master' of git://github.com/marinaglancy/moodle

6 years agoMerge branch 'MDL-47408-master' of https://github.com/DmitryNefedov/moodle
Sam Hemelryk [Mon, 29 Sep 2014 01:32:38 +0000 (14:32 +1300)]
Merge branch 'MDL-47408-master' of https://github.com/DmitryNefedov/moodle

6 years agoMerge branch 'master_MDL-47404' of https://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 29 Sep 2014 01:23:18 +0000 (14:23 +1300)]
Merge branch 'master_MDL-47404' of https://github.com/danmarsden/moodle

6 years agoMerge branch 'MDL-36929_new_discussions' of https://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 29 Sep 2014 01:21:39 +0000 (14:21 +1300)]
Merge branch 'MDL-36929_new_discussions' of https://github.com/andyjdavis/moodle

6 years agoMerge branch 'MDL-39190' of https://github.com/pauln/moodle
Sam Hemelryk [Mon, 29 Sep 2014 01:19:52 +0000 (14:19 +1300)]
Merge branch 'MDL-39190' of https://github.com/pauln/moodle

6 years agoMerge branch 'MDL-20250_grade_settings2' of https://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 29 Sep 2014 01:00:42 +0000 (14:00 +1300)]
Merge branch 'MDL-20250_grade_settings2' of https://github.com/andyjdavis/moodle

6 years agoMerge branch 'MDL-47411-master-submodules' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Sun, 28 Sep 2014 23:42:32 +0000 (01:42 +0200)]
Merge branch 'MDL-47411-master-submodules' of git://github.com/mudrd8mz/moodle

6 years agoMerge branch 'MDL-37707-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Sun, 28 Sep 2014 22:35:23 +0000 (11:35 +1300)]
Merge branch 'MDL-37707-master' of git://github.com/FMCorz/moodle

6 years agoMerge branch 'MDL-42974-master' of https://github.com/sammarshallou/moodle
Sam Hemelryk [Sun, 28 Sep 2014 22:21:19 +0000 (11:21 +1300)]
Merge branch 'MDL-42974-master' of https://github.com/sammarshallou/moodle