Commit graph

13953 commits

Author SHA1 Message Date
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
Sam Hemelryk
957983b702 MDL-33066 navigation: Fixed ambiguously defined columns in DB queries for Oracle 2012-05-18 10:37:44 +12: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
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
1ed2dc6f96 Merge branch 'MDL-24419' of git://github.com/danpoltawski/moodle 2012-05-17 20:46:21 +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
5a0a64661c Merge branch 'w20_MDL-32967_m23_sqlsrvstrings' of git://github.com/skodak/moodle 2012-05-17 14:30:30 +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
Jerome Mouneyrac
d6ebe011b6 Fix codecheck/moodlechecker errors 2012-05-17 10:35:05 +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
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
479a5db197 MDL-32941 Create service definition and implementation for
core_course_create_categories()
2012-05-17 10:33:51 +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
Eloy Lafuente (stronk7)
94dc3c7d1e MDL-24419 (5): Coding style cleanup 2012-05-17 00:51:50 +02: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
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
Aparup Banerjee
7585ac89bd Merge branch 'MDL-32988-master' of git://github.com/sammarshallou/moodle 2012-05-16 14:03:56 +08:00
Aparup Banerjee
e7ebfb8058 Merge branch 'MDL-32005-master-10' of git://git.luns.net.uk/moodle
- fixed up comments (was phpdoc blocks)
2012-05-16 10:39:48 +08: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
fdbd219b33 Merge branch 'MDL-30434_debug_exception' of git://github.com/andyjdavis/moodle 2012-05-16 09:51:48 +12:00
David Mudrak
fef693c858 MDL-32610 cron based fetch of available updates can be disabled from config.php 2012-05-15 14:32:55 +02:00
David Mudrak
7716057f7d MDL-32610 available updates info at the Plugins overview admin page can be hidden 2012-05-15 13:43:08 +02:00
Eloy Lafuente (stronk7)
3e632cf4e6 Merge branch 'MDL-32998' of git://github.com/mouneyrac/moodle 2012-05-15 13:14:13 +02:00
sam marshall
a7d09b7008 MDL-32988 Lib: Course delete does availability/completion in wrong order
When deleting modules that failed to delete using normal method, it deleted
the course-modules table first and then the availability/completion,
which depend on the entries in course-modules table. This commit switches
the order.
2012-05-15 12:02:00 +01:00
Jerome Mouneyrac
50f9449faa MDL-32998 add warnings structure 2012-05-15 18:40:06 +08:00
Andrew Robert Nicols
74b714df7e MDL-32005 Add idnumber field to groups and groupings 2012-05-15 09:38:51 +01:00
Yang
03d38b9207 MDL-32998 add warnings structure 2012-05-15 13:40:58 +08:00
Eric Merrill
192a8e13c3 MDL-32985 cron: don't execute notify_login_failures unnecessarily 2012-05-14 11:21:14 -04:00
Dan Poltawski
7a76aad7b7 Merge branch 'MDL-32930' of git://github.com/tmuras/moodle 2012-05-14 20:57:14 +08: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
637da99edb MDL-24419 (3): Add new parameter to format_float for shorter display 2012-05-14 11:15:16 +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
Dan Poltawski
bdd773d565 Merge branch 'MDL-30291' of git://github.com/rwijaya/moodle 2012-05-14 18:08:30 +08:00
Dan Poltawski
36e686a07e MDL-32923 phpunit: make copy/paste easier 2012-05-14 17:38:58 +08:00
Dan Poltawski
7e86180956 MDL-32923 phpunit: be a bit more verbose about re-run cmmand 2012-05-14 15:48:26 +08:00
Dan Poltawski
a5fefe0bbd Merge branch 'w20_MDL-32923_m23_phpunithint' of git://github.com/skodak/moodle 2012-05-14 15:46:23 +08:00
Dan Poltawski
cf037ba049 Merge branch 'w20_MDL-26901_m23_tinymceoptions' of git://github.com/skodak/moodle 2012-05-14 14:44:04 +08:00
Dan Poltawski
3359a6fe07 Merge branch 'w20_MDL-32926_m23_phpunitevil' of git://github.com/skodak/moodle 2012-05-14 13:36:11 +08:00
Dan Poltawski
ae745307ef Merge branch 'w20_MDL-32960_m23_phpunitref' of git://github.com/skodak/moodle 2012-05-14 13:32:18 +08:00
Sam Hemelryk
edd25271c4 Merge branch 'MDL-30305-master-1' of git://git.luns.net.uk/moodle 2012-05-14 14:48:31 +12:00
Sam Hemelryk
f98a3833b9 Merge branch 'w20_MDL-32659_m23_navcourses' of git://github.com/skodak/moodle 2012-05-14 14:37:51 +12:00
Rossiani Wijaya
1dedecf260 MDL-30291 outputrenderers: fixed typo for 2012-05-14 10:25:05 +08:00