Commit graph

14499 commits

Author SHA1 Message Date
Sam Hemelryk
ee3502e793 Merge branch 'master_MDL-35472' of git://github.com/totara/moodle 2012-10-02 11:10:39 +13:00
Eloy Lafuente (stronk7)
1203b6ea05 Merge branch 'MDL-35669-master-2' of git://github.com/micaherne/moodle 2012-10-01 23:44:07 +02:00
Eloy Lafuente (stronk7)
8614cd72f0 Merge branch 'MDL-34657' of git://github.com/timhunt/moodle 2012-10-01 23:22:39 +02:00
Sam Hemelryk
6beec9ce60 Merge branch 'MDL-35547' of git://github.com/enovation/moodle 2012-10-02 10:15:41 +13:00
Michael Aherne
f127b1a538 MDL-35669 gravatar Provide default image URL to Gravatar 2012-10-01 14:17:11 +01:00
Eloy Lafuente (stronk7)
5522e44658 Merge branch 'MDL-34931-master' of git://github.com/FMCorz/moodle 2012-10-01 13:32:44 +02:00
Andrew Davis
97512dd36b MDL-35667 core_grade: added a new test for grade_category::apply_limit_rules() 2012-10-01 12:53:26 +08:00
Andrew Davis
5292948648 MDL-31782 core_grade: fixed a potential infinite loop 2012-10-01 11:32:06 +08:00
Tomasz Muras
e80c64ab9d MDL-35547 Fetch more sub-categories with one SQL query. 2012-09-30 18:15:06 +02:00
Tomasz Muras
0f76ac4f2e MDL-35547 Detect loops in question categories. 2012-09-30 18:15:06 +02:00
Tomasz Muras
e3810d112a MDL-35547 Detect question category pointing to itself as a parent. 2012-09-30 18:15:06 +02:00
Petr Škoda
7881024ec4 MDL-31437 add group sync option to enrol_cohort
This patch includes following changes and new features:
* Group sync in enrol_cohort plugin.
* Option for editing of role in existing cohort sync instance.
* Group memberships are now restored after enrolments.
* New enrol method for restore of protected group membership.
* New component callback 'restore_group_member' for restore of general plugin group membership.
* New component callback 'restore_role_assignment' for restore of general plugin role assignments.
* Implemented group membership protection in enrolment UI.
* Other minor fixes and cleanup.

Notes:
* The YUI base enrolment page is not reimplemented yet - see MDL-35618.
2012-09-28 21:00:00 +02:00
Andrew Robert Nicols
d6418e531d MDL-35673 Improve performance of formchangechecker event creation 2012-09-28 10:25:21 +01:00
Marina Glancy
ee7084e950 MDL-35263 Converting course formats to OOP
- added class format_base as the base for all course formats
- added class format_site for the pseudo-format 'site' used for displaying activities on the front page
- added class format_legacy that overrides format_base functions with calling old-style 'callback_xxx' functions
- replaced all usage of 'callback_xxx' functions with format_base methods
- made arguments of get_section_name(), get_course_url() more flexible
- deprecated function get_generic_section_name(), it's contents is moved to format_base
- global_navigation::format_display_course_content() is removed, plugins can supress the sections navigations using extend_course_navigation()
2012-09-28 13:42:27 +08:00
Frederic Massart
5fee56d5c3 MDL-34931 core_grade: Fixed grades hidden when activity is hidden 2012-09-28 11:39:46 +08:00
Petr Škoda
7a9b6cb6f2 MDL-35616 import YUI 3.7.2 2012-09-27 14:41:32 +02:00
Tim Hunt
9695ff811b MDL-34657 user sorting: consistent sorting everywhere.
This commit coverts everything in the codebase to use the new
users_order_by_sql function when sorting lists of users. More details in
the bug.

Note that this does not change places where users are displayed in a
sortable table, and the sort order comes from the table.
2012-09-27 12:41:42 +01:00
Tim Hunt
9f82ddd66f MDL-34657 datalib: function to generate user sort sql.
The purpose of this method is to ensure that when we display lists of
users in different places, the default sort order is consistent.

