mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-28 11:55:58 +02:00
Code Issues Projects Releases Wiki Activity
64,017 Commits 37 Branches 536 Tags
Commit Graph

64017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
e360a68adc Merge branch '41997-26' of git://github.com/samhemelryk/moodle 2013-10-01 19:50:19 +02:00
Eloy Lafuente (stronk7)
da600e5314 Merge branch 'MDL-42004-master' of git://github.com/FMCorz/moodle 2013-10-01 19:43:42 +02:00
Eloy Lafuente (stronk7)
52e9827495 Merge branch 'MDL-42001-master' of git://github.com/FMCorz/moodle 2013-10-01 19:41:10 +02:00
Eloy Lafuente (stronk7)
164e90dd70 Merge branch 'MDL-42003-master' of git://github.com/FMCorz/moodle 2013-10-01 19:36:37 +02:00
Eloy Lafuente (stronk7)
91c49b8cf4 Merge branch 'MDL-41752-master' of git://github.com/jamiepratt/moodle 2013-10-01 19:18:36 +02:00
Eloy Lafuente (stronk7)
00a6df6b02 Merge branch 'w40_MDL-41999_m26_userpw' of https://github.com/skodak/moodle 2013-10-01 15:59:06 +02:00
Marina Glancy
c9e4ade71e Merge branch 'MDL-32592-master' of git://github.com/danpoltawski/moodle 2013-10-01 20:49:03 +10:00
Marina Glancy
815f0ef33c Merge branch 'MDL-39653-master' of git://github.com/danpoltawski/moodle 2013-10-01 20:42:37 +10:00
Petr Škoda
92911ef1b8 MDL-41999 fix setting of USER in chat 2013-10-01 09:23:42 +02:00
Nadav Kavalerchik
eef850815c MDL-41264 Themes: Right align Tabs on Wiki page, when in RTL mode (theme/clean) 2013-10-01 15:05:49 +10:00
Marina Glancy
3a3e3fa3b5 Merge branch 'MDL-41989-master' of git://github.com/phalacee/moodle 2013-10-01 14:45:14 +10:00
Sam Hemelryk
c7b6b27d77 MDL-41398 bootstrap: added a maintenance layout 2013-10-01 14:35:47 +10:00
Marina Glancy
5c06e84ab2 Merge branch 'MDL-41912-master' of git://github.com/FMCorz/moodle 2013-10-01 14:21:50 +10:00
Damyon Wiese
900f571c3a MDL-41241 Atto: Fix merge conflict (add extra param to add_toolbar_button) 2013-10-01 11:58:15 +08:00
Sam Hemelryk
0af463d413 MDL-41828 mod: fixed navbar when adding modules to a course 2013-10-01 13:30:00 +10:00
Sam Hemelryk
d451eb4dc5 MDL-41900 events: avoid new debug call within unit tests 2013-10-01 16:20:57 +13:00
Sam Hemelryk
c78fdd8db3 Merge branch 'MDL-41995_master' of https://github.com/markn86/moodle 2013-10-01 14:50:53 +13:00
Sam Hemelryk
421dd2e8eb Merge branch 'MDL-41900-m' of git://github.com/micaherne/moodle 2013-10-01 14:35:49 +13:00
Sam Hemelryk
9b2fdfab44 Merge branch 'MDL-41933' of https://github.com/merrill-oakland/moodle 2013-10-01 14:06:28 +13:00
Sam Hemelryk
5101954f03 Merge branch 'MDL-41241-master' of git://github.com/damyon/moodle 
Conflicts:
	lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js
	lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js
	lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js
	lib/editor/atto/plugins/link/yui/src/button/js/button.js
 2013-10-01 13:58:17 +13:00
Sam Hemelryk
a0a63fa526 Merge branch 'MDL-41894-master' of git://github.com/ankitagarwal/moodle 2013-10-01 13:45:18 +13:00
Sam Hemelryk
52dc898d16 Merge branch 'MDL-41228_master' of https://github.com/totara/openbadges 2013-10-01 13:37:44 +13:00
Eloy Lafuente (stronk7)
b744b90df5 Merge branch 'w40_MDL-41707_m26_exttests' of https://github.com/skodak/moodle 2013-10-01 02:14:23 +02:00
Marina Glancy
f09ecc6d8b Merge branch '41988-26' of git://github.com/samhemelryk/moodle 2013-10-01 10:01:17 +10:00
Eloy Lafuente (stronk7)
b1698e9ac5 Merge branch 'MDL-41962-master' of git://github.com/FMCorz/moodle 2013-10-01 01:52:53 +02:00
Sam Hemelryk
53be2d782a Merge branch 'MDL-41926_master' of git://github.com/dmonllao/moodle 2013-10-01 12:07:22 +13:00
Sam Hemelryk
5e319f5101 Merge branch 'wip-MDL-37559-m26-showshortname' of git://github.com/henesnarfel/moodle 2013-10-01 11:18:14 +13:00
Sam Hemelryk
7da590c11b Merge branch 'MDL-40572_master' of https://github.com/totara/openbadges 2013-10-01 11:05:59 +13:00
Sam Hemelryk
8e5f86bcb3 MDL-41988 behat: improvements to spin 2013-10-01 10:24:36 +13:00
Sam Hemelryk
7bd5d84fd8 Merge branch 'wip-MDL-32773-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-10-01 10:17:13 +13:00
Sam Hemelryk
bd5797e6cc Merge branch 'wip-MDL-41676-master' of git://github.com/marinaglancy/moodle 2013-10-01 10:14:04 +13:00
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
Sam Hemelryk
1582ee126f MDL-41997 cache: dummy store now uses static acceleration for session + request 2013-09-30 09:41:03 +13:00
Sam Hemelryk
7310a6637a MDL-41997 cache: added unit tests for disabled stores 2013-09-30 09:41:03 +13:00
Mary Evans
c528917d3f MDL-33569 theme_bootsrapbase: adding re-compiled style/moodle.css 2013-09-28 16:26:01 +01:00