mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-15 21:20:02 +01:00
Code Issues Projects Releases Wiki Activity
68,877 Commits 36 Branches 527 Tags
Commit Graph

68877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
3a2421a56e Merge branch 'MDL-45611-master' of git://github.com/phalacee/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-06-17 01:11:25 +02:00
Eloy Lafuente (stronk7)
cf7ac0aebf Merge branch 'wip-mdl-45719-master' of https://github.com/deraadt/moodle 2014-06-17 00:58:50 +02:00
Eloy Lafuente (stronk7)
8888451ed5 Merge branch 'MDL-45870-master' of git://github.com/FMCorz/moodle 2014-06-17 00:51:26 +02:00
Eloy Lafuente (stronk7)
bfc66dd983 Merge branch 'MDL-45936_master' of https://github.com/markn86/moodle 2014-06-17 00:18:15 +02:00
Mark Nielsen
f149e58990 MDL-46013 theme: Uninstall theme unconditionally unsets configs 2014-06-16 15:10:30 -07:00
Eloy Lafuente (stronk7)
d519545a54 Merge branch '45884-28' of https://github.com/samhemelryk/moodle 2014-06-17 00:09:50 +02:00
Marina Glancy
db8071a7f9 Merge branch 'MDL-45940-master' of git://github.com/damyon/moodle 2014-06-16 17:28:15 +08:00
Marina Glancy
c126413655 Merge branch 'MDL-45901_Quiz_master' of git://github.com/nadavkav/moodle 2014-06-16 17:27:20 +08:00
Rajneel Totaram
8fb7520095 MDL-45967 admin lang: Fix typo 2014-06-16 17:26:34 +08:00
Marina Glancy
14422ae946 Merge branch 'MDL-43274-master' of git://github.com/xow/moodle 2014-06-16 17:23:53 +08:00
Gregory Faller
028c9d20b9 MDL-45582: Apply grades and feedback to entire group does not work with Annotate PDF feature 2014-06-16 18:09:21 +09:30
Damyon Wiese
a3d7a82b64 Merge branch 'MDL-42531-alt' of https://github.com/jonof/moodle 2014-06-16 16:26:06 +08:00
John Okely
fbd449509e MDL-43274 Course: Remove message about course logs from upgrade.txt 2014-06-16 16:25:27 +08:00
Damyon Wiese
de06ce7ed3 MDL-45940 Assign: Improved access check 
Call can_edit() instead of repeating a (slightly wrong) access check.
 2014-06-16 16:20:11 +08:00
Damyon Wiese
070d5b17e1 MDL-31409 Grading form webservice: Whitespace fixes 2014-06-16 16:14:43 +08:00
Damyon Wiese
be08fd134e Merge branch 'MDL-31861' of https://github.com/Lightwork-Marking/moodle 2014-06-16 16:13:38 +08:00
Marina Glancy
4a61670aed Merge branch 'MDL-35648' of git://github.com/danielneis/moodle 2014-06-16 14:02:38 +08:00
Marina Glancy
6581e387a0 Merge branch 'MDL-45935-master' of git://github.com/andrewnicols/moodle 2014-06-16 14:02:17 +08:00
John Okely
8b05f3a355 MDL-10115 User profile: Use moodle_url and html_writer::link for course links on user profiles 2014-06-16 13:22:18 +08:00
Damyon Wiese
b3f297df31 Merge branch 'MDL-31998_master' of git://github.com/grabs/moodle 2014-06-16 12:04:02 +08:00
Damyon Wiese
bf4c212284 Merge branch 'wip-mdl-46001' of https://github.com/rajeshtaneja/moodle 2014-06-16 11:24:29 +08:00
Rajesh Taneja
96b86e038e MDL-46001 atto_clear: modfied behat test to work on xvfb 2014-06-16 11:09:43 +08:00
Damyon Wiese
1df546a77e Merge branch 'MDL-45803_master' of https://github.com/markn86/moodle 2014-06-16 11:00:26 +08:00
Damyon Wiese
70b58992b8 Merge branch 'wip-MDL-45395-master' of git://github.com/abgreeve/moodle 2014-06-16 10:07:00 +08:00
John Okely
bb8d6e1a81 MDL-43274 Course: Remove ability to delete logs on a course during reset 2014-06-16 09:10:05 +08:00
AMOS bot
fe70d3a8df Automatically generated installer lang files 2014-06-15 00:42:34 +00:00
Mark Nelson
e0e6d931f3 MDL-45936 auth_db: use core functions when creating/updating a user 2014-06-14 15:59:45 -07:00
Russell Smith
fbb0c914b0 MDL-43835 phpunit: Create unique starting id's for sequences. 
When all starting autoincrement ids are the same, it's difficult to detect coding and testing
errors that use the incorrect id in test calls.  The classic case is cmid vs instance id.
To reduce the chance of the coding error we start sequences at different values where possible.

