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

63937 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Marina Glancy
65a4f26d8a Revert "Merge branch 'MDL-41912-master' of git://github.com/damyon/moodle" 
This reverts commit 093a6fe77f, reversing
changes made to 88a4cb4734.
 2013-09-26 12:29:03 +10:00
Sam Hemelryk
f8023f3072 Revert "MDL-39871 Blocks,Themes: Swap block regions in RTL mode (using pre-defined array)" 
This reverts commit e89dfdbce6.
 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 eeb08203dc.
 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
Petr Škoda
723a6e5679 MDL-41437 inform developers that version column was removed from module and block tables 2013-09-25 10:52:23 +02:00
Petr Škoda
5f8012d499 MDL-41437 fix some more forgotten module.version's 2013-09-25 10:50:00 +02:00
Petr Škoda
effff2a466 MDL-41437 refactor and cleanup module uninstall support 2013-09-25 10:27:09 +02:00
Petr Škoda
74762da37f MDL-41437 implement new block, enrol and course format pluginfo uninstall methods 2013-09-25 10:12:11 +02:00
Petr Škoda
3e51580be3 MDL-43437 fix course format disabling 2013-09-25 10:03:06 +02:00
Petr Škoda
72df03235e MDL-41437 implement plugininfo_quiz necessary for quiz report uninstall 2013-09-25 09:57:19 +02:00
Petr Škoda
a707a0b461 MDL-41437 fix non-functional message processor uninstall 2013-09-25 09:39:36 +02:00
Dan Marsden
6db676bfa1 MDL-39910 SCORM: hide toggle button when course structure disabled and fix upgrade of old settings 2013-09-25 19:25:37 +12:00
Petr Škoda
5037785247 MDL-41208 fix more invalid @VERSION@ 2013-09-25 09:14:36 +02:00
David Monllao
6427c7d54e MDL-41421 tool_generator: Fixing help text 
- p.e. replaced by e.g. which sounds more English-friendly
- Adding an extra line break as markdown don't like
p and li together
 2013-09-25 15:06:35 +08:00
Petr Škoda
a31e0b40c9 MDL-41437 fix and cleanup filter uninstall 2013-09-25 08:41:33 +02:00
Sam Hemelryk
e50df55c91 Merge branch 'MDL-40848_master' of git://github.com/totara/openbadges 
Conflicts:
	theme/base/style/core.css
	theme/bootstrapbase/less/moodle/core.less
	theme/bootstrapbase/style/moodle.css
 2013-09-25 16:27:09 +12:00
Marina Glancy
093a6fe77f Merge branch 'MDL-41912-master' of git://github.com/damyon/moodle 
Conflicts:
	lib/editor/atto/styles.css
 2013-09-25 12:53:09 +10:00
Marina Glancy
88a4cb4734 Merge branch 'MDL-41778_master' of https://github.com/nitzo/moodle 2013-09-25 12:52:39 +10:00
Marina Glancy
d0b63cbde5 Merge branch 'MDL-41870-master' of git://github.com/damyon/moodle 2013-09-25 12:21:46 +10:00
Marina Glancy
e26e4b8a7b Merge branch 'MDL-41713-master' of git://github.com/phalacee/moodle 
Conflicts:
	lib/editor/atto/styles.css
 2013-09-25 12:21:37 +10:00
Marina Glancy
7375d9eb1f Merge branch 'MDL-41421_master' of git://github.com/dmonllao/moodle 2013-09-25 11:53:48 +10:00