70922 Commits

Author SHA1 Message Date
Damyon Wiese
520a32c3d4 Merge branch 'wip_MDL-47966_m28_defaultheaders' of https://github.com/skodak/moodle 2014-11-03 12:20:58 +08:00
Damyon Wiese
c942fddf93 MDL-48006 Atto autosave: Never restore text that is empty. 2014-11-03 11:30:30 +08:00
Mark Nelson
7293e97162 MDL-47361 tooL_monitor: string and UI changes 2014-11-02 19:05:29 -08:00
Sam Hemelryk
cf03313342 Merge branch 'MDL-47465-master' of git://github.com/ankitagarwal/moodle 2014-11-03 15:30:08 +13:00
Ankit Agarwal
c4e3e12884 MDL-47465 tool_monitor: Ignore used events
An event that has already contributed to a notification should not contribute to another notification for the same subscription.
This needs to be done so we do not overwhelm the user.
2014-11-03 07:18:13 +05:30
Ankit Agarwal
1af956998e MDL-47465 tool_monitor: add a new column to subs 2014-11-03 07:18:13 +05:30
Sam Hemelryk
1b5b97fac5 MDL-47917 cachestore_memcached: fixed get_many ordering 2014-11-03 14:08:25 +13:00
Sam Hemelryk
ac4ed127de MDL-47978 mod_quiz: more explicit selector for action menu change 2014-11-03 11:39:30 +13:00
Sam Hemelryk
968cc37437 Merge branch 'MDL-47978' of git://github.com/timhunt/moodle 2014-11-03 11:27:55 +13:00
Sam Hemelryk
70739e6e30 MDL-47969 mod_survey: fixed HTML5 validation of index.php 2014-11-03 08:55:12 +13:00
Sam Hemelryk
e014b6f2c4 MDL-47968 mod_forum: fixed search form HTML5 validation 2014-11-03 08:54:56 +13:00
Tim Hunt
f9476f4d0e MDL-48010 grade import from URL: don't corrupt the URL. 2014-10-31 19:52:33 +00:00
Tim Hunt
b4a40e451d MDL-48008 gradeimport_xml: report errors usefully 2014-10-31 19:52:31 +00:00
Tim Hunt
262105faf9 MDL-47978 quiz editing: fix display of last add menu 2014-10-31 18:23:45 +00:00
Eloy Lafuente (stronk7)
6863c0de49 Merge branch 'MDL-47892-master' of git://github.com/lameze/moodle 2014-10-31 18:57:30 +01:00
Tim Hunt
58413f613e MDL-47963 quiz editing: fix failing unit tests
The unit tests were initialising the structure class in a different way
from real use. That was clearly silly, so I got rid of create_for,
leaving just the real create_for_quiz.
2014-10-31 17:22:38 +00:00
Dan Poltawski
1de9b5072a Merge branch 'MDL-47797' of git://github.com/timhunt/moodle 2014-10-31 16:48:30 +00:00
Tim Hunt
234c5337f7 MDL-47797 quesion preview: improve the behat script
Tests a few more buttons, and also verify more of the UI.
2014-10-31 15:52:55 +00:00
Tim Hunt
40459677a0 MDL-47797 question preview: show more technical info
It is helpful for developers creating question types (at least) to be
able to see this.
2014-10-31 15:52:54 +00:00
Dan Poltawski
b4eaafd744 Merge branch 'MDL-47963' of git://github.com/timhunt/moodle 2014-10-31 13:14:59 +00:00
David Mudrák
fb1f2b9b27 MDL-47883 admin: Fix missing string in the plugin validation 2014-10-31 12:54:22 +01:00
Dan Poltawski
9ebee5df8e on-demand release 2.8beta+ 2014-10-31 09:09:03 +00:00
Mark Nelson
eb0aabde73 MDL-47758 tool_monitor: altered behat tests so they pass 2014-10-31 01:16:10 -07:00
Mark Nelson
c4701daa75 MDL-47758 tool_monitor: prevent DB error when revisiting a delete URL 2014-10-31 01:16:10 -07:00
Rajesh Taneja
54957bdbf7 MDL-45204 phpunit: Fixed test_localcachedir test
make_localcache_directory is the first call to make
localcache, which is already created by reset. So deleting
existing localcache directory will pass this test
2014-10-31 16:07:47 +08:00
Mark Nelson
a724ceb99f MDL-47919 tool_monitor: only use set_label() on valid object 2014-10-31 00:56:47 -07:00
Marina Glancy
2e7eca137c MDL-47976 tool_monitor: fix ordering in unittest 2014-10-31 15:25:54 +08:00
Simey Lameze
ed9084f70b MDL-47892 tool_monitor: add count_rule_subscriptions method and unit tests 2014-10-31 15:10:19 +08:00
Simey Lameze
107b55bd74 MDL-47892 tool_monitor: disable plugin and event fields if theres subscriptions for the rule 2014-10-31 14:41:24 +08:00
David Monllao
0151ef57f5 MDL-47864 tool_monitor: Change edulevels
Considering that the most common use case
to manage rules is an admin CRUDing them.
2014-10-31 14:01:31 +08:00
David Monllao
f5d3d0f498 MDL-47864 grade_report: Edulevels according to default user permissions 2014-10-31 14:01:30 +08:00
Sam Hemelryk
1a14f8a6de MDL-47959 mod_quiz: fixed 0 questions bug 2014-10-31 13:35:25 +13:00
Andrew Nicols
4c34089889 MDL-47987 mod_forum: Users subscribe to discussions not forums
Correct language string which describes users subscribing to a discussion,
and use it when subscribing on post.
2014-10-31 07:51:48 +08:00
Sam Hemelryk
323ed3bbf0 Merge branch 'MDL-47875_master' of https://github.com/crazyserver/moodle 2014-10-31 11:15:12 +13:00
pau.ferrer-ocana
5ea0d026b0 MDL-47875 choice: chat module strings not required from Choice anymore
AMOS BEGIN
 CPY [chatintro,mod_chat],[description,mod_choice]
