moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
62581 commits 37 branches 540 tags 1.3 GiB
Commit graph

62581 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tim Hunt
68d2f6a008 MDL-35053 questions: question files outside an attempt. 
Now update all the places that display files outside attempts to use the
new API.
 2013-07-26 13:10:11 +01:00
Tim Hunt
181393aad2 MDL-35053 questions: question files outside an attempt. 
Sometimes it is necssary to display parts of a question outside of an
attempt. For example for staff review. When displaying the question, we
need to handle images in the question text. In the past there was a
mechanism for this that could only cope with the question text.

This commit introduces a new method that can handle displaying any
part of the question content.

This commit intentionally does not upgrade the parts of the system that
use the mecanism. That is so that this commit can be used to demonstrate
that backwards-compatibility works. The next commit will upgrade the
callers.
 2013-07-26 13:10:08 +01:00
Damyon Wiese
bdd045c5ec weekly release 2.6dev 2013-07-26 11:24:11 +08:00
Petr Škoda
d11b8d0c63 MDL-40808 remove unused DML strings 2013-07-25 12:02:29 +02:00
Dan Poltawski
f68c3b0aac Revert "MDL-39770 mod_chat: some tweaks to make it prettier to reduce screen wastage" 
This reverts commit 9035e3d24b.
 2013-07-25 16:40:45 +08:00
Dan Poltawski
860f4788ab Revert "MDL-39770 mod_chat: cleanup of the Bubble chat theme" 
This reverts commit 5f06bf8554.
 2013-07-25 16:40:40 +08:00
Jason Fowler
343dc4ae25 MDL-39748 - Grading - Fixing the increasing height regression 
Conflicts:

	theme/bootstrapbase/style/moodle.css
 2013-07-24 15:27:54 +08:00
Sam Hemelryk
feb34ff4e8 Merge branch 'w30_MDL-23493_m26_fonts' of https://github.com/skodak/moodle 2013-07-24 19:19:47 +12:00
Petr Škoda
964485a3a0 MDL-23493 fix borked regex matching for non-standard font extensions 2013-07-24 08:58:23 +02:00
Petr Škoda
17601a7e12 MDL-39985 add explicit MariaDB support 2013-07-24 10:45:20 +08:00
Frederic Massart
a60bc9a35b MDL-32746 libraries: Upgrade redirect for major version 
Due to the newly introduced event user_loggedin, the upgrade
could not be reached as the event class was not found during login.
To remedy this, we need to force the upgrade before login.
 2013-07-24 09:30:15 +08:00
Marina Glancy
c59a65b273 MDL-40766 Smarter positioning of tinymce button 2013-07-24 10:58:32 +10:00
Sam Hemelryk
904c38b31d Merge branch 'wip-MDL-37869-master' of git://github.com/phalacee/moodle 2013-07-24 11:28:26 +12:00
Sam Hemelryk
d853f819dc Merge branch 'MDL-40315_master' of git://github.com/dmonllao/moodle 2013-07-24 11:14:14 +12:00
Eloy Lafuente (stronk7)
154bc6b240 Merge branch 'w30_MDL-40642_m26_umask' of https://github.com/skodak/moodle 2013-07-23 23:42:11 +02:00
Eloy Lafuente (stronk7)
8f9b2980b7 Merge branch 'MDL-39704_master' of https://github.com/nadavkav/moodle 2013-07-23 23:21:38 +02:00
Eloy Lafuente (stronk7)
e5ae5c1247 MDL-40801 Update versions in thirdpartylibs.xml 2013-07-23 23:11:24 +02:00
Eloy Lafuente (stronk7)
7613bc7c3a Merge branch 'w30_MDL-40801_m26_jquery' of https://github.com/skodak/moodle 2013-07-23 23:06:35 +02:00
Eloy Lafuente (stronk7)
8c573a9536 Merge branch 'w30_MDL-40627_m26_extramemorylimit' of https://github.com/skodak/moodle 2013-07-23 23:04:13 +02:00
Eloy Lafuente (stronk7)
ae2605ec8d Merge branch 'wip-MDL-40540-m26' of git://github.com/samhemelryk/moodle 2013-07-23 22:56:34 +02:00
Eloy Lafuente (stronk7)
01994ecee9 Merge branch 'MDL-40544_master' of https://github.com/nadavkav/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-07-23 22:39:13 +02:00
Eloy Lafuente (stronk7)
6aa9735cb0 Merge branch 'MDL-40589_master' of https://github.com/nadavkav/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-07-23 22:34:16 +02:00
Eloy Lafuente (stronk7)
6abf3556fd Merge branch 'MDL-40189_master' of https://github.com/nadavkav/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-07-23 22:28:54 +02:00
Eloy Lafuente (stronk7)
172dda0090 Merge branch 'MDL-40071_master' of https://github.com/nadavkav/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-07-23 22:10:08 +02:00
Eloy Lafuente (stronk7)
18c4d7e68c Merge branch 'w30_MDL-40723_m26_creators' of https://github.com/skodak/moodle 2013-07-23 20:32:40 +02:00
Eloy Lafuente (stronk7)
cbc4aa8cfe Merge branch 'w30_MDL-40796_m26_citycountry' of https://github.com/skodak/moodle 2013-07-23 20:29:43 +02:00
Eloy Lafuente (stronk7)
070a1bf23f Merge branch 'w30_MDL-40809_m26_olduserimages' of https://github.com/skodak/moodle 2013-07-23 18:58:03 +02:00
Eloy Lafuente (stronk7)
288ba37a56 Merge branch 'w30_MDL-40679_m26_zlib' of https://github.com/skodak/moodle 2013-07-23 18:20:50 +02:00
Eloy Lafuente (stronk7)
79143f1e59 Merge branch 'MDL-40816_master' of git://github.com/markn86/moodle 2013-07-23 18:18:52 +02:00
Eloy Lafuente (stronk7)
30a209ba17 Merge branch 'MDL-40785' of git://github.com/timhunt/moodle 2013-07-23 17:50:38 +02:00
Eloy Lafuente (stronk7)
97c51dfb22 Merge branch 'MDL-40672_master' of git://github.com/dmonllao/moodle 2013-07-23 17:45:22 +02:00
Eloy Lafuente (stronk7)
2c72cc23b2 Merge branch 'MDL-40595_master' of git://github.com/dmonllao/moodle 2013-07-23 17:17:13 +02:00
Eloy Lafuente (stronk7)
e71c47bf8c MDL-40700 tests: skip if there is not instance 
Various reasons can lead to the cache stores not being available
(missing extension, configuration...). Under those situations
the test must be skipped because for sure it will break if
we continue.
 2013-07-23 17:00:02 +02:00
