mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-29 19:50:14 +01:00
Code Issues Projects Releases Wiki Activity
63,959 Commits 36 Branches 519 Tags
Commit Graph

63959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Hemelryk
c392392725 Merge branch 'MDL-37973' of https://github.com/merrill-oakland/moodle 2013-10-01 09:54:26 +13:00
Eloy Lafuente (stronk7)
94211c02c3 Merge branch 'MDL-40050-master' of git://github.com/FMCorz/moodle 2013-09-30 21:55:41 +02:00
Eloy Lafuente (stronk7)
833d1eb0e2 Merge branch 'MDL-26408-master' of git://github.com/danpoltawski/moodle 2013-09-30 16:01:38 +02:00
Marina Glancy
9e11059326 Merge branch 'MDL-12403-master' of git://github.com/danpoltawski/moodle 2013-09-30 18:04:38 +10:00
Marina Glancy
e6ec2366a8 Merge branch 'MDL-41885-master' of git://github.com/danpoltawski/moodle 
Conflicts:
	mod/upgrade.txt
 2013-09-30 17:57:30 +10:00
Mark Nielsen
50ae8814e4 MDL-40248 mod: Allow xxx_get_types() to use default display 
* Added new constant: MOD_SUBTYPE_NO_CHILDREN
* When MOD_SUBTYPE_NO_CHILDREN is returned from xxx_get_types()
  then default display is used for activity chooser.
* Updated mod/upgrade.txt
* Removed dead code from navigationlib.php instead of updating
  it for new behavior of xxx_get_types
* Updated lib/upgrade.txt
 2013-09-30 16:49:37 +10:00
Marina Glancy
f13511451c Merge branch 'MDL-41954-workshop-zero-variance' of git://github.com/mudrd8mz/moodle 2013-09-30 16:09:40 +10:00
Sam Hemelryk
d55c29562b Merge branch 'MDL-16464' of git://github.com/timhunt/moodle 2013-09-30 16:34:51 +13:00
Sam Hemelryk
73cc3bdeb0 Merge branch 'MDL-41227_dd' of https://github.com/andyjdavis/moodle 
Conflicts:
	course/yui/toolboxes/toolboxes.js
 2013-09-30 16:15:53 +13:00
Sam Hemelryk
5e8331c814 NOBUG fixed up whitespace 2013-09-30 15:51:08 +13:00
Sam Hemelryk
4754755625 Merge branch 'wip-MDL-33416-master' of git://github.com/marinaglancy/moodle 2013-09-30 15:42:03 +13:00
Sam Hemelryk
00a2879412 Merge branch 'master_MDL-41848' of git://github.com/danmarsden/moodle 2013-09-30 12:09:50 +13:00
Sam Hemelryk
28a2ecc6c4 Merge branch 'w40_MDL-41176_m26_useredit' of https://github.com/skodak/moodle 2013-09-30 11:55:19 +13:00
Sam Hemelryk
f88787b604 NOBUG: rebuilt bootstrap CSS 2013-09-30 11:10:21 +13:00
Sam Hemelryk
e2c4c4202d Merge branch 'MDL-33569_M26' of git://github.com/lazydaisy/moodle 2013-09-30 10:48:36 +13:00
Sam Hemelryk
2f0a996b10 Merge branch 'MDL-41888-master' of git://github.com/jamiepratt/moodle 2013-09-30 10:38:11 +13:00
Mary Evans
c528917d3f MDL-33569 theme_bootsrapbase: adding re-compiled style/moodle.css 2013-09-28 16:26:01 +01:00
Mary Evans
336c57575b MDL-33569 themes: Labels create extra margin below content. 2013-09-28 15:07:22 +01:00
Tim Hunt
0aa04a7faf MDL-16464 remove multichoice answers field. 
This field is not used, but sometimes causes errors when we try to
instert a value that is too long to fit. Therefore remove it.

At the same time, rename tables and columns to match the coding
guidelines.
 2013-09-27 10:57:58 +01:00
Marina Glancy
6b0b05b32f MDL-41942 course: Allow course listings to work with caches disabled 2013-09-27 18:34:20 +10:00
Petr Škoda
cf361a9501 MDL-41176 do not set description and pw fields in $USER when editing own profile 2013-09-27 10:33:48 +02:00
Petr Škoda
e113214618 MDL-41176 make sure fresh full user record is used when mailing email confirmation 2013-09-27 10:33:48 +02:00
Petr Škoda
6c3ad77ea5 MDL-41176 fix obvious bugs and typos in new user API 2013-09-27 10:33:48 +02:00
Jamie Pratt
522bef8030 MDL-41888 More comments 2013-09-27 14:08:16 +07:00
Jamie Pratt
933ac7497a MDL-41888 allow for a blank string as format to mean not to show stat 
as in MDL-41929 which applies to older stable branches.
 2013-09-27 14:08:16 +07:00
