mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
69,439 Commits 36 Branches 519 Tags
Commit Graph

69439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Nelson
617dbe49ed MDL-46188 core_course: use correct hide/show icon 2014-08-20 12:04:35 +08:00
Damyon Wiese
391da2bf82 Merge branch 'MDL-45029-master' of git://github.com/lameze/moodle 2014-08-20 10:21:20 +08:00
uhunkler
6dccf359a0 MDL-46302 correct atto img float right 
Correct the atto image "float right" margin CSS
 2014-08-20 00:59:31 +02:00
Eloy Lafuente (stronk7)
1ca98142cd Merge branch 'MDL-46536_oauthSig' of https://github.com/moodlerooms/moodle 2014-08-19 20:27:52 +02:00
Eloy Lafuente (stronk7)
36be1bf189 Merge branch 'MDL-46051_LTI_event' of https://github.com/moodlerooms/moodle 2014-08-19 15:59:03 +02:00
Michael Wheeler
3f4ac1eb9a Normalize request header names. 2014-08-19 15:39:46 +02:00
Dan Poltawski
ba774b42a2 MDL-46885 mod_forum: diverge version numbers 
Before this patch the version number could dangerously clash with
27_STABLE increments - and miss the upgrade steps for MDL-1626
 2014-08-19 13:04:01 +02:00
Marina Glancy
376a6f687c Merge branch 'wip-mdl-46327' of git://github.com/rajeshtaneja/moodle 2014-08-19 17:28:55 +08:00
Rajesh Taneja
a9950b49c4 MDL-46327 phpunit: drop_table should be used, rather then drop_temp_table 2014-08-19 17:16:55 +08:00
Damyon Wiese
52ed065131 Merge branch 'MDL-46706-master' of https://github.com/sammarshallou/moodle 
Conflicts:
	lib/tests/modinfolib_test.php
 2014-08-19 17:13:05 +08:00
Simey Lameze
82f336aa84 MDL-45029 core_course: set aggregationcoef while creating a new course module 2014-08-19 17:06:49 +08:00
Marina Glancy
6ee21ea1d0 Merge branch 'MDL-18014-master' of git://github.com/damyon/moodle 2014-08-19 16:57:05 +08:00
Marina Glancy
e913caab92 Merge branch 'MDL-46538_master' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-08-19 16:51:46 +08:00
Damyon Wiese
aba9019832 Merge branch 'wip_MDL-46711_m28_memcachesrvs' of https://github.com/skodak/moodle 2014-08-19 16:31:06 +08:00
Marina Glancy
4cb61b6b4e Merge branch 'MDL-46281-master' of git://github.com/lucisgit/moodle 2014-08-19 16:26:35 +08:00
Damyon Wiese
d32bc7d655 MDL-18014 Atto autosave: Atto requires $PAGE->url be set or debugging is triggered 
2 quiz tests are creating forms with text editors manually - they need to ensure a valid
$PAGE->url is set so they don't trigger debugging warnings from $PAGE->url magic method
called by Atto.
 2014-08-19 16:02:14 +08:00
Damyon Wiese
fc9b567f32 Merge branch 'MDL-46772-master' of git://github.com/andrewnicols/moodle 2014-08-19 15:41:32 +08:00
Marina Glancy
816ddceceb Merge branch 'MDL-46829_master' of git://github.com/lazydaisy/moodle 2014-08-19 14:20:51 +08:00
Marina Glancy
7e4475d37c Merge branch 'MDL-46833-master' of git://github.com/lucisgit/moodle 2014-08-19 14:20:41 +08:00
Marina Glancy
c86ae8660c Merge branch 'MDL-46846-master' of git://github.com/damyon/moodle 2014-08-19 14:20:31 +08:00
Damyon Wiese
c97bb5df16 Merge branch 'MDL-41513_Scrollbar_not_working' of https://github.com/MorrisR2/moodle 2014-08-19 14:11:43 +08:00
Marina Glancy
2c0ee558e5 Merge branch 'wip-mdl-46817' of git://github.com/rajeshtaneja/moodle 2014-08-19 14:03:27 +08:00
Marina Glancy
04821cbbe7 Merge branch 'MDL-46469-master' of git://github.com/ankitagarwal/moodle 2014-08-19 14:01:48 +08:00
Damyon Wiese
32d3bfa2de Merge branch 'MDL-46792-master' of https://github.com/lucisgit/moodle 2014-08-19 13:57:50 +08:00
Ankit Agarwal
2eca9a23ae MDL-46469 scorm: Update report plugins to use namespaced classnames 2014-08-19 13:56:13 +08:00
Ankit Agarwal
fd57607fdb MDL-46469 scorm: Support autoloading for report plugins 2014-08-19 13:56:13 +08:00
Marina Glancy
430529bde8 Merge branch 'MDL-18014-master' of git://github.com/damyon/moodle 2014-08-19 13:50:44 +08:00
Marina Glancy
dd924ea9db Merge branch 'MDL-43197-master-2nd' of git://github.com/FMCorz/moodle 2014-08-19 13:25:32 +08:00
Damyon Wiese
9fb3fdd75f Merge branch 'MDL-46188' of https://github.com/shashirepo/moodle 2014-08-19 13:13:08 +08:00
Damyon Wiese
9eea856632 MDL-18014 Atto autosave: Add a timemodified field to the auto save drafts 
Do not restore any draft older than 4 days to (sort of) sync with the draft file
lifetime.
 2014-08-19 12:30:13 +08:00
