Commit graph

57211 commits

Author SHA1 Message Date
Petr Škoda
9f7b195fe6 MDL-35381 limit teachers to do permissions checks of enrolled users only 2012-11-06 00:08:13 +01:00
Sam Hemelryk
5252ec82a2 Merge branch 'MDL-35998' of git://github.com/mouneyrac/moodle
Conflicts:
	version.php
2012-11-06 11:00:16 +13:00
Sam Hemelryk
02adb1e30d Merge branch 'wip-mdl-29689' of git://github.com/rajeshtaneja/moodle 2012-11-06 10:34:06 +13:00
Sam Hemelryk
2ede3d7f35 Merge branch 'MDL-31629-master' of git://github.com/micaherne/moodle 2012-11-06 10:08:43 +13:00
Barbara Ramiro
2df53c3ed8 MDL-36277 Usability: New Activity icons in SVG and PNG formats 2012-11-06 00:02:31 +08:00
Barbara Ramiro
651f639ed0 MDL-36342 Usability: New icons for section in SVG and PNG formats 2012-11-05 23:43:02 +08:00
Dan Poltawski
918085d048 Revert "MDL-35260 Course formats may have settings, be enabled, disabled and uninstalled"
This reverts commit 45f93db912.
This reverts commit 3f798d4a3d.
2012-11-05 15:20:22 +08:00
Dan Poltawski
c296ab7a4d MDL-35260 - version bump for course format settings 2012-11-05 15:06:12 +08:00
Dan Poltawski
3f798d4a3d MDL-35260 - fix trailing whitespace 2012-11-05 15:05:13 +08:00
Dan Poltawski
1fc59b22de Merge branch 'wip-MDL-35260-master' of git://github.com/marinaglancy/moodle 2012-11-05 15:04:25 +08:00
Dan Poltawski
1872a0f26e MDL-35768 - fix trailing whitespace 2012-11-05 14:46:00 +08:00
Dan Poltawski
6b02cc4fc1 MDL-35768 - fix E_STRICT issue 2012-11-05 14:31:54 +08:00
Dan Poltawski
825876620b MDL-35768 - increment redirect_if_major_upgrade_required 2012-11-05 14:25:24 +08:00
Dan Poltawski
f041dc5ff7 Merge branch 'wip-MDL-35768-master' of git://github.com/marinaglancy/moodle 2012-11-05 14:08:28 +08:00
Dan Poltawski
940a1e8a17 Merge branch 'MDL-34270_master' of https://github.com/markn86/moodle 2012-11-05 14:05:48 +08:00
Dan Poltawski
ec0a080a07 MDL-34527 - fix trailing whitespace 2012-11-05 13:28:16 +08:00
Dan Poltawski
2c333485c4 Merge branch 'wip-MDL-34527-m24' of git://github.com/samhemelryk/moodle 2012-11-05 13:25:10 +08:00
Marina Glancy
22fae2a0dd MDL-36369 Non-admin managers could not access list of plugins 2012-11-05 12:31:19 +08:00
Mark Nelson
70c9c1956d MDL-34270 blocks: Adding clonepermissionsfrom to the new capability definitions 2012-11-05 12:28:09 +08:00
Marina Glancy
45f93db912 MDL-35260 Course formats may have settings, be enabled, disabled and uninstalled 2012-11-05 11:46:34 +08:00
Marina Glancy
8d8d4da44d MDL-36017 renamed formatoptions to courseformatoptions in externallib 2012-11-05 11:40:03 +08:00
Dan Poltawski
b59e928b69 Merge branch 'WIP-MDL-36069-master' of git://github.com/nadavkav/moodle 2012-11-05 11:31:46 +08:00
Sam Hemelryk
f3c306f4e0 MDL-21625 question: Fixed phpdocs 2012-11-05 16:29:28 +13:00
Sam Hemelryk
544c455357 Merge branch 'MDL-21625_b' of git://github.com/rwijaya/moodle 2012-11-05 16:27:43 +13:00
Marina Glancy
850acb3560 MDL-35768 MDL-36017 Avoid calling format_base::get_course() when not necessary
- If we want to check fields 'numsections' or 'hiddensections' call course_get_format()->get_format_options()
- We still use extended course object in course/edit.php, update_course(), create_course(), and inside course formats
2012-11-05 11:22:06 +08:00
Dan Poltawski
96846c2a9e Merge branch 'MDL-33621' of git://github.com/rwijaya/moodle 2012-11-05 11:12:32 +08:00
Dan Poltawski
770314dd37 Merge branch 'wip-mdl-35787' of git://github.com/rajeshtaneja/moodle 2012-11-05 10:58:46 +08:00
Aparup Banerjee
c770f07155 Merge branch 'wip-MDL-31824-master' of git://github.com/phalacee/moodle 2012-11-05 10:27:57 +08:00
Sam Hemelryk
1385f1d8fb Merge branch 'MDL-36107b' of git://github.com/srynot4sale/moodle 2012-11-05 15:07:21 +13:00
Andrew Davis
69632d42f0 MDL-35762 core_grade: adding unit tests for modinfolib.php 2012-11-05 09:35:10 +08:00
Andrew Davis
5e76227126 MDL-35762 core_grade: altered the code that determines whether an activity is visible on the user report 2012-11-05 09:35:10 +08:00
Sam Hemelryk
2e1e266c9a MDL-36362 cache: added simpledata definition option 2012-11-05 10:28:07 +13:00
Sam Hemelryk
c575fef5ec Merge branch 'm24_MDL-36359_Typo_admin_rediect' of https://github.com/scara/moodle 2012-11-05 08:35:25 +13:00
Matteo Scaramuccia
894a4f35b9 MDL-36360 Removed 'lock': cachestore_file_addinstance_form::configuration_definition() doesn't include it 2012-11-04 19:57:54 +01:00
Matteo Scaramuccia
d4d2f27c7f MDL-36360 Missing of cachestore_file::config_get_configuration_array() 2012-11-04 19:41:22 +01:00
Matteo Scaramuccia
7a65e286ca MDL-36359 Typo prevents 'Cancel' action in 'Add instance' to work as expected 2012-11-04 18:52:43 +01:00
Petr Škoda
05f6da14f7 MDL-33017 add new function for quickly finding out if user sees at least on course
This will be used in navigation.
2012-11-04 11:08:25 +13:00
Sam Hemelryk
58b602da8e MDL-33017 navigation: added current course and simplified loading 2012-11-04 11:06:49 +13:00
Tim Hunt
b5488ffdaa MDL-36347 quiz: formchangechecker should not obstruct auto-submit.
When the quiz time limit runs out, the quiz should be submitted
automatically, withouth formchangechecker popping up a dialogue.
2012-11-03 18:36:13 +11:00
Jerome Mouneyrac
92fa81d387 MDL-35998 get_site_info return current_language() 2012-11-02 18:03:20 +08:00
Rajesh Taneja
cfa4a78b75 MDL-36303 Calendar: remove html special chars from event link in calendar block 2012-11-02 15:02:27 +08:00
Dan Poltawski
0875c405fd Merge branch 'MDL-34270_master' of https://github.com/markn86/moodle 2012-11-02 14:52:33 +08:00
Mark Nelson
b291b59d6a MDL-34270 blocks: adding new add block capabilities 2012-11-02 14:32:01 +08:00
Barbara Ramiro
f96d1aeffe MDL-36338 Usability: New Edit icons in SVG and PNG formats 2012-11-02 14:03:12 +08:00
Marina Glancy
92d38668ac MDL-35768 MDL-36017 code style corrections 2012-11-02 13:53:48 +08:00
Dan Poltawski
3bd6e74afd Merge branch 'w42_MDL-35469_m24_geckover' of git://github.com/skodak/moodle 2012-11-02 12:07:11 +08:00
Andrew Robert Nicols
6caf3f5c74 MDL-33017 Show Currently viewed course in new node 2012-11-02 16:34:46 +13:00
Marina Glancy
e010b8503e MDL-35769 Give more flexibility for course formats to extend course navigation
global_navigation::load_course_sections() now has more parameters and ensures
that current section and activity is loaded. This will allow course formats
to display hierarchical sections in navigation and have one callback for
overwriting whole course navigation
2012-11-02 10:58:21 +08:00
Marina Glancy
8bc345339a MDL-36017 IMS-CC export does not filter result by numsections because it is now optional 2012-11-02 10:56:22 +08:00
Marina Glancy
0e984d9809 MDL-36017 Course now may have format-specific options, numsections and hiddensections are among them 2012-11-02 10:56:22 +08:00