63713 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
ba57caa349 Merge branch 'MDL-41595_M26' of git://github.com/lazydaisy/moodle 2013-09-17 02:15:06 +02:00
Sam Hemelryk
c8f052dbdd Merge branch 'wip-MDL-41715-master' of git://github.com/marinaglancy/moodle 2013-09-17 11:44:39 +12:00
Sam Hemelryk
29b56cfd09 MDL-38489 mod_scorm: added require to be explicit 2013-09-17 09:12:02 +12:00
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
Marina Glancy
a8fd33b02c MDL-41715 Increase size of char fiels in user table 2013-09-16 17:51:05 +10:00
Marina Glancy
4ead355143 Merge branch 'MDL-41621' of git://github.com/rwijaya/moodle 2013-09-16 17:14:18 +10:00
Marina Glancy
81673647a9 Merge branch 'MDL-41315-master' of git://github.com/damyon/moodle 2013-09-16 15:31:20 +10: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
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
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
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
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
Rajesh Taneja
3bcf6b3cdd MDL-31560 Messages: Added support for noreply and support users
This is used by messaging system for sending/receiving message
to/from noreply or support user. message_send api will now use
core_user class to get noreply or support user and then
send/receive message depending on user state.
2013-09-13 16:13:26 +08:00
Rajesh Taneja
3a11e2d2d6 MDL-41557 Events: Fixed event data snapshot to save valid data 2013-09-13 16:05:23 +08:00
Damyon Wiese
a0e59f04dd MDL-41315 assign: Dont show users not in the current grouping
This is for separate groups mode. Note - this will be slower - but
this feature is experimental and groupslib does not provide a nicer api.
2013-09-13 14:47:01 +08:00
Dan Poltawski
378b3eac83 MDL-36316 useragent: Reduce user agent sniffing
* core_useragent: Introduce is_vendor methods to improve readability
  when we are just detecting if a browser is from a vendor, rather than
  the exact version

* Remove uncessary browser version checks when we are just detecting
  vendors - this makes the intention of our sniffing clearer.

* Remove sniffing for browsers which we do not support, grades/ajax/tinymce
  all support modern browsers so there is no need to sniff for them.
2013-09-13 14:25:37 +08:00
Damyon Wiese
83f26f6407 weekly release 2.6dev 2013-09-13 14:05:33 +08:00
Damyon Wiese
1561a37cab MDL-37148 assign: Fix all phpdocs warnings from moodlecheck (except tests) 2013-09-13 13:30:02 +08:00
Damyon Wiese
539af60201 MDL-37148 assign: codechecker cleanups 2013-09-13 13:30:02 +08:00
Damyon Wiese
05a6445a14 MDL-37148 Assignment: Lots more webservices
This patch adds lots of webservices to the assignment module.
* mod_assign_revert_submissions_to_draft
* mod_assign_lock_submissions
* mod_assign_unlock_submissions
* mod_assign_save_submission
* mod_assign_submit_for_grading
* mod_assign_save_grade
* mod_assign_save_user_extensions
* mod_assign_reveal_identities
* mod_assign_copy_previous_attempt

All features such as reopening attempts and marking workflow are supported through
the save_grade and save_submission functions.

Uploading files is supported by sending draft item ids for the files_filemanager param the same functions.
2013-09-13 13:29:51 +08:00
Rossiani Wijaya
f7bfb405cb MDL-41288 wiki: fix missing .rtl class for deleting comment button and improve page display for deleting comment 2013-09-13 12:56:41 +08:00
Mohamed Alsharaf
dca16fd76f MDL-27684 repository: make require_login() throws exception instead of redirect 2013-09-13 16:01:55 +12:00
Rossiani Wijaya
14cdc25731 MDL-41288 Wiki: add additional fix for heading level 2013-09-13 11:04:08 +08:00
Dan Poltawski
6e3cdbdc33 MDL-41438 - unbuilt less changes 2013-09-13 10:56:12 +08:00
Rossiani Wijaya
4460e380a9 MDL-41438 core renderer: additional patch to remove .main definition from all core themes 2013-09-13 10:49:57 +08:00
Marina Glancy
e2e9cb6a14 MDL-37028 Fixed bug, orphaned modules are moved to the 0-section 2013-09-13 10:28:52 +10:00
Dan Poltawski
7ea5f0714d NOBUG/MDL-40829 - fix whitespace errors 2013-09-12 19:22:03 +08:00
Dan Poltawski
1d49a5cdc6 Revert "MDL-40829: courses heading: remove 'headerblock' class from header and fix heading levels"
This reverts commit 278d64572d272c776c564dcd743959c21ee20c8b.

Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-09-12 19:21:43 +08:00
Mark Nelson
9df08c9c51 MDL-41748 calendar: removed unused strings 2013-09-12 16:56:31 +08:00