Jamie Pratt
7de1e35b75 MDL-41888 separate out quiz statistics calculations from report code 
also code clean up.
 2013-09-27 14:08:15 +07:00
Marina Glancy
e2a61ee3db MDL-33416 files: Remove unused reference fields in files table 
Fields files.referencelastsync and files.referencelifetime just waste the space and actually duplicate the fields
files_reference.lifetime and files_reference.lastsync
 2013-09-27 16:50:08 +10:00
Marina Glancy
d45e65ccad weekly release 2.6dev 2013-09-27 14:23:44 +10:00
Marina Glancy
4de0c793b4 fix permissions 2013-09-27 14:21:20 +10:00
Marina Glancy
212757a250 ie9 svg compatibility fixes 2013-09-27 14:17:23 +10:00
Mary Evans
a7611a7ccc MDL-35217 afterburner: applying orientations 2013-09-27 01:43:44 +02:00
Sam Hemelryk
322d9c8cda Merge branch 'master_MDL-39910' of https://github.com/danmarsden/moodle 
Conflicts:
	mod/scorm/db/upgrade.php
 2013-09-27 11:32:05 +12:00
Dan Marsden
8d29a8c3bc MDL-39910 SCORM: set correct site level defaults. 2013-09-27 10:49:54 +12:00
Dan Marsden
18784adb12 MDL-39910 SCORM: set correct site level defaults. 2013-09-26 11:36:44 +02:00
Dan Poltawski
ba4612ebdc MDL-26408 enrol_imsenterprise: fix invalid component 2013-09-26 12:22:31 +08:00
Marina Glancy
65a4f26d8a Revert "Merge branch 'MDL-41912-master' of git://github.com/damyon/moodle" 
This reverts commit 093a6fe77fc39b06c804fbe4bfcac9834a52c966, reversing
changes made to 88a4cb473439f5a2875260368b92fac1bb808c12.
 2013-09-26 12:29:03 +10:00
Dan Poltawski
2d2489e59e MDL-12403 backup: prevent unset config from being applied 2013-09-26 09:55:13 +08:00
Dan Poltawski
99d5203824 MDL-12403 backup: ability configure default for question bank excludes 2013-09-26 09:55:13 +08:00
Dan Poltawski
6507aaeaff MDL-12403 backup: configure question bank in automated backups 2013-09-26 09:55:12 +08:00
Dan Poltawski
f68fc38867 MDL-12403 backup: Ability to exclude question bank 
Now users can choose to exclude the question bank from the backup,
this will in turn prevent any modules which use the question bank
from being included in the backup.
 2013-09-26 09:55:12 +08:00
Dan Poltawski
b07ef13be2 MDL-41885 modules now declare use of question bank 
* FEATURE_USES_QUESTION_BANK is now a module_supports flag which declares
  that an activity uses the question engine.

* question_module_uses_questions can be used to determine if a module
  uses the question bank.
 2013-09-26 09:49:34 +08:00
Sam Hemelryk
f8023f3072 Revert "MDL-39871 Blocks,Themes: Swap block regions in RTL mode (using pre-defined array)" 
This reverts commit e89dfdbce62ad5be906cb2d822fa0f746cf6afd6.
 2013-09-26 11:56:00 +12:00
Sam Hemelryk
bc29e8f07a Merge branch 'master_MDL-39910' of https://github.com/mayankgupta/moodle 2013-09-26 10:13:01 +12:00
Eloy Lafuente (stronk7)
6da8594018 Merge branch 'MDL-40811-master-behat' of https://github.com/andrewnicols/moodle 2013-09-25 23:48:42 +02:00
Sam Hemelryk
e2ad11d87e Revert "MDL-39871 output: improved block manipulation inheritance" 
This reverts commit eeb08203dce0131d3988a3707fbbf8563cd4bd30.
 2013-09-26 09:12:44 +12:00
Andrew Nicols
e818be1046 MDL-40811 JavaScript: Cast activityid to string when checking resources to show/hide 2013-09-25 18:14:06 +01:00
Mayank Gupta
1680c75c88 MDL-39910 mod_scorm: fix enable/disable navigation buttons 2013-09-26 00:10:10 +12:00
Eloy Lafuente (stronk7)
c72cad1f85 Merge branch 'int_uninstall' of https://github.com/skodak/moodle 2013-09-25 13:36:40 +02:00
Mayank Gupta
bb22cd80b7 MDL-39910 mod_scorm: fix enable/disable navigation buttons 2013-09-25 16:41:33 +05:30
Eloy Lafuente (stronk7)
a07a9c74de Merge branch 'w39_MDL-41208_m26_yui312' of https://github.com/skodak/moodle 2013-09-25 11:41:45 +02:00