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
61,603 Commits 36 Branches 519 Tags
Commit Graph

61603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Hemelryk
5d37fd271d Merge branch 'wip-mdl-28558' of git://github.com/rajeshtaneja/moodle 2013-06-11 11:06:17 +12:00
Sam Hemelryk
9052fc4489 Merge branch 'wip-mdl-33379' of git://github.com/rajeshtaneja/moodle 
Conflicts:
	lib/deprecatedlib.php
 2013-06-11 10:35:10 +12:00
Sam Hemelryk
2afd7d0277 Merge branch 'MDL-32898-master' of git://github.com/ankitagarwal/moodle 2013-06-11 10:31:55 +12:00
Sam Hemelryk
bd7004d51c Merge branch 'wip-mdl-34508' of git://github.com/rajeshtaneja/moodle 2013-06-11 10:29:11 +12:00
Dan Poltawski
50b5ae4a8d Merge branch 'MDL-39947' of https://github.com/aolley/moodle 2013-06-10 16:19:56 +08:00
Dan Poltawski
c6898e629b Merge branch 'MDL-39338_master' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-10 16:06:22 +08:00
Dan Poltawski
0a006517e5 Merge branch 'm26_MDL-39832_Fix_Chrome_Issues_ETag_XSendfile' of https://github.com/scara/moodle 2013-06-10 15:42:45 +08:00
Dan Poltawski
f4c824c009 Merge branch 'wip-mdl-39639' of git://github.com/rajeshtaneja/moodle 2013-06-10 15:28:17 +08:00
Dan Poltawski
de235efba4 Merge branch 'MDL-40018_master' of git://github.com/lazydaisy/moodle 2013-06-10 15:00:08 +08:00
Dan Poltawski
bb179ab9b4 Merge branch 'MDL-40013_master' of git://github.com/oasychev/moodle 2013-06-10 14:57:48 +08:00
Dan Poltawski
7091390164 Merge branch 'MDL-40080-unused-hub-strings' of git://github.com/mudrd8mz/moodle 2013-06-10 14:41:20 +08:00
Dan Poltawski
8a78b9116a Merge branch 'MDL-40008_master' of https://github.com/markn86/moodle 2013-06-10 14:25:03 +08:00
Dan Poltawski
28fa1533f7 Merge branch 'w24_MDL-39096_m26_obfuscate' of git://github.com/skodak/moodle 2013-06-10 13:12:11 +08:00
Dan Poltawski
664a1e2793 Merge branch 'w24_MDL-28394_m26_enrolrestore' of git://github.com/skodak/moodle 2013-06-10 12:16:37 +08:00
Dan Poltawski
bed1bc3ddc Merge branch 'master_MDL-37968' of git://github.com/danmarsden/moodle 2013-06-10 12:09:47 +08:00
Mary Evans
034710e8ee MDL-39016 theme_bootstrapbase: Added login info and home link to footer in both boostrapbase & clean layout/general.php 2013-06-10 16:05:25 +12:00
Dan Poltawski
3178aacd9e Merge branch 'w24_MDL-37974_m26_manexpire' of git://github.com/skodak/moodle 2013-06-10 11:59:03 +08:00
Sam Hemelryk
8affd1ca7e Merge branch 'MDL-40009_master' of https://github.com/markn86/moodle 2013-06-10 15:55:14 +12:00
Sam Hemelryk
b8904b6ad5 Merge branch 'w24_MDL-39549_m26_cohortsearch' of git://github.com/skodak/moodle 2013-06-10 15:49:04 +12:00
ppichet
feec4f8941 MDL-26511 Images in Cloze multichoice 
vertical and horizontal answer and in feedback of all qtype answers
 2013-06-10 11:28:46 +08:00
