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,687 Commits 36 Branches 523 Tags
Commit Graph

53687 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sam Hemelryk
7b06151288 Merge branch 'MDL-22504_drag_and_drop_upload_final' of https://github.com/davosmith/moodle 
Conflicts:
	course/lib.php
	theme/base/style/course.css
 2012-05-17 10:55:35 +12:00
Eloy Lafuente (stronk7)
94dc3c7d1e MDL-24419 (5): Coding style cleanup 2012-05-17 00:51:50 +02:00
Sam Hemelryk
fbb4c959b5 MDL-32881 Prevent course/view.php from being cached 
This should prevent browser caching which will ensure that changes made
using the course javascript (e.g. drag/drop, show/hide) will not be 'lost'
by using the browser back button.

This reverts commit 3aaa1843999eeb1832331ec5c8b30865fdba9710.
 2012-05-17 10:12:29 +12:00
Eloy Lafuente (stronk7)
dd420abadf Merge branch 'MDL-24419-master' of git://github.com/sammarshallou/moodle 
Conflicts:
	lib/db/upgrade.php
	lib/phpunit/lib.php
	version.php

Fixed:
    lib/db/upgrade.php - duplicate course->sectioncache add code
    lib/db/install.xml - cleanup needed because xmldb editor was not used
    lib/phpunit/classes/util.php - cleanup $GROUPLIB_CACHE on test reset
 2012-05-16 23:53:47 +02:00
Eloy Lafuente (stronk7)
0c408f5a3d NOBUG: Minibump to get latest WS installed 2012-05-16 16:28:59 +02:00
Eloy Lafuente (stronk7)
ea01d3c601 Merge branch 'MDL-32233-core_course_duplicate_course-usersdata' of git://github.com/jleyva/moodle 2012-05-16 16:23:00 +02:00
Juan Leyva
d7f465d497 MDL-32233 core_course_duplicate_course: Forcing backup and restore in MODE_SAMESITE always as suggested by Eloy. 2012-05-16 16:10:47 +02:00
Juho Viitasalo
e566bfa1ae MDL-31850 wiki: extra whitespace removed from form 2012-05-16 03:43:17 -07:00
Juan Leyva
6c7d3e3100 MDL-32233 core_course_duplicate_course: Fixed integrator review details described here http://tracker.moodle.org/browse/MDL-32233?focusedCommentId=157707&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-157707 2012-05-16 12:10:09 +02:00
Andrew Robert Nicols
c9cbb5a9bf MDL-33025 Ensure that hitting cancel clears the resource title editor 2012-05-16 10:56:45 +01:00
Andrew Robert Nicols
e0319e7be7 MDL-33025 Ensure that popups aren't triggered when editing resource titles 2012-05-16 10:46:09 +01:00
Eloy Lafuente (stronk7)
6b4769bc8b Merge branch 'MDL-32662-core_course_groups_xxx_groupings' of git://github.com/jleyva/moodle 2012-05-16 11:41:48 +02:00
Juan Leyva
2c8ad38eff MDL-32662 core_group_xxx_groupings: Fixed integrator review potential problem detected in update_groupings. More info: http://tracker.moodle.org/browse/MDL-32662?focusedCommentId=157706&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-157706 2012-05-16 10:45:40 +02:00
Aparup Banerjee
485e67982c Merge branch 'MDL-32633' of git://github.com/timhunt/moodle 2012-05-16 15:59:07 +08:00
Davo Smith
33b24bdd99 MDL-22504 Course drag and drop upload - moved file locations 2012-05-16 08:25:22 +01:00
Aparup Banerjee
9e66e96049 Merge branch 'MDL-31657' of git://github.com/scriby/moodle 2012-05-16 14:32:51 +08:00
Aparup Banerjee
7585ac89bd Merge branch 'MDL-32988-master' of git://github.com/sammarshallou/moodle 2012-05-16 14:03:56 +08:00
Aparup Banerjee
ca91bdcdf7 MDL-32921 lti : reused a moodle_url. 2012-05-16 13:49:32 +08:00