moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 02:16:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
71074 commits 37 branches 540 tags 1.3 GiB
Commit graph

71074 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Hemelryk
68085f2bd5 Merge branch 'MDL-46332-grouping-remove-button-master' of git://github.com/DanBennettUK/moodle 2014-10-24 12:02:14 +13:00
Sam Hemelryk
29a3060265 Merge branch 'wip-MDL-47757-master' of git://github.com/abgreeve/moodle 2014-10-24 11:58:36 +13:00
Sam Hemelryk
124932d223 Merge branch 'MDL-47738-master' of git://github.com/FMCorz/moodle 2014-10-24 11:23:04 +13:00
Sam Hemelryk
ef54717024 Merge branch 'm28_MDL-47632' of https://github.com/totara/moodle 2014-10-24 11:19:43 +13:00
Sam Hemelryk
ec998f7487 Merge branch 'MDL-47555' of https://github.com/rlorenzo/moodle 2014-10-24 11:17:00 +13:00
Sam Hemelryk
18f1797517 Merge branch 'wip_MDL-47795_master' of git://github.com/gjb2048/moodle 2014-10-24 09:58:53 +13:00
gdharris
04f7dcebe4 MDL-46853 calendar: fix import of no duration events 2014-10-24 09:55:11 +13:00
Dan Poltawski
89df18c73d Merge branch 'MDL-47791' of git://github.com/timhunt/moodle 2014-10-23 17:30:28 +01:00
Dan Poltawski
f01242a3b4 Merge branch 'MDL-47815-master' of git://github.com/damyon/moodle 2014-10-23 17:28:36 +01:00
Dan Poltawski
a92008ed25 Merge branch 'MDL-47847-master' of git://github.com/jleyva/moodle 2014-10-23 16:35:50 +01:00
Dan Poltawski
aed3a3430f Merge branch '47752-28' of git://github.com/samhemelryk/moodle 2014-10-23 16:31:24 +01:00
Dan Poltawski
9a3385cb2d Merge branch '47684-28' of git://github.com/samhemelryk/moodle 2014-10-23 16:31:08 +01:00
Dan Poltawski
25bd390b4b Merge branch 'MDL-47513-master' of git://github.com/andrewnicols/moodle 2014-10-23 16:17:49 +01:00
Dan Poltawski
7b57a751ae Merge branch 'MDL-47637-master' of git://github.com/FMCorz/moodle 2014-10-23 16:16:07 +01:00
Dan Poltawski
98122f9ad4 Merge branch 'MDL-47814-master' of git://github.com/FMCorz/moodle 2014-10-23 16:13:11 +01:00
Juan Leyva
0c5481e43d MDL-47847 Web Services: Add messaging functions to the mobile service 2014-10-23 15:24:07 +02:00
Dan Poltawski
cd9f037e04 Merge branch 'MDL-47767-master' of git://github.com/xow/moodle 2014-10-23 10:50:01 +01:00
Dan Poltawski
7ea782ab3c Merge branch 'MDL-20367-master' of git://github.com/damyon/moodle 2014-10-23 10:41:58 +01:00
Dan Poltawski
ec007900c0 Merge branch 'MDL-47499-master' of git://github.com/damyon/moodle 2014-10-23 10:19:53 +01:00
Juan Leyva
5e28991e78 MDL-47545 web services: Allow cross origin requests 2014-10-23 11:17:41 +02:00
Marina Glancy
36594faebb Merge branch 'MDL-47808-master' of git://github.com/andrewnicols/moodle 2014-10-23 17:16:44 +08:00
Marina Glancy
aeeccb1697 Merge branch 'MDL-47689-master' of git://github.com/gurgus/moodle 2014-10-23 17:09:32 +08:00
Marina Glancy
d129a0ffe9 Merge branch 'wip-MDL-47675-master' of git://github.com/abgreeve/moodle 2014-10-23 16:57:56 +08:00
Marina Glancy
d3312bb6ac Merge branch 'MDL-47759-master' of git://github.com/ankitagarwal/moodle 2014-10-23 16:35:59 +08:00
Damyon Wiese
99cc87e913 Merge branch '47077-28' of git://github.com/samhemelryk/moodle 2014-10-23 16:09:29 +08:00
Frederic Massart
67ba66e1d2 MDL-47762 gradereport_user: Hide contribution and weights when relevant 
The contribution and weight columns should be hidden when the course
total is because they can be used to compute the hidden course total.
 2014-10-23 16:04:11 +08:00