Petr Škoda
c6f5e84f9d MDL-40723 fix docs typo 2013-07-23 15:59:02 +02:00
Petr Škoda
54d5308ef0 MDL-40723 use guess_if_creator_will_have_course_capability() for the new weird function 2013-07-23 15:55:07 +02:00
Eloy Lafuente (stronk7)
9e1e94aafa Merge branch 'wip-MDL-40700-m26' of git://github.com/samhemelryk/moodle 2013-07-23 13:58:20 +02:00
Eloy Lafuente (stronk7)
aa837b2fe6 Merge branch 'wip-MDL-40762-m26' of git://github.com/samhemelryk/moodle 2013-07-23 13:50:06 +02:00
Eloy Lafuente (stronk7)
8c2ed57043 Merge branch 'wip-MDL-40763-m26' of git://github.com/samhemelryk/moodle 2013-07-23 13:19:41 +02:00
Eloy Lafuente (stronk7)
d4731fd002 Merge branch 'wip-MDL-40677-m26' of git://github.com/samhemelryk/moodle 2013-07-23 12:52:50 +02:00
Eloy Lafuente (stronk7)
3b117e79ce Merge branch 'MDL-40082_master' of https://github.com/nadavkav/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-07-23 12:16:11 +02:00
Dan Poltawski
d96fcecc86 Merge branch 'MDL-20609' of git://github.com/timhunt/moodle 2013-07-23 16:44:32 +08:00
Dan Poltawski
80a1b08d40 Merge branch 'MDL-40480' of git://github.com/timhunt/moodle 2013-07-23 16:41:45 +08:00
Damyon Wiese
0b92270b19 Merge branch 'MDL-38863_master' of git://github.com/dmonllao/moodle 2013-07-23 16:04:50 +08:00
Jamie Pratt
e39a2faa58 MDL-40729 check marks and grades from quiz attempts 
compare to marks in csv file.
 2013-07-23 16:04:13 +08:00
Frederic Massart
d735f3d8f3 MDL-32746 phpunit: Adding auth/tests to PHPUnit core suites 2013-07-23 16:01:45 +08:00
Jamie Pratt
da6bb0c506 MDL-40076 Build entire quiz attempts by supplying attempt 
data for each question in the quiz, pulling responses
from a csv file.
 2013-07-23 15:59:53 +08:00
Damyon Wiese
0070cb8bca Merge branch 'MDL-40295' of git://github.com/rwijaya/moodle 2013-07-23 15:51:59 +08:00
David Monllao
a090296740 MDL-40672 behat: New activities data generator 2013-07-23 09:47:36 +02:00
David Monllao
72ddc05f67 MDL-38863 behat: Role assign generator 2013-07-23 09:46:39 +02:00
Jamie Pratt
a3c5150b2a MDL-40714 pass through simulated data to sub questions 
in multi-answer question type
 2013-07-23 15:29:28 +08:00