mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-13 12:34:28 +01:00
Code Issues Projects Releases Wiki Activity
53,388 Commits 36 Branches 523 Tags
Commit Graph

53388 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sam marshall
57a42a24ad MDL-33126 Fix error on first view of new course page 2012-05-21 12:05:30 +01:00
Eloy Lafuente (stronk7)
4f7f2a8828 weekly release 2.3dev 2012-05-19 12:24:31 +02:00
Eloy Lafuente (stronk7)
5204c07bd4 Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-05-19 12:17:09 +02:00
AMOS bot
f348b9dac6 Automatically generated installer lang files 2012-05-19 00:31:42 +00:00
Eloy Lafuente (stronk7)
128af10645 MDL-32005 Avoid some notices restoring old backup files without idnumber 2012-05-18 13:36:03 +02:00
Dan Poltawski
4a3d07972c Merge branch 'MDL-30617-master-patches' of git://git.luns.net.uk/moodle 2012-05-18 17:40:33 +08:00
Adrian Greeve
0a498686c0 MDL-32126 replaced _order with sortorder to make sorting work in oracle 2012-05-18 11:37:21 +02:00
Andrew Robert Nicols
2d1151817f MDL-30617 Center dialogue title 2012-05-18 10:28:53 +01:00
Andrew Robert Nicols
af75421c54 MDL-30617 Adjustments to styling of module chooser 
These changes fix several points and suggested changes:
* increase the size of the help popup to 800x600
* fix issues with centering of the dialogue
* swap next/cancel buttons
* convert next button to use string for 'Add'
* convert add text to 'Add an activity or resource'
 2012-05-18 10:10:20 +01:00
Dan Poltawski
eeba64d02e MDL-32727 - quiz: fix incorrect variable name in upgrade 2012-05-18 15:08:07 +08:00
Dan Poltawski
5316007e08 MDL-24419 section availability: display availability info to teachers 2012-05-18 14:56:00 +08:00
Dan Poltawski
1edff8c7ed MDL-30617 lang: improve mod chooser strings 2012-05-18 12:46:13 +08:00
Dan Poltawski
ad10c481e1 Merge branch 'MDL-33048' of git://github.com/timhunt/moodle 2012-05-18 12:12:51 +08:00
Sam Hemelryk
d5e6fe3ecc Merge branch 'MDL-32727' of git://github.com/timhunt/moodle 
Conflicts:
	mod/quiz/db/upgrade.php
 2012-05-18 16:07:20 +12:00
Dan Poltawski
82258830b7 Merge branch 'MDL-32933' of git://github.com/netspotau/moodle-mod_assign 2012-05-18 11:23:47 +08:00
Dan Poltawski
a4d0f6f06a Merge branch 'w20_MDL-32868_m23_iplookup' of git://github.com/skodak/moodle 2012-05-18 11:05:28 +08:00
Dan Poltawski
7e89cbe0ac Merge branch 'MDL-31675-file-browsing' of git://github.com/mudrd8mz/moodle 2012-05-18 10:30:22 +08:00
Dan Poltawski
79f3d0e027 Merge branch 'MDL-32535-master' of git://github.com/sammarshallou/moodle 2012-05-18 10:28:19 +08:00
Dan Poltawski
33e693b5e1 Merge branch 'MDL-32909' of git://github.com/netspotau/moodle-mod_assign 2012-05-18 10:05:32 +08:00
AMOS bot
2f7bd55c0c Automatically generated installer lang files 2012-05-18 00:31:47 +00:00
Sam Hemelryk
67cfce0245 Merge branch 'MDL-33069' of git://github.com/danpoltawski/moodle 2012-05-18 10:48:23 +12:00
Eloy Lafuente (stronk7)
f823158b07 MDL-32941 Add transaction support to delete_categories 2012-05-18 00:06:42 +02:00
Eloy Lafuente (stronk7)
3ec163ddf1 MDL-32941 Reorganise functions a bit 2012-05-17 23:45:41 +02:00
Eloy Lafuente (stronk7)
754c2deab6 Merge branch 'MDL-32941' of git://github.com/mouneyrac/moodle 
Conflicts:
	course/externallib.php
	lib/db/services.php
	version.php
 2012-05-17 22:35:57 +02:00
Dan Poltawski
46e046b7b3 MDL-30617 modchoser: minor tweaks 
* Change markup way from 'activity module style' to its own markup
* Remove 'a new' from the 'add an activity' string
* Remove the 'personalisation' from the nohelp lang string
 2012-05-18 00:27:42 +08:00
