66758 Commits

Author SHA1 Message Date
Marina Glancy
3a7b9b76c2 MDL-39990 wiki: more detailed validation of view/edit access rights 2014-03-03 14:45:03 +08:00
Dan Poltawski
f504e63daa Merge branch 'wip-MDL-44321-master' of git://github.com/marinaglancy/moodle 2014-03-03 13:50:18 +08:00
Dan Poltawski
a8b07dbf98 Merge branch 'wip-MDL-44362-master' of git://github.com/marinaglancy/moodle 2014-03-03 13:33:40 +08:00
Andrew Davis
5c45ea0c6b MDL-44082 mod_chat: added a security check for users already in the chat activity 2014-03-03 12:15:54 +08:00
Tomasz Muras
1298acc707 MDL-43656 mod_feedback: availablity date logic incorrect 2014-03-03 11:23:44 +08:00
Maria Torres
dc8f55c302 MDL-43916 - Email addresses incorrectly displayed
When capabilities and settings do not allow it.
2014-03-03 10:35:00 +08:00
Dan Poltawski
818f4f953c Merge branch 'w06_MDL-43344_m27_flow' of https://github.com/skodak/moodle 2014-03-03 10:07:16 +08:00
Dan Poltawski
b79f8bbb54 Merge branch 'MDL-43749' of git://github.com/timhunt/moodle 2014-03-03 09:36:54 +08:00
Tim Hunt
b111c177f0 MDL-43749 quiz DB tables. Put install.xml in a more logical order.
All settings tables before all user data.
2014-03-02 10:01:22 +01:00
Tim Hunt
ccba5b8805 MDL-43749 normalise quiz database structure.
The sequence of questions that made up a quiz used to be stored as a
comma-separated list in quiz.questions. Now the same information is
stored in the rows in the quiz_slots table. This is not just 'better' in
a database design sense, but it allows for the future changes we will
need as we enhance the quiz in the MDL-40987 epic.

Having changed the database structure, all the rest of the code needs to
be changed to account for it, and that is done here.

Note that there are not many unit tests for the changed bit. That is
because as part of MDL-40987 we will be changing the code further, and
we will add unit tests then.
2014-03-02 10:00:40 +01:00
Tim Hunt
9eec598ca9 MDL-44251 fix typo in DML unit tests. 2014-03-02 09:41:17 +01:00
Tim Hunt
c185726964 MDL-44251 DB helper to update rows without violating a unique index. 2014-03-02 09:41:03 +01:00
Marina Glancy
21d2280361 MDL-44362 recentactivity: fix regressions from MDL-44055 2014-02-28 16:39:32 +08:00
Marina Glancy
74d45861e9 MDL-44321 events: Text correction in assessable events 2014-02-28 16:37:36 +08:00
Marina Glancy
cd5be9a504 MDL-44321 events: make sure the full object is passed to add_record_snapshot() 2014-02-28 16:37:36 +08:00
Marina Glancy
5e70ea26bb MDL-44321 events: debug on errors in add_record_snapshot()
also clone object returned by get_record_snapshot() to prevent accidental changing of $COURSE or other important objects
2014-02-28 16:37:31 +08:00
Marina Glancy
1e242b41af MDL-44321 events: cleaning up course_module_instance_list_viewed event 2014-02-28 16:36:09 +08:00
Marina Glancy
fbc4b77841 MDL-44321 events: cleaning up course_module_viewed event 2014-02-28 16:36:09 +08:00
Damyon Wiese
76e4de31cc MDL-25505 Tasks: Fix for scheduled task bug on the last day of the month.
On the last day of the month, the scheduled task next time calculation was wrapping
to the 0th day of the month (which is not a valid day).
2014-02-28 13:14:58 +08:00
Damyon Wiese
d0b114f95e weekly release 2.7dev 2014-02-28 10:02:14 +08:00
Damyon Wiese
811ba97093 NOBUG: Fixed file access permissions 2014-02-28 10:02:13 +08:00
Damyon Wiese
c79ee48b67 Merge branch 'install_master' of git://git.moodle.org/moodle-install 2014-02-28 10:02:04 +08:00
David Monllao
b71419ae04 MDL-25505 behat: Adding a time gap between two cron runs.
According to \core\task\scheduled_task::get_next_scheduled_time() we
wait 61 seconds, as the next scheduled time is in the next minute.
2014-02-27 14:29:20 +08:00
David Monllao
0d5b3cb59b MDL-44286 behat: Fixing JS code error
PhantomJS console shows a JS error regarding
an undefined Syn var; as explained by Andrew
Nicols this is caused by Syn supported features
checker, the change in moodle-behat-extension
solves this problem.
2014-02-27 13:27:18 +08:00
Damyon Wiese
00319097c5 Merge branch 'MDL-38903-master' of git://github.com/phalacee/moodle 2014-02-27 13:18:27 +08:00
Jason Fowler
00bc0844b0 MDL-38903 Filepicker: Improving Bootstrap button support 2014-02-27 10:51:03 +08:00
Damyon Wiese
642df831f9 MDL-44139 Remove adminwarning from base css.
Grr. Afterburner has nothing defined for adminwarning before, so this
makes it look all red and splotchy.
2014-02-26 15:30:44 +08:00
Damyon Wiese
2fda38c2ab MDL-44139 Themes: Add default definitions for .adminwarning and .adminerror to base
These were missing from base, but were defined in standard and canvas, which 99% of old themes
inherit from. But they are critical for the proper display of moodle and should at least have a
default definition in all themes (e.g. afterburner only inherits from base).

