68204 Commits

Author SHA1 Message Date
Marina Glancy
0af422fe0f Merge branch 'MDL-44614_master-missing-upload' of git://github.com/dmonllao/moodle 2014-04-29 13:02:41 +08:00
Marina Glancy
506b3e2317 Merge branch 'MDL-45289-master' of git://github.com/danpoltawski/moodle 2014-04-29 12:49:30 +08:00
David Monllao
d2e6b3b26b MDL-44614 behat: Added missing @_file_upload 2014-04-29 09:55:47 +07:00
Damyon Wiese
eff880c371 Merge branch 'MDL-44916-master' of git://github.com/phalacee/moodle 2014-04-29 10:21:25 +08:00
Dan Poltawski
e1850856c9 MDL-45289 block_course_summary: Add behat tests 2014-04-29 09:52:54 +08:00
Sam Hemelryk
e0eca9b3e5 Merge branch 'MDL-45312' of git://github.com/timhunt/moodle 2014-04-29 10:24:20 +12:00
Sam Hemelryk
4299dc5bb6 Merge branch 'MDL-45221-master' of git://github.com/andrewnicols/moodle 2014-04-29 09:10:05 +12:00
Tim Hunt
856c2f1404 MDL-45312 qtype_missingtype or qbehaviour_missing cannot be uninstalled.
They are required by the system.
2014-04-28 21:45:46 +01:00
Sam Hemelryk
48dba530c6 Merge branch 'MDL-45229-master' of git://github.com/FMCorz/moodle 2014-04-29 08:40:16 +12:00
Marina Glancy
cd360f69a4 Merge branch 'w18_MDL-45287_m27_dbreset' of git://github.com/skodak/moodle 2014-04-28 20:17:57 +08:00
Marina Glancy
db9cd0b085 Merge branch 'wip-mdl-45293' of git://github.com/rajeshtaneja/moodle 2014-04-28 18:01:27 +08:00
Marina Glancy
e8277bd886 Merge branch 'MDL-45156_master' of git://github.com/dmonllao/moodle 2014-04-28 18:01:15 +08:00
Marina Glancy
2666d179ff Merge branch 'MDL-45266-master' of git://github.com/danpoltawski/moodle 2014-04-28 18:00:57 +08:00
Jetha Chan
899fa34a8e MDL-45292 filepicker: fixed border style
Fixed base style issues on RTL.
2014-04-28 17:04:55 +08:00
Petr Skoda
a9236a2c3f MDL-45287 fix behat database reset between scenarios
We cannot find out if DB received any writes because behat
web access runs in different request.

