Commit graph

56930 commits

Author SHA1 Message Date
Adam Olley
e3d9426ab5 enrol_manual: Set context correctly in manual enrolment user selector 2012-10-02 14:51:24 +09:30
Dan Poltawski
0d24043d66 Merge branch 'wip-MDL-35263-master' of git://github.com/marinaglancy/moodle 2012-10-02 12:49:26 +08:00
Damyon Wiese
21f77397a2 MDL-35728: Fix download all submissions for a team assignment when there are no groups 2012-10-02 12:39:23 +08:00
Marina Glancy
76ab3fa18f MDL-35263 corrected coding style 2012-10-02 12:23:43 +08:00
Dan Poltawski
dcc4c7199a Merge branch 'MDL-35683' of git://github.com/netspotau/moodle-mod_assign 2012-10-02 12:19:38 +08:00
Dan Poltawski
76811d0bb8 Merge branch 'MDL-35370' of git://github.com/timhunt/moodle 2012-10-02 12:07:41 +08:00
Dan Poltawski
c07189ebe8 Merge branch 'MDL-35693' of git://github.com/timhunt/moodle 2012-10-02 11:47:50 +08:00
Dan Poltawski
afbdebee62 Merge branch 'MDL-35698' of git://github.com/timhunt/moodle 2012-10-02 11:40:16 +08:00
Dan Poltawski
49ab2d5fb2 Merge branch 'WIP-MDL-35708-master_quiz' of git://github.com/nadavkav/moodle 2012-10-02 11:36:49 +08:00
Dan Poltawski
61badb5989 Merge branch 'MDL-35437' of https://github.com/raymondAntonio/moodle 2012-10-02 11:35:59 +08:00
Dan Poltawski
f7b3ac9427 Merge branch 'w40_MDL-35619_m24_otheravatars' of git://github.com/skodak/moodle 2012-10-02 10:41:47 +08:00
Dan Poltawski
624feda48d Merge branch 'MDL-35680' of git://github.com/timhunt/moodle 2012-10-02 09:52:12 +08:00
Dan Poltawski
a354add4c8 Merge branch 'MDL-33933-master' of https://github.com/mackensen/moodle 2012-10-02 09:43:38 +08:00
Dan Poltawski
229f543881 Merge branch 'MDL-33117_grade_display' of git://github.com/andyjdavis/moodle 2012-10-02 09:32:58 +08:00
Eloy Lafuente (stronk7)
1ef501ca03 MDL-35669 gravatar amend and complete gravatar tests. 2012-10-02 01:33:59 +02:00
Eloy Lafuente (stronk7)
b96a15cc11 MDL-35669 gravatar Fix secure image urls. 2012-10-02 01:19:33 +02:00
Sam Hemelryk
ee3502e793 Merge branch 'master_MDL-35472' of git://github.com/totara/moodle 2012-10-02 11:10:39 +13:00
Sam Hemelryk
e737ad93a1 Merge branch 'MDL-34257' of git://github.com/timhunt/moodle 2012-10-02 10:46:01 +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
Sam Hemelryk
cf45206006 Merge branch 'MDL-30885' of git://github.com/timhunt/moodle 2012-10-02 10:31:13 +13: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
Nadav Kavalerchik
9025955df8 MDL-35723 - Align to center the "Quiz Feedback" label,when in RTL mode 2012-10-01 22:46:50 +02: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
Eloy Lafuente (stronk7)
a5fc5b6ceb Merge branch 'MDL-35637_master' of git://github.com/markn86/moodle 2012-10-01 13:19:01 +02:00
Eloy Lafuente (stronk7)
a499689c8b Merge branch 'MDL-35662' of git://github.com/netspotau/moodle-mod_assign 2012-10-01 13:14:43 +02:00
Eloy Lafuente (stronk7)
a88258ac9f Merge branch 'wip-MDL-34234-m24' of git://github.com/samhemelryk/moodle 2012-10-01 13:09:44 +02:00
Eloy Lafuente (stronk7)
c3f06aacef Merge branch 'MDL-34971-wip' of git://github.com/mouneyrac/moodle 2012-10-01 12:48:48 +02:00
Eloy Lafuente (stronk7)
b699278773 Merge branch 'MDL-35644' of git://github.com/mouneyrac/moodle 2012-10-01 12:45:51 +02:00
Eloy Lafuente (stronk7)
9a6f1154c2 Merge branch 'MDL-34894' of git://github.com/timhunt/moodle 2012-10-01 11:07:47 +02:00
Eloy Lafuente (stronk7)
5ab457bde0 Merge branch 'MDL-35688' of git://github.com/netspotau/moodle-mod_assign 2012-10-01 10:40:09 +02:00
Eloy Lafuente (stronk7)
fc561b2089 Merge branch 'MDL-35620' of git://github.com/timhunt/moodle 2012-10-01 10:28:28 +02:00
Petr Škoda
e66827464a MDL-35619 fix invalid avatars on other users page 2012-10-01 09:53:11 +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
Andrew Davis
26e02d7586 MDL-34367 core_message: removed the call to $PAGE->set_popup_notification_allowed from message/lib.php 2012-10-01 11:00:48 +08:00
Andrew Davis
daa1dd74d4 MDL-35519 mod_book: fixed the cancel import redirect URL 2012-10-01 10:05:22 +08:00
Sam Hemelryk
10654e32e2 MDL-34234 course: Fixed notice causing issues in JS when upgrade settings for 2.3+ not run 2012-10-01 09:58:09 +13: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
Nadav Kavalerchik
993dde5107 MDL-35708 - Right align user's information in quiz attempt review page , when in RTL mode (theme/standard & base) 2012-09-30 16:46:19 +02:00
Petr Škoda
d156ec9cea MDL-35701 bump up version and requirements of enrol_database
This should hopefully prevent attempts to blindly backport this to older stable branches.
2012-09-30 14:37:04 +02:00
Petr Škoda
7fa34d1066 MDL-35701 add enrol_database restore support 2012-09-30 14:36:57 +02:00
Petr Škoda
d2f26cec9d MDL-35701 add parameter for sync of one course only 2012-09-30 14:36:50 +02:00
Petr Škoda
f34518d956 MDL-35701 fix inline docs 2012-09-30 14:36:39 +02:00
Petr Škoda
9bb3a168cf MDL-35701 respect case of external column names in enrol_database
This fixes a regression which prevents referencing of uppercase columns in databases with case sensitive column names. Unfortunately users that relied on this incorrect behaviour may need to lowercase the column names in plugin settings.
2012-09-30 14:36:31 +02:00
Petr Škoda
13a2366cad MD-35701 implement enrol_database unit tests and fix minor issues
Includes fixes for minor problems discovered during testing:
* Removed invalid role->fullname sync option, there was never such fields in roles table and the name column is now usually empty.
* Empty category column now means use default category.
2012-09-30 14:36:23 +02:00
Petr Škoda
d34770032c Merge branch 'master_MDL-35562' of git://github.com/danmarsden/moodle into w40_MDL-35701_m24_enroldb 2012-09-30 14:35:57 +02:00