moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 10:56:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67193 commits 37 branches 544 tags 1.3 GiB
Commit graph

67193 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Poltawski
c82fa0c8ad Revert "MDL-46226 fix unit tests" 
This reverts commit 42f05b95c6.
 2014-07-16 13:45:45 +01:00
Rajesh Taneja
bab46e77d7 MDL-30431 behat: Fixed wiki behat 2014-07-16 09:19:05 +02:00
Eloy Lafuente (stronk7)
6aff5581f6 MDL-30431 mod_wiki: whitespace fix 2014-07-16 01:19:13 +02:00
Eloy Lafuente (stronk7)
5cefb82acb Merge branch 'MDL-30431_wiki_comments_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE 2014-07-16 01:16:33 +02:00
Rajesh Taneja
9a24fe056e Backport event trigger from MDL-45641 
While backporting MDL-45641, event trigger was missed
on editadavnced page.
 2014-07-15 11:46:17 +08:00
Eloy Lafuente (stronk7)
e60ca92e1d Merge branch 'MDL-46080_26' of https://github.com/jonof/moodle into MOODLE_26_STABLE 2014-07-14 23:30:34 +02:00
Sam Hemelryk
522cbb467c Merge branch 'MDL-42179-003-26' of https://github.com/dbezborodovrp/moodle into MOODLE_26_STABLE 2014-07-15 08:41:46 +12:00
Eloy Lafuente (stronk7)
d7a9bd9da7 Merge branch 'm26_MDL-31366' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE 2014-07-14 18:17:59 +02:00
Dan Poltawski
1aefe49544 Merge branch 'MDL-42752-26' of git://github.com/phalacee/moodle into MOODLE_26_STABLE 2014-07-14 16:09:28 +01:00
Dan Poltawski
42f05b95c6 MDL-46226 fix unit tests 2014-07-14 15:47:25 +01:00
Dan Poltawski
90e35c8929 Merge branch 'MDL-46218_disabled2_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE 2014-07-14 15:33:24 +01:00
Eloy Lafuente (stronk7)
674ce27e1b Merge branch 'm26_MDL-46197' of https://github.com/totara/moodle into MOODLE_26_STABLE 2014-07-14 16:25:18 +02:00
Dan Poltawski
8bbc71406d Merge branch 'm26_MDL-46226' of https://github.com/totara/moodle into MOODLE_26_STABLE 2014-07-14 15:15:07 +01:00
David Monllao
e946e06322 MDL-43390 files: Only lock when locking is not prevented 2014-07-14 13:04:59 +08:00
Damien Bezborodov
c50968f185 MDL-42179 mod_assign: Time remaining issue for group assignment 2014-07-14 13:53:29 +09:30
Sam Hemelryk
85cd13b837 Merge branch 'MDL-42214_popup_blocked_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE 2014-07-14 15:28:01 +12:00
Sam Hemelryk
ff12f87c62 Merge branch 'MDL-46073_26' of https://github.com/totara/openbadges into MOODLE_26_STABLE 2014-07-14 15:16:11 +12:00
Andrew Davis
0257a401f7 MDL-42214 core_message:prevented popup notifications of messages from blocked users 2014-07-14 10:22:30 +08:00
Andrew Davis
9d9aef2fb0 MDL-30431 mod_wiki: clarified the logic around editing and deleting wiki comments and added behat tests 2014-07-14 08:16:47 +08:00
Sam Hemelryk
4a8103d97b Merge branch 'MDL-45765-moodle26' of https://github.com/StudiUM/moodle into MOODLE_26_STABLE 2014-07-14 12:10:03 +12:00
Sam Hemelryk
571516003b Merge branch 'wip-MDL-46280-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-07-14 10:32:53 +12:00
Gilles-Philippe Leblanc
82d84457a0 MDL-22469 auth_cas: CAS module : parameter authCAS=NOCAS not properly handled 2014-07-14 10:22:01 +12:00
Sam Hemelryk
cfaf9dc5a7 Merge branch 'MDL-31089_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE 2014-07-14 09:51:27 +12:00
Sam Hemelryk
23dab427de Merge branch 'MDL-45562-26' of git://github.com/lameze/moodle into MOODLE_26_STABLE 2014-07-14 08:41:53 +12:00
Eloy Lafuente (stronk7)
d25049c0fc Moodle release 2.6.4 2014-07-12 19:10:37 +02:00
David Monllao
00e1213a81 MDL-31089 mod_forum: Filtering non-visible groups 2014-07-11 16:50:38 +08:00
Simey Lameze
021ee71b69 MDL-45562 blog: fixed issues when creating/editing an external blog. 2014-07-11 15:22:28 +08:00
Dan Marsden
64ced100cc MDL-31366 Feedback: decode htmlchars on output to excel 2014-07-11 13:29:43 +12:00
Brian Barnes
4c2f38ace1 MDL-46197 core_calendar: Added label text to duration in minutes field 2014-07-11 09:01:03 +12:00
Brian Barnes
b440662be2 MDL-46226 core: pix_icon no longer sets title to the alt text 2014-07-11 08:37:54 +12:00
Jean-Philippe Gaudreau
2d8c7cccd9 MDL-45765 Calendar import: Fix undefined variable in cron when updating calendar subscriptions 2014-07-10 16:08:32 -04:00
Eloy Lafuente (stronk7)
6d00d81b84 weekly release 2.6.3+ 2014-07-10 19:15:32 +02:00
Eloy Lafuente (stronk7)
61fdbd038e Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE 2014-07-10 19:15:27 +02:00
Ankit Agarwal
72d8a0a12e MDL-46148 qtype_calculated: low-level defence against bad formulas 
This catches things like:
 * Malicious equations coming from backup files.
 * Malicious equations in old questions in the database.
 2014-07-10 17:54:52 +08:00