Having this code centralised in one place them makes it possible to
improve things accross the board, and there is an example of that here.
There is logic so that if we are searching for particular string, then
users with an exact match are sorted first.
2012-09-27 12:41:41 +01:00
Eloy Lafuente (stronk7)
8e4f6bb1d4 MDL-34657 test: verify CASE statements in ORDER BY clauses. 2012-09-27 12:41:41 +01:00
Dan Poltawski
22e8bab59a Revert "MDL-32184 - Course - Fixing incorrect redirect when toggling course edit while inside an activity -- Patch provided by Kanika Goyal"
This reverts commit 0a5181a0df.
2012-09-27 11:31:51 +08:00
Eloy Lafuente (stronk7)
ba6d56c202 Merge branch 'WIP-MDL-35481' of git://github.com/nadavkav/moodle 2012-09-27 00:06:17 +02:00
Eloy Lafuente (stronk7)
21ba954e99 Merge branch 'WIP-MDL-35246' of git://github.com/nadavkav/moodle 2012-09-26 23:50:41 +02:00
Dan Poltawski
ce77b89a18 Merge branch 'w39_MDL-35506_m24_pgerrorrollback' of git://github.com/skodak/moodle 2012-09-26 17:01:39 +08:00
Petr Škoda
d719d59f25 MDL-35506 add more transaction error tests 2012-09-26 10:51:03 +02:00
Petr Škoda
bedd0982e8 MDL-35506 improve pg transaction snapshotting perf 2012-09-26 10:39:28 +02:00
Jerome Mouneyrac
12fc8acf5b MDL-35198 replace key_exists by array_key_exists 2012-09-26 15:20:18 +08:00
Dan Poltawski
d0068cd007 MDL-31859 - fix trailing whitespace 2012-09-26 14:36:59 +08:00
Dan Poltawski
ac994d5a8a Merge branch 'MDL-31859' of git://github.com/Lightwork-Marking/moodle 2012-09-26 14:16:55 +08:00
Dan Poltawski
50a6106409 MDL-15471 install.xml fixup spacing 2012-09-26 12:06:20 +08:00
Dan Poltawski
bb14cc2d23 Merge branch 'wip-MDL-15471' of https://github.com/jennymgray/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2012-09-26 12:04:41 +08:00
Sam Hemelryk
4aede312e7 Merge branch 'wip-MDL-35276-master' of git://github.com/marinaglancy/moodle 2012-09-26 15:50:56 +12:00
Marina Glancy
923451c59f MDL-35276 fix redirect to course/section pages 2012-09-26 10:51:28 +08:00
Sam Hemelryk
d998c1a440 Merge branch 'MDL-31976-master' of git://github.com/FMCorz/moodle 2012-09-26 08:20:53 +12:00
Andrew Robert Nicols
2b42518aa7 MDL-34328 Correct usage of e.drop when catching missed drag/drop events 2012-09-25 09:27:31 +01:00
Paul Nicholls
1e78b3e66f MDL-34328: block dragdrop - disallow dragging from show/hide and dock icons
Tell the YUI drag/drop delegate that the show/hide and dock icons are not valid drag handles.  Otherwise, a drag can be initiated by showing or hiding a block (probably not from docking one, but better safe than sorry).  Not strictly related to MDL-34328, but likely to be encountered whilst testing - and closely related to another patch for MDL-34328.

Note that the "invalid" config option for the delegate takes a string - not an array - but can have multiple selectors separated by commas.
2012-09-25 09:27:31 +01:00
Paul Nicholls
6cc43fedbb MDL-34328: block dragdrop - performance rewrite
Use YUI's DragDrop delegates for block dragdrop - one per block region - rather than initialising a Drag object for each individual block.
2012-09-25 09:27:31 +01:00
Dan Poltawski
415af656b2 Merge branch 'wip-MDL-35415-master' of git://github.com/marinaglancy/moodle 2012-09-25 14:48:44 +08:00
Marina Glancy
b874d5c6b4 MDL-35415 completely remove add activity in settings (MDL-22732) 2012-09-25 14:42:25 +08:00
Dan Poltawski
6d0d5b848b Merge branch 'w39_MDL-35506_m24_pgerrorrollback' of git://github.com/skodak/moodle 2012-09-25 14:34:33 +08:00
Eloy Lafuente (stronk7)
ede30adcf9 Merge branch 'w39_MDL-35515_m24_yui371' of git://github.com/skodak/moodle 2012-09-25 00:07:35 +02:00
Sam Hemelryk
52ebfade63 Merge branch 'MDL-34607-master' of git://github.com/FMCorz/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2012-09-25 09:51:28 +12:00
Dan Poltawski
e00c210f55 Merge branch 'wip-MDL-32184-master' of http://github.com/phalacee/moodle 2012-09-24 15:36:10 +08:00
Dan Poltawski
7647ed4645 Merge branch 'MDL-26940-master' of git://github.com/FMCorz/moodle 2012-09-24 15:32:18 +08:00
Frederic Massart
1d2173afde MDL-31499 Javascript: Handle invalid window names in openpopup 2012-09-24 15:23:51 +08:00
Jason Fowler
0a5181a0df MDL-32184 - Course - Fixing incorrect redirect when toggling course edit while inside an activity -- Patch provided by Kanika Goyal 2012-09-24 15:04:55 +08:00
Dan Poltawski
6a02c4c916 Merge branch 'w39_MDL-35561_m24_tinymce357' of git://github.com/skodak/moodle 2012-09-24 11:57:19 +08:00
Sam Hemelryk
b39e6f59d6 Merge branch 'MDL-35312-master' of git://github.com/FMCorz/moodle 2012-09-24 15:54:04 +12:00
Dan Poltawski
078929f40c Merge branch 'MDL-35442-master' of git://git.luns.net.uk/moodle 2012-09-24 11:19:34 +08:00
Sam Hemelryk
d324d74e39 Merge branch 'MDL-30901_master' of git://github.com/dmonllao/moodle 2012-09-24 15:15:05 +12:00
Sam Hemelryk
8ea8461b3f Merge branch 'MDL-33431' of git://github.com/netspotau/moodle-mod_assign 2012-09-24 14:53:43 +12:00