mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-06 08:52:46 +02:00
Code Issues Projects Releases Wiki Activity
70,767 Commits 36 Branches 529 Tags
Commit Graph

70767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damyon Wiese
cf63799155 Merge branch 'MDL-47227_master' of https://github.com/crazyserver/moodle 2014-10-29 14:44:08 +08:00
Damyon Wiese
857c7b4986 Merge branch 'MDL-47201-master' of git://github.com/xow/moodle 2014-10-29 14:24:28 +08:00
Damyon Wiese
cf13ece570 Merge branch 'MDL-47898-master' of git://github.com/andrewnicols/moodle 2014-10-29 13:36:17 +08:00
Damyon Wiese
e30a684a4b Merge branch 'master_MDL-33939' of https://github.com/danmarsden/moodle 2014-10-29 13:23:28 +08:00
Damyon Wiese
5bfca73e5d Merge branch 'wip-MDL-46517-master' of git://github.com/marinaglancy/moodle 2014-10-29 13:01:35 +08:00
Damyon Wiese
d7c1945472 Merge branch 'wip-MDL-40343-master' of git://github.com/ds125v/moodle 
Conflicts:
	mod/forum/styles.css
 2014-10-29 12:53:21 +08:00
Andrea Bicciolo
087be6ca90 MDL-47201 Reports: Read from multiple log stores in outline report 2014-10-29 12:49:12 +08:00
Damyon Wiese
d9033c0e6d Merge branch 'MDL-47835_master' of git://github.com/dmonllao/moodle 2014-10-29 11:19:46 +08:00
David Monllao
3c26a30799 MDL-47835 block_recent_activity: Same entry keys order 
insert_records() is sensitive to the order of the keys
assigned to the inserted objects (inserted as arrays in
this case). Now keys are assigned using the same order.
 2014-10-29 10:54:11 +08:00
Marina Glancy
a0ef87de1f MDL-46517 calendar: adjust display for DST 
Thanks to Jo Matthews for providing a patch
 2014-10-29 10:31:28 +08:00
Corey Wallis
91465b5095 MDL-46517 calendar: adjust dates for DST 
Change-Id: I269382031e4ffa714396f3d9ce2315a5c96d929c
 2014-10-29 10:31:28 +08:00
Damyon Wiese
4d0fe0ec94 Merge branch 'wip-MDL-36987-master' of git://github.com/marinaglancy/moodle 2014-10-29 10:20:47 +08:00
Dan Poltawski
32a69a7d7a on-demand release 2.8beta+ 2014-10-28 12:32:50 +00:00
Dan Poltawski
3f80a7edce Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-10-28 12:32:48 +00:00
Dan Poltawski
ac3d43b6ec Merge branch 'MDL-47877-master' of git://github.com/andrewnicols/moodle 2014-10-28 12:25:27 +00:00
Dan Poltawski
08f289c617 MDL-47703 fix trailing whitespace 2014-10-28 12:21:30 +00:00
Dan Poltawski
31d6d2ae41 Merge branch 'MDL-47703-master' of git://github.com/FMCorz/moodle 2014-10-28 11:40:27 +00:00
Marina Glancy
b5478757c6 Merge branch 'MDL-47889-master' of git://github.com/FMCorz/moodle 2014-10-28 17:55:06 +08:00
Marina Glancy
001652d743 Merge branch 'wip-mdl-47850-m' of git://github.com/rajeshtaneja/moodle 2014-10-28 17:26:57 +08:00
Andrew Nicols
7545e84661 MDL-47877 mod_forum: Correct subscription options for forums 
Test was the wrong way around when checking subscription state.
 2014-10-28 15:57:12 +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
Pau Ferrer Ocaña
912296ad30 MDL-47227 admin: Fix user bulk selection over 1000 2014-10-28 08:34:01 +01: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
Frederic Massart
d9e879e5d1 MDL-47889 tool_monitor: Test handles random DB ordering 
On Oracle, the subscriptions are not ordered in the same way
than in other DB engines, so we do not rely on that ordering
any more in the test.
 2014-10-28 13:52:45 +08:00
Rajesh Taneja
b159589d9b MDL-47850 message_airnotifier: Fixed airnotifier web service url 2014-10-28 13:24:03 +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
AMOS bot
86bd173927 Automatically generated installer lang files 2014-10-28 00:05:34 +08: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
Andrew Nicols
d5653c6968 MDL-47898 mod_quiz: Correct path when checking content_editable 
Addresses a number of issues when using the text editor in a quiz using
secure mode.
 2014-10-27 19:23:56 +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
Frederic Massart
37fc69a019 MDL-47703 core_grades: Behat test for (non) aggregated scales 2014-10-27 13:00:58 +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