This was affecting only scenarios without generators.
2014-04-28 17:02:58 +08:00
Frederic Massart
c56f0f4a2c MDL-45298 theme: More permissive usage of retired themes settings 2014-04-28 16:27:33 +08:00
Damyon Wiese
70579a3622 Merge branch 'MDL-45079_master' of https://github.com/totara/openbadges 2014-04-28 16:15:54 +08:00
Simey Lameze
5ad9dd5ff2 MDL-42956 auth: Fix hard-coded LIMIT clause on keepalive_client method. 2014-04-28 16:08:49 +08:00
Ankit Agarwal
a9282e4120 MDL-45258 tags:context object/0 should not be passed to tag_set() 2014-04-28 15:35:01 +08:00
Frederic Massart
abf3a51e29 MDL-45257 mod_assign: Removing wonky feedback_updated event 2014-04-28 15:13:55 +08:00
Rajesh Taneja
66d8b25b1c MDL-45293 report_participation: ensure only web and ws logs are shown 2014-04-28 13:50:47 +08:00
Marina Glancy
254402dbbe Merge branch 'w17_MDL-45128_m27_stats' of git://github.com/skodak/moodle 2014-04-28 13:48:18 +08:00
Marina Glancy
37501cac1c Merge branch 'MDL-45288_master' of git://github.com/dmonllao/moodle 2014-04-28 13:48:09 +08:00
Marina Glancy
f6db769eb2 Merge branch 'MDL-44614_master' of git://github.com/dmonllao/moodle 2014-04-28 13:03:39 +08:00
Marina Glancy
c6b4a7f4a2 Merge branch 'MDL-44627-master' of git://github.com/lameze/moodle 2014-04-28 12:43:37 +08:00
Andrew Nicols
9cd7bb3764 MDL-45221 admin: configexecutable admin settings should only accept files 2014-04-28 12:21:21 +08:00
Simey Lameze
9e533215bd MDL-44627 events: Triggering event course module updated actions. 2014-04-28 12:11:24 +08:00
Jason Fowler
b23a320558 MDL-44916 Question: Fixing alignment in bootstrap themes 2014-04-28 11:37:26 +08:00
Petr Skoda
8dcb7ae62e MDL-45128 include only education related events from real users in statistics processing 2014-04-28 11:31:31 +08:00
Frederic Massart
1f6988bb3b MDL-45229 event: Trigger event when section visibility changes 2014-04-28 11:27:47 +08:00
Frederic Massart
be9fb21191 MDL-45229 event: Validate sectionnum in course_section_updated 2014-04-28 11:27:44 +08:00
David Monllao
0a0af55021 MDL-45288 behat: Restricting click to .logininfo 2014-04-28 10:20:34 +07:00
Marina Glancy
e865dff3bb Merge branch 'MDL-44004-master' of git://github.com/FMCorz/moodle 2014-04-28 11:16:45 +08:00
David Monllao
23102c3e2e MDL-44614 behat: Automate MDLQA-61
In an Offline activity assignment, a teacher can
grade and give comments on an assignment completed
offline.
2014-04-28 10:01:01 +07:00
David Monllao
6f9f05a06e MDL-44614 behat: Automate MDLQA-60
A teacher can provide feedback
comments and files for an assignment.
2014-04-28 10:00:41 +07:00
Damyon Wiese
782c811478 Merge branch 'MDL-45268-master' of git://github.com/danpoltawski/moodle 2014-04-28 10:50:04 +08:00
Marina Glancy
566fd05d21 Merge branch 'master_MDL-45210' of git://github.com/totara/moodle 2014-04-28 10:46:04 +08:00
Marina Glancy
3a0edd1fcd Merge branch 'MDL-45052-master' of git://github.com/ankitagarwal/moodle 2014-04-28 10:44:36 +08:00
Ankit Agarwal
c4652889f1 MDL-45052 events: Cleanup db/events.php 2014-04-28 10:33:18 +08:00
Dan Poltawski
16f37c5c13 MDL-45266 behat: tests for login block 2014-04-28 10:32:50 +08:00
Sam Hemelryk
934cedc46e Merge branch 'mdl45232' of https://github.com/tlevi/moodle 2014-04-28 14:23:33 +12:00
Dan Poltawski
853c1d7169 Merge branch '45248-27' of git://github.com/samhemelryk/moodle 2014-04-28 10:17:16 +08:00
Sam Hemelryk
6ce786cbe7 Merge branch 'MDL-45164_master' of git://github.com/dmonllao/moodle 2014-04-28 14:09:27 +12:00
Sam Hemelryk
0e7408683f Merge branch 'MDL-45284_master' of git://github.com/dmonllao/moodle 2014-04-28 14:09:18 +12:00
Dan Poltawski
cf3166aafb Merge branch 'w17_MDL-45250_m27_ripaddtolog' of https://github.com/skodak/moodle 2014-04-28 09:40:41 +08:00
Sam Hemelryk
1e902feb66 Merge branch 'wip-MDL-45280-master' of git://github.com/marinaglancy/moodle 2014-04-28 12:22:44 +12:00
Sam Hemelryk
6b8e2f6794 Merge branch 'MDL-45286' of git://github.com/stronk7/moodle 2014-04-28 12:15:38 +12:00
Eloy Lafuente (stronk7)
1940cc3a91 MDL-45286 timezones: updated to 2014b 2014-04-28 01:01:04 +02:00
Yuliya Bozhko
774ead81fc MDL-45079 badges: Remove user email address from badge page
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
2014-04-28 10:01:05 +12:00
Sam Hemelryk
a5f4213939 MDL-45248 course: fixed assumptions when logging a course view 2014-04-28 08:12:35 +12:00