mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-24 09:30:17 +01:00
Code Issues Projects Releases Wiki Activity
66,513 Commits 36 Branches 527 Tags
Commit Graph

66513 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
a24ef7d7cd Merge branch 'MDL-33099-master' of git://github.com/andrewnicols/moodle 2014-02-17 14:40:36 +08:00
Damyon Wiese
4339015aca Merge branch 'MDL-40062-master' of git://github.com/danpoltawski/moodle 2014-02-17 14:37:18 +08:00
Damyon Wiese
12aca2577a Merge branch 'MDL-43504-master' of git://github.com/andrewnicols/moodle 2014-02-17 14:19:36 +08:00
Damyon Wiese
8053854592 Merge branch 'MDL-23514-master' of https://github.com/danielneis/moodle 
Conflicts:
	lang/en/admin.php
 2014-02-17 14:12:16 +08:00
Andrew Nicols
af64bc6179 MDL-33099 Javascript: Deprecate the ajaxenabled function 2014-02-17 14:11:21 +08:00
Dan Poltawski
97802bea3a MDL-40062 mod_forum: Add discussion_updated event 2014-02-17 14:07:14 +08:00
Dan Poltawski
a52c04d549 MDL-40062 mod_forum: add event unit tests 
And bump forum version for new events.
 2014-02-17 14:05:54 +08:00
Dan Poltawski
2d3f692bfe MDL-40062 mod_forum: post events 
* post_created
* post_updated
* post_deleted

Prune post (split discussion) has been converted to multiple events as
splitting a post actually means new discussion created.
 2014-02-17 14:05:54 +08:00
Dan Poltawski
e70ebc55f8 MDL-40062 mod_forum: read tracking events 
* readtracking_enabled
* readtracking_disabled
 2014-02-17 14:05:54 +08:00
Dan Poltawski
de2770501e MDL-40062 mod_forum: subscription events 
Events for forum mail subscriptions

* subscription_created
* subscription_deleted
* subscribers_viewed
 2014-02-17 14:05:54 +08:00
Dan Poltawski
71595d0053 MDL-40062 mod_forum: discussion events 
* discussion_created
* discussion_deleted
* discussion_moved
* discussion_viewed
 2014-02-17 14:05:53 +08:00
Damyon Wiese
09c7f57fd2 Merge branch 'MDL-40061_master' of https://github.com/markn86/moodle 2014-02-17 13:14:45 +08:00
Dan Poltawski
3b854e8c2a Merge branch 'MDL-42618_master' of git://github.com/SWiT/moodle 2014-02-17 12:13:39 +08:00
Dan Poltawski
35a8d26926 Merge branch 'MDL-27414' of git://github.com/jmvedrine/moodle 2014-02-17 12:06:42 +08:00
Andrew Nicols
2ae7e4ddd6 MDL-43504 Course: Include the course/category collapse JS correctly 
This was previously only included when there were hidden categories to show
which were not yet visible. As a result, if all categories were visible,
then the JS was not included.
 2014-02-17 11:33:52 +08:00
Andrew Nicols
b44b0fdab4 MDL-43504 Javascript: Frontpage collapsing should not depend on enableajax 
This is an oversight, but we should not depend on the enableajax setting
which we're trying to deprecate.
 2014-02-17 11:25:16 +08:00
Dan Poltawski
0a9f5b66c5 Merge branch 'MDL-42033' of git://github.com/jmvedrine/moodle 2014-02-17 10:32:33 +08:00
Dan Poltawski
2288139207 MDL-40062 mod_forum: convert viewed events 
* course_module_instance_list_viewed
* forum_viewed
* course_searched
* userreport_viewed
 2014-02-17 10:03:23 +08:00
Dan Poltawski
33c40cc633 MDL-40062 mod_forum: remove invalid add_to_log() calls 
* debugging add_to_log() calls - the Moodle log is not the
  place for these kind of messages

* subscribeall/unsusbcribeall - now individual subscriptions
  will fire events, there is no need for a catch all.

* remove read tracking log entries - read tracking individual
  log entries do not provide enough reliable information, as
  the posts can be marked as read automatically after emailing
  or an expiry period.
 2014-02-17 10:03:23 +08:00
Damyon Wiese
a47e7a1abb Merge branch 'MDL-44018' of git://github.com/timhunt/moodle 2014-02-17 09:14:46 +08:00
Sam Hemelryk
afbd791a05 Merge branch 'MDL-44037_master' of git://github.com/dmonllao/moodle 2014-02-17 10:16:33 +13:00
Sam Hemelryk
487f74813e Merge branch 'MDL-42404_master' of git://github.com/dmonllao/moodle 2014-02-17 10:15:36 +13:00
Sam Hemelryk
1fa13df59e Merge branch 'MDL-44142-master' of git://github.com/mrverrall/moodle 2014-02-17 09:16:32 +13:00
Sam Hemelryk
fa52e6494d Merge branch 'MDL-44042-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop-min.js
 2014-02-17 09:06:58 +13:00