AMOS END
2014-10-30 22:41:23 +01:00
Sam Hemelryk
3ea5ff8941 Merge branch 'MDL-42875_master' of https://github.com/crazyserver/moodle 2014-10-31 10:27:46 +13:00
Dan Poltawski
fca969b9bb Merge branch 'MDL-47972' of git://github.com/timhunt/moodle 2014-10-30 17:31:12 +00:00
Colin Chambers
77dca4d0a8 MDL-47972 mod_quiz: Fix new quiz on themes based on base. 2014-10-30 17:11:23 +00:00
David Monllao
f31d564133 MDL-47950 course: Adding sesskey confirmation when duplicating activities 2014-10-30 16:58:45 +00:00
Dan Poltawski
0a92904c47 MDL-47918 forum: Coding style fix 2014-10-30 16:46:46 +00:00
Tim Hunt
6870a6b8d0 MDL-47963 quiz editing: block ajax edits once there are attempts 2014-10-30 16:24:55 +00:00
Dan Poltawski
ebbf039d07 Merge branch 'MDL-47746-master' of git://github.com/zbdd/moodle 2014-10-30 15:39:46 +00:00
Dan Poltawski
665611454d Merge branch 'MDL-47896-master' of git://github.com/zbdd/moodle 2014-10-30 15:15:28 +00:00
Dan Poltawski
fb9604d67c Merge branch 'MDL-47918-master' of git://github.com/andrewnicols/moodle 2014-10-30 14:31:38 +00:00
Dan Poltawski
f976c8e468 Merge branch 'MDL-47959' of git://github.com/colchambers/moodle 2014-10-30 14:24:35 +00:00
Marina Glancy
08674d83c1 Merge branch 'MDL-25057-master' of git://github.com/andrewnicols/moodle 2014-10-30 17:14:09 +08:00
pau.ferrer-ocana
afa0968d5d MDL-26447 gradebook: Default gradedisplaytype fixed for all locales 2014-10-30 09:43:43 +01:00
Dan Poltawski
fe5c340197 Merge branch 'wip-MDL-47919-master2' of https://github.com/marinaglancy/moodle 2014-10-30 08:30:43 +00:00
Marina Glancy
89da9fa67b Merge branch 'MDL-47569_CC_Errors' of git://github.com/moodlerooms/moodle 2014-10-30 16:15:51 +08:00
Marina Glancy
61138e352d Merge branch '47970-28' of git://github.com/samhemelryk/moodle 2014-10-30 16:15:38 +08:00