Andrew Nicols
5c74e0daca MDL-38990 mod_forum: Restrict ability to post to all groups in a forum 
In order to post to all groups in a forum, you must have the
moodle/site:accessallgroups capability.

Thanks to Jakob Ackermann <jackermann@onlineschool.ca> for part of the fix
on this one.
 2014-07-10 11:53:06 +08:00
Damyon Wiese
4a46fd643f MDL-46148 questions: Added missing allow_commit for transaction 2014-07-10 11:37:24 +08:00
Andrew Davis
60770bb0a7 MDL-46218 reshuffled access checks in blog and notes 2014-07-10 11:25:23 +08:00
Damyon Wiese
62a1434588 Merge branch 'MDL-19270_moodle26stable' of https://github.com/nadavkav/moodle into MOODLE_26_STABLE 
Conflicts:
	lib/graphlib.php
 2014-07-10 10:00:03 +08:00
Tim Hunt
20af9d3c0f MDL-46148 qtype_calculatedsimple: fix notice 
... when adding a dataset with a formula error.
 2014-07-09 14:11:43 +01:00
Tim Hunt
7bf7ef3919 MDL-46148 qtype_calculated: fix validation when importing. 
In order to do this in a sane way, I cleaned up a lot of old mess,
inclduing:

1. Previously, qtype_calcuated used ->answeres when importing, and
->answer when saving the form. This was crazy, so I fixed it, and
stripped out the code that made the alternative variable name work.

2. Similarly, it could handle ->answer being either an array, such as
you would get form the HTML editor, or a simple string, which is what
you get form the form. I simplified that too.

3. Finally, I made import use a transaction around saving each
question, so we don't get half questions in the database when an error
occurs.
 2014-07-09 14:11:42 +01:00
Tim Hunt
f8a6c3d6f0 MDL-46148 qtype_calculated: removed unused method. 2014-07-09 14:11:42 +01:00
Nadav Kavalerchik
6499a17d78 MDL-19270 - Quiz graph - Fix reverse display of Hebrew legend text in RTL mode 2014-07-09 16:09:10 +03:00
David Mudrák
8ecc049f7f MDL-46223 Fix frequently used comments in the marking guide 
When the frequently used comment contains a character like >, re-use it
directly instead of its HTML entitiy.
 2014-07-09 16:44:28 +08:00
David Mudrák
68299e6154 MDL-46223 Improve the display of marking guide validation message 2014-07-09 16:44:25 +08:00
Dan Poltawski
48bdbf5a4a MDL-44605 calendar: improved returnurl validation 
Now we will only redirect to a local url (though sesskey was
already preventing this redirect from being open)
 2014-07-09 01:06:46 +02:00
Dan Poltawski
648bf857d3 Merge branch 'MDL-44492_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE 2014-07-08 14:17:58 +01:00
Frederic Massart
166e18d7cb MDL-45471 javascript: Escape content of exception dialogs 
Conflicts:

	lib/yui/build/moodle-core-notification-ajaxexception/moodle-core-notification-ajaxexception-min.js
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-debug.js
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue.js
	lib/yui/build/moodle-core-notification-exception/moodle-core-notification-exception-min.js
 2014-07-08 14:13:29 +01:00
Tim Hunt
2c78623121 MDL-44492 quiz: fix hilighting of graded attempt 
In various places, when showing several attempts, we try to hilight the
most significant one (the one that gave the final grade if the quiz is
set to first/last/best attempt). That was not working because the table
zebra stripes were a more specific rule.

Also, the colour was inconsistent, not nice, and not very bootstrapy, so
I changed it.
 2014-07-08 14:03:46 +01:00
Tim Hunt
89b8ba6dba MDL-44492 quiz reports: revert some style overrides. 
But add one more. This makes Clean theme look a lot better.
 2014-07-08 14:03:45 +01:00
Tim Hunt
5c8ef12940 MDL-44492 Rough unit test for the report SQL. 
We really ought to test more cases, but this hits one of the most tricky cases.
 2014-07-08 14:03:43 +01:00