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

53652 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Davo Smith
5a4decbc2d MDL-22504 Course drag and drop upload - (mostly) fixed the dragging of text between Firefox <==> Chrome 2012-05-17 21:19:52 +01: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
Davo Smith
b64300fc42 MDL-22504 Improved drag and drop status message, fixed text dragged from firefox, fix icon 2012-05-17 13:59:54 +01: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
Jerome Mouneyrac
d7238d0839 MDL-32941 change category name limit from 30 to 255 2012-05-17 10:35:02 +08:00
Fábio Souto
f2229c6895 MDL-32941 Implement core_course_update_categories, add webform and unittests 
Conflicts:

	admin/webservice/testclient_forms.php
	course/externallib.php
	lib/db/services.php
 2012-05-17 10:34:59 +08:00
Jerome Mouneyrac
6c6ec1d6b7 MDL-32941 use + operator instead array merge to avoid duplicate. Sort resulting array for better display to the client and for entring in the excluding algo. Exception reformatting. Minor formatting fixes. 2012-05-17 10:34:57 +08:00
Eloy Lafuente (stronk7)
20854c75f1 MDL-32941 external: core_course_get_categories() fixing. 
This includes:

- Multiple coding violations.
- Better detection of criteria, avoiding troublemaker 0 != ''
- Minor formatting.
- Ordering by path always to cause excludes to work ok.
 2012-05-17 10:34:14 +08:00
jleyva
d4a17894ef MDL-32941 Some changes to the core_course_get_categories functions. Adding key parameters 2012-05-17 10:34:12 +08:00
Jerome Mouneyrac
dd5e31f3cb MDL-32941 parameters moved on top level, little performance improvement, filter and format the description, browse all sub categories level and adjust checks 2012-05-17 10:34:09 +08:00
Fábio Souto
d4a246bc3b MDL-32941 Add implementation for core_course_get_categories() 2012-05-17 10:34:06 +08:00
Fábio Souto
2f951d866a MDL-32941 Added service definition and implementation for core_course_delete_categories() 
Included is a bug correction to categories_delete_move() which does not
respect showfeedback parameter, printing feedback even when not wanted
(this breaks the webservice output)

Conflicts:

	admin/webservice/testclient_forms.php
	lib/db/services.php
 2012-05-17 10:34:03 +08:00
Fábio Souto
be05180890 MDL-32941 complete unit tests and webform 2012-05-17 10:33:56 +08:00
Jerome Mouneyrac
95693c43aa MDL-32941 improve create_categories() web service function (wip) 2012-05-17 10:33:53 +08:00
Fábio Souto
479a5db197 MDL-32941 Create service definition and implementation for 
core_course_create_categories()
 2012-05-17 10:33:51 +08:00
Sam Hemelryk
72f1957393 Merge branch 'MDL-32903' of git://github.com/netspotau/moodle-mod_assign 2012-05-17 14:24:40 +12:00
Eloy Lafuente (stronk7)
71cbb2516b MDL-24419 (6): Backup and restore fixes and improvements 
- annotate used grouping
- reorganize restore methods
- roll availability dates
- observe $CFG->enableavailability
- observe $CFG->enablegroupmembersonly
- TODO: 2 TODOs
 2012-05-17 03:58:51 +02:00
Damyon Wiese
d37ec15ca1 MDL-32903: Remove unused variable $tempsettings from mod_assign 
This was left over from when I removed all the pass by reference calls.
 2012-05-17 08:30:54 +08:00
Sam Hemelryk
1220843c02 Merge branch 'MDL-32610-hide-updates' of git://github.com/mudrd8mz/moodle 2012-05-17 12:30:44 +12:00
Sam Hemelryk
bcc52e748a Merge branch 'master_MDL-32794' of git://github.com/danmarsden/moodle 2012-05-17 12:27:50 +12:00
Sam Hemelryk
536e3203e7 Merge branch 'MDL-32904' of git://github.com/netspotau/moodle-mod_assign 2012-05-17 11:54:07 +12:00
Sam Hemelryk
333127136a Merge branch 'MDL-23016c' of git://github.com/srynot4sale/moodle 2012-05-17 11:53:08 +12:00
Sam Hemelryk
a0a06d05fa MDL-22504 course-dndupload: Fixed up a couple of minor bugs 2012-05-17 11:29:38 +12:00