This background color has been tested for contrast accessibility.
2014-02-26 14:07:07 +08:00
Damyon Wiese
309ae8921f MDL-25499: Centralise management of all types of cron tasks
Centralise management of all types of cron tasks with registration, scheduling,
parallel task conflicts(blocking) and running once off tasks, all using an
administration screen.

This is a combination of several issues:

MDL-25502: Added "black magic" task allocator for cron
MDL-25503: Add step to cron to run all scheduled tasks
MDL-25504 cron: Refactor to use scheduler
MDL-25505: Add an admin interface to schedule tasks via cron.
MDL-25507: Add support for adhoc tasks.
2014-02-26 12:03:46 +08:00
Damyon Wiese
45fdcb7ce3 MDL-43723 Blocks drag and drop: Javascript cleanup
Declare the selector instead of repeating it several times.
2014-02-25 17:01:45 +08:00
Damyon Wiese
58ff6e51df Merge branch 'MDL-43723-master-nomerge2' of git://github.com/mouneyrac/moodle 2014-02-25 16:43:56 +08:00
Dan Poltawski
d4c01301ec Merge branch 'MDL-43882_master' of git://github.com/dmonllao/moodle 2014-02-25 15:33:58 +08:00
Damyon Wiese
5c7a266e65 Merge branch '44255-27' of git://github.com/samhemelryk/moodle
Conflicts:
	user/profile.php
2014-02-25 14:14:31 +08:00
Damyon Wiese
03b8d9e3c3 Merge branch 'wip-mdl-40919' of https://github.com/rajeshtaneja/moodle 2014-02-25 12:44:35 +08:00
Rajesh Taneja
e49b94c936 MDL-18633 admin: Added capability string for user:viewlastip 2014-02-25 12:30:45 +08:00
David Monllao
3b63551301 MDL-43882 lib: Adding info about the new performance metric
The performance metric was introduced in MDL-43758.
2014-02-25 11:30:38 +08:00
Dan Poltawski
a5fc3f08ed Merge branch '44185-27' of git://github.com/samhemelryk/moodle 2014-02-25 11:22:24 +08:00
Damyon Wiese
494afb8180 Merge branch '44315-27' of git://github.com/samhemelryk/moodle 2014-02-25 11:09:53 +08:00
Damyon Wiese
a18c3591c6 MDL-40619 mod_quiz: Remove commented non-js behat scenario 2014-02-25 11:02:03 +08:00
Damyon Wiese
fce9daa806 Merge branch 'wip-MDL-40619-master' of git://github.com/marinaglancy/moodle 2014-02-25 10:53:09 +08:00
Dan Poltawski
3d4cec649a Merge branch 'MDL-40916_master' of https://github.com/markn86/moodle 2014-02-25 10:47:20 +08:00
Damyon Wiese
63e604f8b1 Merge branch 'w08_MDL-42889_m27_vir' of https://github.com/skodak/moodle 2014-02-25 10:32:44 +08:00
Dan Poltawski
e78e671f29 Merge branch 'MDL-43405_master' of https://github.com/markn86/moodle 2014-02-25 10:30:35 +08:00
Damyon Wiese
b33fbd428e Merge branch 'MDL-42923' of git://github.com/jleyva/moodle
Conflicts:
	version.php
2014-02-25 10:26:22 +08:00
Dan Poltawski
305b15f4ab Merge branch 'MDL-43478-master-v4' of git://github.com/jamiepratt/moodle 2014-02-25 09:27:35 +08:00
Damyon Wiese
8442725219 MDL-38903: Version bump for lang strings 2014-02-25 09:25:43 +08:00
Damyon Wiese
ed24890b68 Merge branch 'MDL-38903-master' of git://github.com/phalacee/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-02-25 09:21:30 +08:00
Jason Fowler
88d366e595 MDL-38903 File picker: making upload form with more semantic HTML 2014-02-25 07:51:53 +08:00
Damyon Wiese
237243db02 Merge branch 'MDL-43837_master' of git://github.com/dmonllao/moodle 2014-02-24 16:56:05 +08:00
Andrew Nicols
29ee3cf789 MDL-44101 Javascript: Apply widget-focusonclose to some core dialogues
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
2014-02-24 16:31:55 +08:00