Commit graph

3131 commits

Author SHA1 Message Date
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
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
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
Jerome Mouneyrac
8c507544d4 MDL-32941 fix criteriaerror exception code + wrong phpdoc scope 2012-05-17 13:36:40 +08:00
Aaron Barnes
66b494771f MDL-33063 course: Reuse get_all_sections() 2012-05-17 15:40:03 +12:00
Dan Poltawski
12ba24a8f8 Merge branch 'MDL-24419' of git://github.com/stronk7/moodle 2012-05-17 11:19:02 +08: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
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 3aaa184399.
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)
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
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
Davo Smith
33b24bdd99 MDL-22504 Course drag and drop upload - moved file locations 2012-05-16 08:25:22 +01:00
Sam Hemelryk
ba94f1d503 Merge branch 'MDL-32889-master' of https://github.com/mackensen/moodle 2012-05-16 13:09:32 +12:00
Sam Hemelryk
a5bf3c520f Merge branch 'MDL-31215-master-11' of git://git.luns.net.uk/moodle
Conflicts:
	course/lib.php
2012-05-16 09:59:45 +12:00
Aparup Banerjee
154128a50f Merge branch 'wip-mdl-32770' of git://github.com/rajeshtaneja/moodle 2012-05-15 16:41:54 +08:00
Andrew Robert Nicols
7a9a07d24a MDL-31215 Add the ability to change activity titles using AJAX calls 2012-05-14 14:22:02 +01:00
sam marshall
ce4dfd2703 MDL-24419 (4): Add conditional availability support to sections; section cache
Credit: original version done by Kirill Astashov of NetSpot (netspot.com.au),
finished and tweaked by sam.

This change adds conditional availability support for sections analagous to
that already available for activities. (Backend, UI, backup/restore.)

In order that this feature does not reduce performance, section cacheing has
also been added using a new course 'sectioncache' field analagous to modinfo.

The new feature integrates with activity availability so that activities
inside sections which are not available are automatically not available
themselves (meaning it works to restrict access).
2012-05-14 11:19:25 +01:00
sam marshall
ae3fbf7b06 MDL-24419 (2): Moved groupings cache to get_all_groupings function
There was a static cache inside course/lib.php. I need to access this
information in other places, so to avoid making two queries, I am
moving the cache into the groups_get_all_groupings function instead.
2012-05-14 11:15:15 +01:00
Davo Smith
5103b5e667 MDL-22504 Course drag and drop upload - now correctly ignores disabled modules and allows upload to orphaned sections 2012-05-14 09:48:04 +01:00
Dan Poltawski
8715472b1d Merge branch 'MDL-32742-master-1' of git://git.luns.net.uk/moodle 2012-05-14 14:21:57 +08:00
Dan Poltawski
a271c57af8 Merge branch 'wip-MDL-32611-m23' of git://github.com/samhemelryk/moodle 2012-05-14 13:12:53 +08:00
Dan Poltawski
950632673b Merge branch 'MDL-32875-master-1' of git://git.luns.net.uk/moodle 2012-05-14 13:08:40 +08:00
Sam Hemelryk
924c34df8c MDL-32873 course: Fixed up unused global + phpdocs 2012-05-14 13:41:15 +12:00
Sam Hemelryk
1c0441bd6a Merge branch 'MDL-32873-master-1' of git://git.luns.net.uk/moodle
Conflicts:
	course/lib.php
2012-05-14 13:39:55 +12:00
Sam Hemelryk
8ec7c2cfd9 Merge branch 'MDL-32881-master-2' of git://git.luns.net.uk/moodle 2012-05-14 13:30:16 +12:00
Sam Hemelryk
fe579c15b7 MDL-32611 editcategory: Fixed up navigation error. 2012-05-14 09:16:43 +12:00
Andrew Robert Nicols
3aaa184399 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.
2012-05-10 11:38:42 +01:00
Andrew Robert Nicols
314eae407f MDL-32873 Separate out course ajax enabled detection into new function 2012-05-10 09:34:27 +01:00
Rajesh Taneja
36be7e1453 MDL-32770 course: fixed section title and footer 2012-05-10 16:23:17 +08:00