Sam Hemelryk
56ad6d46d1 Merge branch 'MDL-39971' of git://github.com/timhunt/moodle 2013-06-10 15:09:43 +12:00
Dan Poltawski
07bac478b6 Merge branch 'wip-MDL-39824-m26' of http://github.com/samhemelryk/moodle 2013-06-10 10:54:22 +08:00
Sam Hemelryk
018fc94211 Merge branch 'MDL-39978' of git://github.com/timhunt/moodle 2013-06-10 14:48:21 +12:00
Sam Hemelryk
bf0cdbcf8a Merge branch 'w24_MDL-32480_m26_imscp' of git://github.com/skodak/moodle 2013-06-10 14:41:21 +12:00
Sam Hemelryk
9016063900 MDL-39824 theme: tweaking upgrade note version 2013-06-10 14:34:37 +12:00
Sam Hemelryk
111f5291f9 Merge branch 'wip-MDL-39608-master' of git://github.com/phalacee/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-10 14:26:04 +12:00
Sam Hemelryk
fb8010732e Merge branch 'MDL-36090_log2' of git://github.com/andyjdavis/moodle 2013-06-10 12:31:03 +12:00
Sam Hemelryk
2c0fb4c788 Merge branch 'wip-MDL-40088-master' of git://github.com/marinaglancy/moodle 2013-06-10 12:14:17 +12:00
Sam Hemelryk
e559265c10 Merge branch 'wip-MDL-39227-master' of git://github.com/phalacee/moodle 2013-06-10 11:43:31 +12:00
Sam Hemelryk
a6d966885b Merge branch 'MDL-39979-master' of git://github.com/FMCorz/moodle 2013-06-10 11:35:26 +12:00
Sam Hemelryk
d3e5a21e7a MDL-39824 theme: changes recorded in theme/upgrade.txt 2013-06-10 09:26:05 +12:00
Sam Hemelryk
a2f8bccf0a MDL-39824 output: fixed bug when moving blocks with rtl lang 2013-06-10 09:10:06 +12:00
Sam Hemelryk
7956a02fda MDL-40089 theme_clean: simplified layouts and converted to new OUTPUT API 2013-06-10 09:09:03 +12:00
Petr Škoda
66056f994f MDL-39096 fix obfuscate_text() utf-8 compatibility 2013-06-07 22:38:48 +02:00
Petr Škoda
0fa01f4e60 MDL-39549 fix cohort search in course categories 2013-06-07 22:07:15 +02:00
Petr Škoda
8d4f13666b MDL-37974 fix verbose output when expiring manual enrolments 2013-06-07 21:18:54 +02:00
MorrisR2
80f1c6adc0 MDL-37974 add "Disable course enrolment" expiration action for manual enrolments 
Commit amended by Petr Skoda to match recommended coding style.
 2013-06-07 21:06:47 +02:00
Petr Škoda
4b75f49a63 MDL-28394 fix enrolment method restore logic 
This patch fixes:
* missing enrolment methods after 1.9 backup restore - defaults are added
* enrolment methods are restored only when users option is enabled
* manual enrolment override option is disabled if users not available
 2013-06-07 10:02:59 +02:00
Petr Škoda
f815e4cbdf MDL-32480 allow external https links in IMSCP too 2013-06-07 09:58:03 +02:00
Nicolas Dunand
4a04fef6ef MDL-32480 fix display of IMS content packages with external links 2013-06-07 09:58:03 +02:00
Sam Hemelryk
7362d8160a MDL-40089 theme_clean: moved general to columns3.php as prep 2013-06-07 17:33:14 +12:00
Sam Hemelryk
018721e685 MDL-39842 js: fixed block drag and drop 2013-06-07 17:33:14 +12:00
Sam Hemelryk
8bfd530bc1 MDL-39824 theme_bootstrapbase: converted $PAGE use to new $OUTPUT methods. 2013-06-07 17:32:44 +12:00
Sam Hemelryk
28700dea3c MDL-40089 theme_bootstrapbase: moved general to columns3.php as prep 2013-06-07 17:32:06 +12:00
Sam Hemelryk
06a72e0192 MDL-39824 output: tidied up output before bootstrap cleaning 2013-06-07 17:31:59 +12:00
Sam Hemelryk
b8035316bb MDL-39839 renderer: new methods for calls appearing in theme layouts 2013-06-07 17:31:27 +12:00
Sam Hemelryk
3707972a78 MDL-39838 renderer: new methods for body classes and id 2013-06-07 17:31:27 +12:00
Sam Hemelryk
8cf2b9ab9b MDL-39841 renderer: new method to renderer blocks with predictable structure 2013-06-07 17:31:27 +12:00
Sam Hemelryk
36b77e3a88 MDL-39871 themes: can now specify regions to swap when using rtl langs 2013-06-07 17:31:27 +12:00
Marina Glancy
9f370860a4 MDL-40088 fixed bug with not visible course section 2013-06-07 13:55:19 +10:00