mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 04:22:07 +02:00
Code Issues Projects Releases Wiki Activity
70,738 Commits 36 Branches 531 Tags
Commit Graph

70738 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marina Glancy
cc37a58d06 MDL-47919 tool_monitor: adjustments to behat tests 2014-10-28 17:17:00 +08:00
Marina Glancy
45b7a397bb Merge branch 'MDL-46215-master-fixes' of git://github.com/andrewnicols/moodle 2014-10-28 15:37:05 +08:00
Andrew Nicols
79b4fb1282 MDL-46215 mod_forum: Only add text on discussion view 
Do not show the status text in the thread list.
 2014-10-28 14:27:05 +08:00
Sam Hemelryk
db310f7737 Merge branch 'MDL-47870-master2' of git://github.com/ankitagarwal/moodle 2014-10-28 17:27:09 +13:00
Marina Glancy
7d79115f3d Merge branch '47914-28' of git://github.com/samhemelryk/moodle 2014-10-28 12:23:33 +08:00
Marina Glancy
f173ae2014 Merge branch 'MDL-814-master' of git://github.com/danpoltawski/moodle 2014-10-28 12:23:23 +08:00
Ankit Agarwal
d71e42d7e8 MDL-47870 tool_monitor: Fix event select dropdown 2014-10-28 09:49:08 +05:30
Damyon Wiese
c5258dfa04 MDL-47559 User menu: version bump for new settings 2014-10-28 11:06:40 +08:00
Sam Hemelryk
45ad1693cd MDL-47183 post-integration fixes 
* Fixed typo with context_module::instance
* Fixed use of $mod->get_context()
 2014-10-28 15:59:59 +13:00
Damyon Wiese
5baf74a327 Merge branch 'MDL-47559-master' of git://github.com/jethac/moodle 2014-10-28 09:59:04 +08:00
Sam Hemelryk
77b31ba2ce Merge branch 'MDL-47183-master' of git://github.com/andrewnicols/moodle 2014-10-28 14:02:19 +13:00
Sam Hemelryk
fc8977fbca MDL-47914 report_stats: better handling of user and mode 2014-10-28 11:52:41 +13:00
Marina Glancy
960bb64a2e MDL-47585 stats: fixed incorrect user dropdown 2014-10-28 10:51:02 +13:00
Dan Poltawski
f3206dfc36 MDL-814 forum: provide cancel button when posting 
This is the way to clear atto drafts
 2014-10-27 16:44:47 +00:00
Dan Poltawski
b5780fbd18 Merge branch 'MDL-46215-master' of git://github.com/andrewnicols/moodle 2014-10-27 14:51:04 +00:00
Jetha Chan
b865a3e2d1 MDL-47559 user_menu: customusermenu setting 2014-10-27 20:04:45 +08:00
Dan Poltawski
7c636855e2 Merge branch 'MDL-47839-master' of git://github.com/FMCorz/moodle 2014-10-27 08:01:33 +00:00
Frederic Massart
f2823ec4bc MDL-47839 core_grades: Minor styling improvements to setup/user report 2014-10-27 15:59:21 +08:00
Dan Poltawski
77733e6b89 Merge branch 'wip-mdl-47676-m' of https://github.com/rajeshtaneja/moodle 2014-10-27 07:47:07 +00:00
Dan Poltawski
a1ac634692 Merge branch 'MDL-47734-master-fixes' of git://github.com/andrewnicols/moodle 2014-10-27 07:40:06 +00:00
Rajesh Taneja
d6040f0366 MDL-47676 core_grades: reset is hidden in menu, using proper step 2014-10-27 15:21:11 +08:00
Damyon Wiese
837862579e Merge branch 'm28_MDL-47210_IIS_PATH_INFO_Ignored_In_Required_Login_Pluginfile_Redirect' of https://github.com/scara/moodle 2014-10-27 13:58:15 +08:00
Andrew Nicols
517e17826b MDL-46215 mod_forum: Improve style of subscription state 
With the implementation of per-discussion subscription, the current
discussion's subscription state must be shown.

Since this state belongs to the discussion rather than the forum, it
should be shown accordingly.  This change therefore includes the addition
of the discussion name as a heading on the page.
 2014-10-27 12:37:05 +08:00
