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

62617 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Russell Smith
3e7e2ab2ee MDL-40618 backup: centralize info field, use info in queries. 
encode_backup_temp_info() and decode_backup_temp_info() have been
introduced to keep the info field encoding in one place.
Many locations used get_backup_ids_record() to obtain info, that
makes lots of calls to get_backup_ids_record() which can be slow.
We now complete all those inline by adding the info field to the query.
To reduce memory usage, all queries of that nature have been changed
to use get_recordset_*. gzcompress was introduced if available to minimize
traffic to/from the database and to decrease the memory required for caching.
The compression time is saved by the benefits in other places of having smaller data.
 2013-07-23 19:50:53 +10: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
Jamie Pratt
c2b051c7aa MDL-40542 need to be able to select variant 
in unit tests
 2013-07-23 15:11:56 +08:00
Jamie Pratt
c2f2e7f008 MDL-40541 need to be able to select random q 
in unit tests
 2013-07-23 15:08:32 +08:00
Jamie Pratt
388f047345 MDL-40543 convert from simulated responses 
to post data
 2013-07-23 15:00:02 +08:00
Damyon Wiese
6064e5cc00 Merge branch 'MDL-32746-master' of git://github.com/FMCorz/moodle 2013-07-23 14:49:42 +08:00
Dan Poltawski
5432ccec64 Merge branch 'wip_MDL-40778_v2' of https://github.com/jamiepratt/moodle 2013-07-23 14:26:35 +08:00
Damyon Wiese
7ea41b4a94 Merge branch 'wip-MDL-39748-master' of git://github.com/phalacee/moodle 2013-07-23 14:16:31 +08:00
Damyon Wiese
683bd5b15e MDL-28019 tinymce managefiles: change tabs to spaces 2013-07-23 14:14:08 +08:00
Marina Glancy
9e88661e58 MDL-28019 Added plugin tinymce_managefiles 2013-07-23 14:12:55 +08:00
Marina Glancy
1d94557373 MDL-28019 Added plugin repository_areafiles 2013-07-23 14:12:45 +08:00
Dan Poltawski
a0035108b0 MDL-40585 fix trailing whitespace 2013-07-23 13:33:49 +08:00
Dan Poltawski
33b6da7f59 Merge branch 'MDL-40585_grouped_parent_exists' of git://github.com/mr-russ/moodle 2013-07-23 13:33:27 +08:00
Dan Poltawski
151d915c54 Merge branch 'MDL-40719' of git://github.com/timhunt/moodle 2013-07-23 13:27:32 +08:00
Dan Poltawski
3ee8607d46 Merge branch 'MDL-40584' of https://github.com/mr-russ/moodle 2013-07-23 12:35:41 +08:00
Jason Fowler
7e222836f0 MDL-39748 - Grading Methods - Fixing input field widths for Rubrics 2013-07-23 12:06:38 +08:00
Frederic Massart
3b086e3094 MDL-32746 core: Implement new user_loggedin event 2013-07-23 11:36:35 +08:00
Dan Poltawski
35c1179047 Merge branch 'MDL-40793_profile_compare' of https://github.com/mr-russ/moodle 2013-07-23 10:42:02 +08:00