Damyon Wiese
2fd07711e9 Merge branch 'MDL-47153_master' of https://github.com/markn86/moodle 2014-10-23 15:47:10 +08:00
Marina Glancy
05599c47cb Merge branch 'MDL-47704-master' of git://github.com/damyon/moodle 2014-10-23 15:45:54 +08:00
Marina Glancy
41d58f6f4c Merge branch 'MDL-47763-master' of git://github.com/damyon/moodle 2014-10-23 15:42:46 +08:00
Damyon Wiese
3a3fe4bf37 Merge branch 'wip-MDL-43245-master-lang' of git://github.com/abgreeve/moodle 2014-10-23 15:38:35 +08:00
Marina Glancy
653f6c23cb Merge branch 'MDL-47836-master' of git://github.com/damyon/moodle 2014-10-23 15:23:52 +08:00
Marina Glancy
18ebeed5e9 Merge branch 'MDL-47819-master' of git://github.com/jethac/moodle 2014-10-23 15:21:28 +08:00
Dan Poltawski
bcd015bea6 Merge branch 'MDL-47713-master-fix1' of http://github.com/damyon/moodle 2014-10-23 08:18:31 +01:00
Dave Cooper
17472f57b9 MDL-47689 user: Add duplicate field check to avoid oracle db error. 2014-10-23 15:10:31 +08:00
Adrian Greeve
1785e49f26 MDL-43245 mod_lesson: Add string for essay grading permission. 2014-10-23 15:05:32 +08:00
Andrew Nicols
d247a50113 MDL-47734 core: Prevent jumping of YUI dialogues 
When a YUI dialogue was opened, it was focusing on the boundingBox, with
the browser moving the scroll position to focus on the top of the
boundingBox. This caused a jump. This only happens when the dialogue is
modal and consequentially has a maskNode present as it changes the initial
positioning behaviour of the boundingBox.

To avoid this, when the maskNode is shown, the dialogue is position at 0,0
in the current viewport. For centered dialogues, the dialogue is
automatically re-positioned after the window has shown. For non-centered
dialogues, the original position is stored and the dialogue is restored to
that position after it has been displayed.

This should not interfere with use of the align function as this will be
called later in the proceedings, after the show has run.
 2014-10-23 14:44:14 +08:00
Damyon Wiese
99e455c7ea Merge branch 'MDL-47740' of git://github.com/timhunt/moodle 2014-10-23 14:24:47 +08:00
Damyon Wiese
54420a98b1 Merge branch 'MDL-43245' of git://github.com/jmvedrine/moodle 2014-10-23 13:52:15 +08:00
Damyon Wiese
ed60e0eac5 MDL-47713 Grades: Fix new behat test after conversion from points to % 
The contribution to course total column was changed from points to % but
this new test was submitted using points. It just needs the numbers converted
to %.
 2014-10-23 13:37:24 +08:00
Damyon Wiese
f9c90d8751 MDL-47763 Grades: Handle the case when a grade category is hidden. 
This was breaking the contribution column, which needs to know the
weights of all the categories up the tree, whether they are visible or
not.
 2014-10-23 13:26:40 +08:00
Damyon Wiese
79bf093ee2 Merge branch 'MDL-32616' of git://github.com/timhunt/moodle 2014-10-23 12:02:22 +08:00
Jetha Chan
beb7456e3e MDL-47819 user_menu: fixed showing up in popups 2014-10-23 11:58:11 +08:00
Damyon Wiese
f3d7cdffda MDL-47836 Grades: Fix the url for the upgraded grades warning page url. 2014-10-23 11:31:55 +08:00
Andrew Nicols
4a8c380abb MDL-47513 Fix RTL issues with grade report 2014-10-23 11:15:35 +08:00
John Okely
66f5e82b66 MDL-47767 tool_monitor: Use renderers for links between subscription and rule managers 2014-10-23 10:33:15 +08:00
John Okely
0cafac69f2 MDL-47767 tool_monitor: Add links between subscribe and rule manager 2014-10-23 10:33:15 +08:00
Andrew Nicols
555837c5d4 MDL-47808 mod_forum: Correct maxeditingtime for unit tests 
The maxeditingtime needs to be a negative value for unit tests to ensure
that the messages are actually sent out.

Whilst fixing this I also discovered that the create_discussion part of the
generator also creates the first post.
 2014-10-23 08:43:29 +08:00
Jean-Michel Vedrine
d3c4d50f1f MDL-43245 Lesson: non editing teacher cannot grade lesson essay 2014-10-22 18:00:49 +02:00
Dan Poltawski
e6afd45f96 Merge branch 'MDL-47713-master' of git://github.com/damyon/moodle 2014-10-22 10:49:07 +01:00
Frederic Massart
40a603c79d MDL-47814 core_grades: Improved coverage of user_graded event tests 
The tests needed to use the API in order to trigger the user_graded
event that occurs when the course final grade has changed.
 2014-10-22 16:53:16 +08:00