Dave Cooper
d7f9acc46a MDL-47833 core: Change default expiry for message inbound handlers 2014-10-27 11:53:33 +08:00
Marina Glancy
f2bec5d9ba Merge branch 'MDL-47850-master' of git://github.com/jleyva/moodle 2014-10-27 11:52:35 +08:00
Marina Glancy
a8668e161a Merge branch 'MDL-47882_scorm_loadsco_invalid_html' of git://github.com/MorrisR2/moodle 2014-10-27 11:52:18 +08:00
Damyon Wiese
ae0711d861 MDL-47690 Course: Remove unused variable from unit tests. 2014-10-27 11:26:35 +08:00
Andrew Nicols
2af57bdbc5 MDL-47734 core: Do not set scrolltop on fixed dialogues 
Fixed position dialogues use a different xy positioning than standard
dialogues so cannot use the scrollTop positioning method.
 2014-10-27 11:22:30 +08:00
Damyon Wiese
d2dbc373f8 Merge branch 'MDL-47690-master' of git://github.com/jleyva/moodle 2014-10-27 11:11:53 +08:00
Damyon Wiese
2b97417296 Merge branch 'wip-MDL-30358-master' of git://github.com/marinaglancy/moodle 2014-10-27 10:30:44 +08:00
Matteo Scaramuccia
ce1cc198bb MDL-47210 Files API: IIS, PATH_INFO ignored in required login redirect. 2014-10-26 08:03:27 +01:00
Ray Morris
a53bf3a031 MDL-47882 SCORM: invalid HTML in loadSCO.php 2014-10-24 16:45:32 -05:00
Dan Poltawski
42b6b39136 Merge branch 'MDL-46088-master' of git://github.com/timhunt/moodle 2014-10-24 17:10:56 +01:00
Dan Poltawski
8d1c5eceb3 Merge branch 'MDL-47545-master' of git://github.com/jleyva/moodle 2014-10-24 16:40:06 +01:00
Juan Leyva
3ca3d259e5 MDL-47545 web services: Allow cross origin requests for file downloads 2014-10-24 17:10:44 +02:00
Dan Poltawski
cb1bc5eb6b Merge branch 'MDL-46712-master' of git://github.com/jethac/moodle 2014-10-24 15:37:26 +01:00
Dan Poltawski
f6dbc2bb9c Merge branch 'MDL-47782-master' of git://github.com/lameze/moodle 
Conflicts:
	admin/tool/monitor/lang/en/tool_monitor.php
 2014-10-24 15:25:42 +01:00
Dan Poltawski
22ef599c5d Merge branch 'MDL-47780_master' of https://github.com/markn86/moodle 2014-10-24 15:19:48 +01:00
Dan Poltawski
519fd3dd4c Merge branch 'wip-MDL-47760-master' of git://github.com/marinaglancy/moodle 2014-10-24 15:18:32 +01:00
Dan Poltawski
d6eff32be0 Merge branch '46518-28' of git://github.com/samhemelryk/moodle 2014-10-24 15:16:55 +01:00
Dan Poltawski
0b03353433 Merge branch 'MDL-47804' of git://github.com/aolley/moodle 2014-10-24 15:14:53 +01:00
Dan Poltawski
7638a4366f Merge branch '47608-28' of git://github.com/samhemelryk/moodle 2014-10-24 15:12:59 +01:00
Frederic Massart
20942dd702 MDL-47397 assignfeedback_editpdf: Copy stamps to other students in team 
During a team submission the stamps were attached to the user that
was graded and not to the other users. This could lead to errors when
generating the PDF for each user.
 2014-10-24 15:09:06 +01:00
Frederic Massart
47ff1cd93b MDL-47397 assignfeedback_editpdf: Tests use reliable way to annotate PDF 
The drag and drop step did not work, so we moved to using the stamps
to annotate the PDF. They do not rely on drag&drop and produce the same
effects.
 2014-10-24 15:09:06 +01:00
Frederic Massart
aad194b19a MDL-47397 editor_atto: Properly close confirm dialogue in Behat test 2014-10-24 15:09:06 +01:00
Dan Poltawski
e29ec53238 Merge branch 'MDL-47778_master' of https://github.com/markn86/moodle 2014-10-24 14:53:21 +01:00
Andrew Nicols
71bc139d63 MDL-47802 mod_forum: Check for required subscription capabilities 
Users must be able to both view, and manage their subscription in order to
subscribe or be subscribed to a discussion.
 2014-10-24 14:44:21 +01:00
Andrew Nicols
0603df04da MDL-47802 mod_forum: Include discussion subscriptions when moving 
Check for both forum, and discussion subscriptions when moving a discussion
to a different forum.
 2014-10-24 14:44:21 +01:00
Zachary Durber
5b2571547f MDL-47873 gradebook: Fix for missing override checkboxes. 2014-10-24 14:39:20 +01:00
Dan Poltawski
6c6375e438 Merge branch 'MDL-47866-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	version.php
 2014-10-24 14:34:09 +01:00