Commit graph

64149 commits

Author SHA1 Message Date
Sam Hemelryk
77365f7ff6 Merge branch 'master_MDL-38489' of git://github.com/danmarsden/moodle 2013-09-17 09:02:32 +12:00
Sam Hemelryk
f34af1167a Merge branch 'MDL-41667' of git://github.com/timhunt/moodle 2013-09-17 08:59:08 +12:00
Sam Hemelryk
82b2bb5eca Merge branch 'MDL-37148-master' of git://github.com/damyon/moodle 2013-09-17 08:50:38 +12:00
Sam Hemelryk
c2e7f90427 Merge branch 'MDL-41466_master' of git://github.com/kordan/moodle 2013-09-17 08:48:59 +12:00
Sam Hemelryk
0dd46bb851 Merge branch 'MDL-38317-master' of git://github.com/StudiUM/moodle 2013-09-17 08:39:14 +12:00
Andrew Nicols
9bda17ee6f MDL-40811 JavaScript: Use the new moodle-course-util functions 2013-09-16 21:05:02 +01:00
Andrew Nicols
36c1ac9b7a MDL-40811 JavaScript: Create a course-util module to reduce code duplication 2013-09-16 20:44:19 +01:00
sam marshall
4fb31ae6cd MDL-41669 Restore: Progress bar needs to include more tasks
1. Changes progress bar code to allow headings for progress bar (so users have
   some clue what's going on if a page has more than one progress bar).
2. Changes restore code so that a progress bar can display during pre-checks if
   they take longer than 5 seconds.
3. Changes pre-check and restore code so that, in various points where the system
   can take a long time within an individual step, intederminate progress is
   indicated and it won't time out.
2013-09-16 17:18:12 +01:00
sam marshall
6a0189eb3f MDL-41817 Backup/restore without blocks gives error
Also applies to various other situations where backup includes 0 of
something. This was caused by a problem in the progress-tracking code.
2013-09-16 17:11:40 +01:00
Gilles-Philippe Leblanc
adbf94c957 MDL-41733 auth_cas: Allow direct authentication with CAS to a course when multiple authentication is activated 2013-09-16 09:22:13 -04:00
Simon Coggins
f6ebcd34f2 MDL-40848 badges: Validate backpack connection via Persona
Instead of trusting that the user owns the email address they
supply, we now require them to login via Persona before
connecting them to the backpack
2013-09-16 20:15:32 +12:00
David Monllao
8520de1ee4 MDL-41421 tool_generator: Import .jmx template
Ideally we should generate all the XML based on
modular components so we can also switch templates
between different sizes, this is a first step and
more work should be done in future in this direction.
2013-09-16 16:09:25 +08:00
David Monllao
217a5f97ad MDL-41421 tool_generator: Refactoring make_form to make_course_form
Also:
- Added a soft password for the
newly generated users so we can use
them to log in the site when running
performance tests.
- Added a method to see the courses-users
relation from outside course_backend class.
2013-09-16 16:09:25 +08:00
Marina Glancy
a8fd33b02c MDL-41715 Increase size of char fiels in user table 2013-09-16 17:51:05 +10:00
Rossiani Wijaya
b2970f963a MDL-41612 scorm: fix heading levels 2013-09-16 15:40:01 +08:00
Ankit Agarwal
63deb5c379 MDL-39959 events: Replace add_to_log() calls with events for course module actions (create, delete and update) 2013-09-16 15:29:56 +08:00
Marina Glancy
4ead355143 Merge branch 'MDL-41621' of git://github.com/rwijaya/moodle 2013-09-16 17:14:18 +10:00
Ankit Agarwal
b9b994c7d2 MDL-39959 events: Add unit tests for course module events
test_course_module_created_event()
test_course_module_created_event_exceptions()
test_course_module_updated_event()
test_course_module_updated_event_exceptions()
test_course_module_deleted_event()
test_course_module_deleted_event_exceptions()
2013-09-16 13:42:37 +08:00
Ankit Agarwal
0158650f59 MDL-39959 events: Add course module events
Added event course_module_created
Added event course_module_updated
Added event course_module_deleted
2013-09-16 13:42:37 +08:00
Marina Glancy
81673647a9 Merge branch 'MDL-41315-master' of git://github.com/damyon/moodle 2013-09-16 15:31:20 +10:00
Jason Fowler
9cc23e2692 MDL-41716 atto - Fix resizing inconsistencies between editor modes 2013-09-16 12:52:04 +08:00
Simon Coggins
d06ffbdf2d MDL-41806 Add assessors to moodle_url class
New assessors for scheme, host and port.
2013-09-16 16:14:29 +12:00
Yuliya Bozhko
4d7d17ddcc MDL-40550 badges: Change wording of badge activation message
Add confirmation check when activating badge from management page
2013-09-16 15:37:00 +12:00
Sam Hemelryk
31dea4fea4 Merge branch 'master_MDL-41434' of https://github.com/danmarsden/moodle 2013-09-16 15:07:57 +12:00
Sam Hemelryk
da8cd86f17 Merge branch 'MDL-38194-master' of git://github.com/sammarshallou/moodle
Conflicts:
	lib/upgrade.txt
2013-09-16 13:56:05 +12:00
Sam Hemelryk
efc2c51712 Merge branch 'MDL-41637_master' of https://github.com/totara/openbadges 2013-09-16 13:51:12 +12:00
Sam Hemelryk
db220c2972 Merge branch 'MDL-41748_master' of https://github.com/markn86/moodle 2013-09-16 13:48:48 +12:00
Sam Hemelryk
a93db28850 Merge branch 'wip-mdl-41557' of git://github.com/rajeshtaneja/moodle 2013-09-16 13:46:07 +12:00
Damyon Wiese
91327d96ca MDL-37148 assign: Fix missing parameter for submit_for_grading webservice.
It is required to specify if the user has accepted the submission statement
to make sure it goes in the log/event.
2013-09-16 09:34:32 +08:00
Sam Hemelryk
cf13da65e1 Merge branch 'MDL-36316-master' of git://github.com/danpoltawski/moodle 2013-09-16 13:13:41 +12:00
AMOS bot
cb21774b2d Automatically generated installer lang files 2013-09-16 00:40:25 +00:00
Sam Hemelryk
0d5c80e298 Merge branch 'MDL-41662_master' of https://github.com/totara/openbadges 2013-09-16 10:48:20 +12:00
Sam Hemelryk
9034f94d07 Merge branch 'master_MDL-37524' of git://github.com/danmarsden/moodle 2013-09-16 10:42:47 +12:00
Sam Hemelryk
df1d3e9115 Merge branch 'wip-MDL-27684-master' of git://github.com/satrun77/moodle 2013-09-16 10:27:16 +12:00
Dan Marsden
b98dcd7dd6 MDL-38489 SCORM: use course_get_format to obtain info 2013-09-16 10:17:51 +12:00
Vinnie Monaco
011ae52a91 MDL-38489 SCORM: added check for course display format 2013-09-16 10:17:51 +12:00
Dan Marsden
36136454b7 MDL-32506 SCORM: remove obsolete setting. 2013-09-16 10:16:16 +12:00
Sam Hemelryk
7c76607aaa Merge branch 'MDL-29987' of https://github.com/bostelm/moodle 2013-09-16 10:13:17 +12:00
Dan Marsden
39355b46f9 MDL-37524 SCORM: mode not calculated correctly. 2013-09-16 10:12:49 +12:00
Dan Marsden
b33e466550 MDL-41434 SCORM: add new sortorder field to allow better ordering of scos 2013-09-16 10:11:16 +12:00
Jamie Pratt
764f6153d1 MDL-41572 pass through question behaviour vars with correct prefix
Through prepare_simulated_post_data. Also includes unit tests for
multiple attempts and tries.
2013-09-15 17:52:18 +07:00
AMOS bot
a2c52dabef Merge branch 'master' into install_master 2013-09-14 00:41:33 +00:00
sam marshall
137885b7e9 MDL-38194 Files: Allow download of large backup files
The PHP readfile function does not work for files more than 2GB.
This commit provides a wrapper that can be used so that files less
than 2GB are sent with readfile, and files larger than 2GB are
sent manually.

The change applies to all uses of pluginfile.php, although in
reality, backup files are probably the only ones likely to be more
than two gigabytes.
2013-09-13 14:59:57 +01:00
Jean-Philippe Gaudreau
3aaa906b1e MDL-38317 grade import: Translation support for import mappings form. 2013-09-13 08:49:58 -04:00
Tim Hunt
ca6fa1216e MDL-41667 quiz: Fix CSS rules.
Thanks to Renaat Debleu for spotting this problem.
2013-09-13 11:16:05 +01:00
sam marshall
2a70b70c44 MDL-41087 Backup: add progress tracking in slow steps
Adds calls to the new backup progress tracking API within various steps of the
backup system - previously it only tracked progress between steps, but some steps
can themselves be slow. This ensures the system displays progress (either by
moving the progress bar if possible, or by making the wibbler below it pulsate)
during nearly all of the backup process.
2013-09-13 11:07:23 +01:00
Henning Bostelmann
df0671f0d2 MDL-29987 File resource: fix problem with PDF display on mobile devices
Setting the default display option for PDF files from DISPLAY_EMBED to DISPLAY_OPEN
2013-09-13 10:30:41 +01:00
Damyon Wiese
20b7dcfc2c MDL-41315 assign: Add unit test for groupmembersonly 2013-09-13 16:43:26 +08:00
Rajesh Taneja
af0afab30a MDL-31560 Error: Fixed coding style 2013-09-13 16:13:26 +08:00
Rajesh Taneja
2b503e40f2 MDL-31560 Messages: Deprecated generate_email_supportuser
generate_email_supportuser was not creating user which can
be used by messaging system. core_user::get_support_user()
should be used to get support_user record.
2013-09-13 16:13:26 +08:00