Andrew Robert Nicols
01e0e7044a MDL-30617 Add a javascript interface for adding modules to a course 
This interface allows for additional metadata, such as the module's help
and icon, to be displayed.
 2012-05-18 00:27:16 +08:00
Helen Foster
2e6b68f4a8 MDL-32925 lang: Add extended help texts for all modules 
Thanks to Mary Cooch & Martin Dougiamas who contributed to this
rewording.

AMOS BEGIN
   REM These module help texts are going to be displayed more prominently in the Moodle interface
AMOS END
 2012-05-18 00:27:04 +08:00
Tim Hunt
36e48cb82f MDL-33048 quiz / my moodle: fatal error due to missing include. 2012-05-17 16:06:41 +01:00
Dan Poltawski
bc449b18a6 Merge branch 'MDL-33025-master-1' of git://git.luns.net.uk/moodle 2012-05-17 21:19:37 +08:00
Dan Poltawski
03ba9dac94 Merge branch 'MDL-33073-master-1' of git://git.luns.net.uk/moodle 2012-05-17 21:04:30 +08:00
Dan Poltawski
1ed2dc6f96 Merge branch 'MDL-24419' of git://github.com/danpoltawski/moodle 2012-05-17 20:46:21 +08:00
Dan Poltawski
6e0d176934 Merge branch 'MDL-24419-master' of git://github.com/sammarshallou/moodle 2012-05-17 20:45:37 +08:00
sam marshall
52f1406101 MDL-24419 Fix bug with section creation for new courses 2012-05-17 13:37:33 +01:00
Andrew Robert Nicols
537194ffc5 MDL-33073 Fix application of toolbox JS for drag/dropped content 2012-05-17 11:49:53 +01:00
Dan Poltawski
d6c94cf4eb MDL-33069 assignment: change pluralname to (2.2) 2012-05-17 17:28:26 +08:00
Aparup Banerjee
ffa7d1cda0 Merge branch 'MDL-32087' of git://github.com/timhunt/moodle 2012-05-17 17:17:37 +08:00
Aparup Banerjee
8280dec6fa Merge branch 'w20_MDL-33016_m23_hubperf' of git://github.com/skodak/moodle 2012-05-17 16:57:01 +08:00
Aparup Banerjee
defd2dcc13 Merge branch 'wip-mdl-32866' of git://github.com/rajeshtaneja/moodle 2012-05-17 16:48:07 +08:00
Aparup Banerjee
7ded1e29f9 Merge branch 'w20_MDL-32907_m23_like' of git://github.com/skodak/moodle 2012-05-17 14:47:44 +08:00
Dan Poltawski
331a8feecf Merge branch 'w20_MDL-29054_m23_sqlsrvdbt' of git://github.com/skodak/moodle 2012-05-17 14:33:42 +08:00
Dan Poltawski
5a0a64661c Merge branch 'w20_MDL-32967_m23_sqlsrvstrings' of git://github.com/skodak/moodle 2012-05-17 14:30:30 +08:00
Dan Poltawski
aa141671a3 Merge branch 'MDL-31814' of git://github.com/timhunt/moodle 2012-05-17 14:11:14 +08:00
Jerome Mouneyrac
8c507544d4 MDL-32941 fix criteriaerror exception code + wrong phpdoc scope 2012-05-17 13:36:40 +08:00
Dan Poltawski
b5378c1113 Merge branch 'w20_MDL-32961_m23_phpunitperf' of git://github.com/skodak/moodle 2012-05-17 12:35:45 +08:00
Dan Poltawski
b24d1dbbad MDL-24419: redirect_if_major_upgrade_required version update 
The conditional topics changes need users to go to /admin/index.php
 2012-05-17 11:57:12 +08:00
Dan Poltawski
65d0d4b654 Merge branch 'w20_MDL-32961_m23_phpunitperf' of git://github.com/skodak/moodle 2012-05-17 11:29:04 +08:00
Dan Poltawski
12ba24a8f8 Merge branch 'MDL-24419' of git://github.com/stronk7/moodle 2012-05-17 11:19:02 +08:00
Sam Hemelryk
2bdafb867a Merge branch 'MDL-32337-uptodate' of git://github.com/mudrd8mz/moodle 2012-05-17 14:55:21 +12:00
Sam Hemelryk
b945325339 Merge branch 'MDL-31850-master' of https://github.com/mackensen/moodle 2012-05-17 14:49:03 +12:00
Jerome Mouneyrac
d6ebe011b6 Fix codecheck/moodlechecker errors 2012-05-17 10:35:05 +08:00