Damyon Wiese
942501f318 MDL-18014 Atto autosave: When text is recovered, force it into the undo stack 
This allows you to use "Undo" to go back to the unaltered text in the form.
 2014-08-19 12:13:41 +08:00
Michael Wheeler
750688c741 MDL-46794 install: Fixed typo in config-dist.php 2014-08-19 11:27:40 +08:00
Marina Glancy
628b2a5cd3 Merge branch 'MDL-46796-master' of git://github.com/merrill-oakland/moodle 2014-08-19 11:24:41 +08:00
Marina Glancy
b3194ab1b2 Merge branch 'master_MDL-46775' of git://github.com/totara/moodle 2014-08-19 11:21:22 +08:00
Marina Glancy
3377a87d69 Merge branch 'wip-mdl-46327' of git://github.com/rajeshtaneja/moodle 2014-08-19 10:48:11 +08:00
Marina Glancy
efc815848d Merge branch 'wip-MDL-46791-master' of git://github.com/satrun77/moodle 2014-08-19 10:47:55 +08:00
Frederic Massart
abbee05eb3 MDL-43197 gradereport_user: Parents/mentors can see all the relevant grades 2014-08-19 10:47:34 +08:00
Rajesh Taneja
c1dc3f4793 MDL-46327 phpunit: Fixed oracle fail 2014-08-19 10:11:20 +08:00
Eloy Lafuente (stronk7)
14c38c2573 Merge branch 'wip-MDL-46691-master' of git://github.com/marinaglancy/moodle 2014-08-19 02:58:17 +02:00
James Henestofel
acf2508614 MDL-42231 auth: custom profile fields to support numbers at the end. 
For data mapping LDAP or CAS.  Change order of fieldname display checks to verify
custom profile fields first to allow custom field shortname to contain number at the end.
 2014-08-19 02:41:41 +02:00
Eloy Lafuente (stronk7)
d2e5f21625 Merge branch 'MDL-44894' of git://github.com/timhunt/moodle 2014-08-19 02:34:12 +02:00
Eloy Lafuente (stronk7)
652d886ae5 Merge branch 'wip_MDL-46552_m28_memcached' of https://github.com/skodak/moodle 2014-08-19 02:28:56 +02:00
Eloy Lafuente (stronk7)
6ea7fde09c Merge branch 'MDL-45874' of https://github.com/danielneis/moodle 2014-08-18 23:58:27 +02:00
Eloy Lafuente (stronk7)
a00678e54b Merge branch 'wip-MDL-46826-master' of git://github.com/marinaglancy/moodle 2014-08-18 20:06:16 +02:00
Eloy Lafuente (stronk7)
6ba12477ec Merge branch 'wip-MDL-46589-master' of git://github.com/marinaglancy/moodle 2014-08-18 19:47:50 +02:00
Eloy Lafuente (stronk7)
64140f93ec Merge branch 'wip-MDL-46545-master' of git://github.com/marinaglancy/moodle 2014-08-18 19:40:13 +02:00
Eric Merrill
97531d3929 MDL-46766 auth_cas: Upgrading to phpCAS 1.3.3 2014-08-18 16:39:38 +08:00
Damyon Wiese
d9ff93e36e Merge branch 'master_MDL-46669' of https://github.com/danmarsden/moodle 2014-08-18 16:21:54 +08:00
Ray Morris
f893cb44e0 MDL-46669 mod_scorm: Extraneous quotes added to scorm API values 2014-08-18 16:20:42 +08:00
Damyon Wiese
c84f1c6093 MDL-45887 mod_scorm: Note the coding style fixup issue in upgrade.txt 2014-08-18 15:11:59 +08:00