OUBlog installation is the case that highlighted this as it inserts a sitewide course module
at install time and cmid <> instance id in most cases.
 2014-06-14 00:29:26 +10:00
Nadav Kavalerchik
c9976d96a5 MDL-45901 - Quiz - Display random questions (from category) on RTL mode. 2014-06-13 12:20:23 +03:00
Mark Nelson
3b0347712a MDL-45445 events: added '(optional)' to event params where applicable 2014-06-12 20:46:58 -07:00
Mark Nelson
c446f41a85 MDL-45445 events: documented the additional validation 2014-06-12 20:46:58 -07:00
Mark Nelson
d0c65a411f MDL-45445 events: added missing 'other' validation 2014-06-12 20:46:58 -07:00
Mark Nelson
943c61051f MDL-45445 events: added missing 'relateduserid' validation 2014-06-12 20:46:58 -07:00
Mark Nelson
b448a5ac67 MDL-45445 events: trivial changes 2014-06-12 20:46:58 -07:00
Paul Charsley
0ff4ebb4a3 MDL-31861 add web service function save_definitions 2014-06-13 15:36:25 +12:00
AMOS bot
340df7eb34 Merge branch 'master' into install_master 2014-06-13 00:41:51 +00:00
Andreas Grabs
16ee970c94 MDL-31998 mod_feedback - Feedback depend questions bug 2014-06-13 01:45:23 +02:00
Sam Hemelryk
99f041ebfa MDL-45884 navigation: changed to positive setting phrasing 2014-06-13 10:16:25 +12:00
Sam Hemelryk
aab6438ca1 MDL-45884 navigation: tidied up code and added behat tests 2014-06-13 10:16:25 +12:00
Syxton
4d378e9f70 MDL-45884 navigation: setting that allows sites to collapse My Courses by default 2014-06-13 10:16:25 +12:00
Tim Hunt
4175a57038 MDL-45970 quiz editing: fix display of random questions. 
The pass by reference meant the function was clobbering the variable in
the calling function. Once that was change, it was not strictly
necessary to rename the variable in the function, but I did anyway for
clarity.

Thanks to Rajesh Taneja for finding the problem, and identifying which
bit of code was broken. I really just made the patch.
 2014-06-12 19:45:33 +01:00
Eloy Lafuente (stronk7)
337075d17b weekly release 2.8dev 2014-06-12 18:58:54 +02:00
Eloy Lafuente (stronk7)
0272001830 Merge branch 'MDL-44871-master' of git://github.com/damyon/moodle 2014-06-12 11:38:10 +02:00
Eloy Lafuente (stronk7)
1a32e1d446 Merge branch 'MDL-42835-master' of http://github.com/damyon/moodle 2014-06-12 09:51:11 +02:00
John Okely
9594f50af3 MDL-10115 User profile: Allow full list of courses to be viewed on a user's profile 2014-06-12 14:43:14 +08:00
Rajesh Taneja
c2c5d57790 MDL-45808 enrol_self: Fixed behat to observe the group key policy 2014-06-12 14:20:02 +08:00
Damyon Wiese
c48c9bf02f MDL-42835 Scorm: Fix for JS error because no nodes are selected in the toc. 2014-06-12 13:57:34 +08:00
Damyon Wiese
d27c8d924a MDL-44871 Atto: Add missing tags to behat tests @editor and @editor_atto 2014-06-12 11:14:21 +08:00
Adrian Greeve
4051685ba0 MDL-45395 lib: Removal of excel 5 spreadsheet creation files. 
The excel 5 writer files were using OLE licensing which is GPL incompatible.
These classes are not used in core.
 2014-06-12 10:41:42 +08:00
AMOS bot
4646299f34 Automatically generated installer lang files 2014-06-12 00:43:28 +00:00