Sam Hemelryk
9e7fb3e848 Merge branch 'MDL-44055-master' of git://github.com/andrewnicols/moodle 2014-02-17 09:04:48 +13:00
Sam Hemelryk
87643ff599 Merge branch 'MDL-44079-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
 2014-02-17 08:48:39 +13:00
Sam Hemelryk
80ce7e1a8d Merge branch 'MDL-43979-master' of git://github.com/andrewnicols/moodle 2014-02-17 08:27:48 +13:00
Jean-Michel Vedrine
624ff5ba57 MDL-42033 Files in subdirs not exported correctly by question XML format 2014-02-16 19:37:09 +01:00
Mark Nelson
561672d3a6 MDL-40061 mod_data: replaced 'record delete' add_to_log call with an event 2014-02-14 18:40:19 -08:00
Mark Nelson
3909293faf MDL-40061 mod_data: replaced 'templates saved' add_to_log call with an event 2014-02-14 18:39:56 -08:00
Mark Nelson
3ac413b28e MDL-40061 mod_data: replaced 'templates view' add_to_log call with an event 2014-02-14 18:39:55 -08:00
Mark Nelson
76ca452c12 MDL-40061 mod_data: replaced 'add' add_to_log call with an event 2014-02-14 18:39:50 -08:00
Mark Nelson
45eae37967 MDL-40061 mod_data: replaced 'update' add_to_log call with an event 2014-02-14 18:13:05 -08:00
Mark Nelson
d1ec55570d MDL-40061 mod_data: replaced 'fields update' add_to_log call with an event 2014-02-14 18:12:41 -08:00
Mark Nelson
e0d7ed6dae MDL-40061 mod_data: replaced 'fields add' add_to_log call with an event 2014-02-14 18:12:13 -08:00
Mark Nelson
e37c413e87 MDL-40061 mod_data: replaced 'fields delete' add_to_log call with an event 2014-02-14 18:11:47 -08:00
Jean-Michel Vedrine
93a543938c MDL-27414 Upgrade the randomsamatch qtype to the new question engine 
Added XML import/export
Different randomsamatch qtypes in the same quiz can now pick the same
shortanswer question.
Images are not preserved if shortanswer question is deleted after being
used in a randomsamatch attempt.
 2014-02-14 16:53:04 +01:00
Paul Verrall
a266a1a07b MDL-44142 Cohorts: Use maxusersperpage for list of current users. 2014-02-13 15:48:40 +00:00
Eloy Lafuente (stronk7)
692d247a3a weekly release 2.7dev 2014-02-13 15:29:44 +01:00
Eloy Lafuente (stronk7)
eee94e31fb Merge branch 'install_master' of git://git.moodle.org/moodle-install 2014-02-13 15:29:34 +01:00
Andrew Nicols
2ab0238ff6 MDL-44042 Javascript: Handle moving to the top of the current section with keyboard 2014-02-13 10:11:00 +08:00
David Monllao
38f0b67b71 MDL-44037 behat: New feature -> publishing rubric templates 
This patch automates MDLQA-1186; rubrics can be
shared as templates.
 2014-02-12 16:28:42 +08:00
David Monllao
b408987d3e MDL-42404 behat: Covering MDL-39710 with behat features 
I've contributed to a large an ugly scenario
in favour of performance as separating it in another
scenario or feature would add 3 or 4 minutes to the suite.
 2014-02-12 16:07:46 +08:00
David Monllao
993f26bdd2 MDL-42404 behat: Adding feature to test reusing user's rubrics 
Automates MDLQA-1187, teachers can reuse their
rubrics in other activity.
 2014-02-12 16:07:46 +08:00
David Monllao
37fcfd9911 MDL-42404 behat: Adding rubrics step definitions 2014-02-12 16:07:46 +08:00
David Monllao
d57eda7278 MDL-42404 behat: Adding edit rubrics feature 
Automates the following MDLQA-1185, MDLQA-1188
and MDLQA-1427. All of them related with the
expected outcomes after editing rubrics definitions
that were already used to grade students.
 2014-02-12 16:07:44 +08:00
Petr Škoda
900b1bf7d1 MDL-43200 fix enrol_manual externallib tests 2014-02-12 16:01:34 +08:00
David Monllao
e39a7f886e MDL-42404 behat: Adding yui-dialog to dialogue selector 2014-02-12 15:42:05 +08:00
Sam Hemelryk
e52bbf07a8 Merge branch 'MDL-41644' of git://github.com/apsdehal/moodle 2014-02-12 09:24:06 +13:00
Sam Hemelryk
ae7befec1e Merge branch 'wip-mdl-43289' of git://github.com/rajeshtaneja/moodle 2014-02-12 09:21:54 +13:00