Marina Glancy
a3f66bdeac
MDL-36968 Move function print_recent_activity() to the block recent_activity
2013-01-16 16:13:04 +11:00
Dan Poltawski
a201b57657
Merge branch 'MDL-36412-master' of git://github.com/sammarshallou/moodle
2013-01-16 09:54:26 +08:00
Eloy Lafuente (stronk7)
3431860f54
Merge branch 'w02_MDL-36988_m25_switchrole' of git://github.com/skodak/moodle
2013-01-16 02:27:48 +01:00
Sam Hemelryk
ec16ef1f85
Merge branch 'wip-MDL-35818-master' of git://github.com/phalacee/moodle
2013-01-16 11:03:39 +13:00
Sam Hemelryk
00ba185d52
Merge branch 'wip-MDL-36967-master' of git://github.com/marinaglancy/moodle
...
Conflicts:
lib/deprecatedlib.php
2013-01-16 11:01:16 +13:00
Eloy Lafuente (stronk7)
493d8f781c
Merge branch 'MDL-37354-master' of git://github.com/mouneyrac/moodle
...
Conflicts:
message/tests/externallib_test.php
2013-01-15 21:50:31 +01:00
Petr Škoda
aae028d9e3
MDL-36988 cleanup role switching
...
This patch uses local URLs in parameters because it is more compatible
with various security hacks. Session key is not added automatically to
return url for safety reasons - we do not want to execute some random
action again. POST pages are now returned to course page too.
2013-01-15 21:44:20 +01:00
Eloy Lafuente (stronk7)
dcb21e6cc1
Merge branch 'wip-mdl-37062' of git://github.com/rajeshtaneja/moodle
2013-01-15 20:04:21 +01:00
Eloy Lafuente (stronk7)
ada893d339
Merge branch 'MDL-36554' of git://github.com/rwijaya/moodle
2013-01-15 18:02:26 +01:00
Eloy Lafuente (stronk7)
dfcb38a1c7
Merge branch 'wip-MDL-37207-master' of git://github.com/marinaglancy/moodle
2013-01-15 18:00:17 +01:00
Dan Poltawski
0efd8de527
Merge branch 'w02_MDL-36898_m25_ccontact' of git://github.com/skodak/moodle
2013-01-15 13:57:39 +08:00
Dan Poltawski
9d40849d46
Merge branch 'MDL-37162_master' of git://github.com/pauln/moodle
2013-01-15 13:23:02 +08:00
Dan Poltawski
fb8585521a
Merge branch 'wip-MDL-36035-m25' of git://github.com/samhemelryk/moodle
2013-01-15 11:56:12 +08:00
Dan Poltawski
33919cca60
MDL-37085 - fix trailing whitespace
2013-01-15 11:42:30 +08:00
Sam Hemelryk
c8d3475e17
Merge branch 'wip-MDL-37085-master' of git://github.com/marinaglancy/moodle
2013-01-15 16:30:36 +13:00
Damyon Wiese
a83dd077f8
MDL-37430 Course - Make modules created in hidden sections visible when section is made visible.
2013-01-15 11:16:07 +08:00
Dan Poltawski
2254fb2764
Merge branch 'MDL-37194-master' of git://github.com/mouneyrac/moodle
2013-01-15 10:42:31 +08:00
Paul Nicholls
d7c29c2257
MDL-32652 - Make block drag-drop work throughout Moodle
...
Other than shifting the initialisation from course/lib.php to
lib/outputrequirementslib.php, some workarounds/tweaks were required
in order to make it work correctly on admin pages and My Home.
2013-01-15 14:55:31 +13:00
Eloy Lafuente (stronk7)
eaa00a071c
Merge branch 'wip-MDL-37453-master' of git://github.com/marinaglancy/moodle
2013-01-15 00:06:06 +01:00
Sam Hemelryk
5a3d98c26d
Merge branch 'wip-MDL-37206-master' of git://github.com/marinaglancy/moodle
2013-01-15 10:48:53 +13:00
Marina Glancy
8afb1cc8f8
MDL-37206 preload course format renderer in course/view.php
...
Also fixed bug with hardcoded default 'weeks' format
2013-01-14 15:14:08 +11:00
Marina Glancy
7b59f5b32a
MDL-37453 fixing regression from MDL-36550 - label show/hide in AJAX works incorrectly
2013-01-14 15:13:14 +11:00
Marina Glancy
a03dfb7dbe
MDL-37207 Add modchoosertoggle in renderer to allow themes to override
2013-01-14 15:10:07 +11:00
Marina Glancy
ff233851a0
MDL-36967 Deprecate function print_overview()
2013-01-14 15:05:31 +11:00
Marina Glancy
9a36be7361
MDL-37085 Properly deprecated functions print_xxx() from course/lib.php
...
- get_print_section_cm_text()
- print_section_add_menus()
- print_section()
- make_editing_buttons()
2013-01-14 15:01:28 +11:00
Marina Glancy
c58a25d6eb
MDL-37085 Move print_section() to the course renderer
...
Added two functions in the renderer:
- core_course_renderer::course_section_cm_list()
- core_course_renderer::course_section_cm()
2013-01-14 15:01:27 +11:00
Marina Glancy
ed513fad52
MDL-37085 partly moved code from print_section() to renderer
...
- added function core_course_renderer::course_section_cm_name()
- added function core_course_renderer::course_section_cm_text()
- added function core_course_renderer::course_section_cm_availability()
2013-01-14 15:01:26 +11:00
Marina Glancy
5c016ab30d
MDL-37085 fixed mess with code overwriting cm_info properties
...
In case when groupmode is forced by the course we should take it from the
course and not overwrite cm_info::groupmode externally
2013-01-14 15:01:25 +11:00
Marina Glancy
7e29340f7c
MDL-37085 Moved completion info box rendering code to renderer
...
Was part of function print_section(), now it is
new function core_course_renderer::course_section_cm_completion()
2013-01-14 15:01:24 +11:00
Marina Glancy
9a6aa5c17d
MDL-37085 Substitute function print_section_add_menus() with core_course_renderer::course_section_add_cm_controls()
2013-01-14 15:01:23 +11:00
Marina Glancy
697ff99997
MDL-37085 Load modchooser only when needed
2013-01-14 15:01:23 +11:00
Marina Glancy
170793359a
MDL-37085 get_module_metadata() now returns link as moodle_url instead of string
2013-01-14 15:01:22 +11:00
Marina Glancy
f89c53f679
MDL-37085 Substitute get_print_section_cm_text() with cm_info functions
2013-01-14 15:01:21 +11:00
Marina Glancy
f558b291c1
MDL-37085 separated logic and html in make_editing_buttons()
...
- added function course_get_cm_edit_actions()
- added function core_course_renderer::course_section_cm_edit_actions()
- removed completely presently not working moveup/movedown controls
- removed not working duplicate controls from front page
2013-01-14 15:01:20 +11:00
Marina Glancy
49aa038b4e
MDL-37085 Minor UI and code improvements in print_section()
2013-01-14 15:01:19 +11:00
Rossiani Wijaya
6fc61f2d08
MDL-36554 Admin settings: make tables class consistent throughout admin settings
2013-01-14 10:10:54 +08:00
Jason Fowler
b4a7ce9e71
MDL-35818 - Enrolment - Changing all enrolment method icon alt text attributes to include the name of the course
2013-01-14 09:46:04 +08:00
Sam Hemelryk
f5c51a6d64
Merge branch 'MDL-35568_dndupload_hidden' of git://github.com/davosmith/moodle
2013-01-14 13:51:48 +13:00
Sam Hemelryk
469749706a
Merge branch 'MDL-36095-master' of git://github.com/sammarshallou/moodle
2013-01-14 12:24:06 +13:00
Sam Hemelryk
8d9c15a44e
Merge branch 'MDL-36511' of git://github.com/srynot4sale/moodle
2013-01-14 12:13:00 +13:00
Sam Hemelryk
f1ac8520ae
MDL-36035 course: renamed new functions and cleaned up docs
2013-01-11 15:03:49 +13:00
Brian King
e226a86d76
MDL-36035 course: reduce database queries when calling print_whole_category_list
...
On a Moodle with 1252 course categories, this reduces the database
reads from 1313 to 62 for course/index.php
2013-01-11 15:03:32 +13:00
Frederic Massart
95d1d0373b
MDL-34435 reports: Log category actions
2013-01-10 15:10:22 +08:00
Dan Poltawski
319d937602
Revert "Merge branch 'wip-MDL-31750-master' of git://github.com/abgreeve/moodle"
...
This reverts commit 8361f557a1
,
2b9e957a27
and
fae51910bf
2013-01-10 11:17:33 +08:00
Jerome Mouneyrac
fb695f6e3d
MDL-37354 clean return value for each externallib PHPUnit tests
2013-01-09 13:47:01 +08:00
Aaron Barnes
16d89d6604
MDL-36511 course: Save "completion starts on enrolment" disabled state
2013-01-09 15:29:57 +13:00
Eloy Lafuente (stronk7)
8361f557a1
Merge branch 'wip-MDL-31750-master' of git://github.com/abgreeve/moodle
...
Conflicts:
course/tests/courselib_test.php
2013-01-09 01:31:50 +01:00
Paul Nicholls
0d47afe69d
MDL-37162: Use CSS to make mod show/hide icons not look "clickable" in hidden sections
...
Previously, the resource toolbox initialiser was using JS to find the show/hide icon, then find its section ancestor, then check if the section was hidden - only to pointlessly set pointer:auto if it was. That didn't meet the aim stated in the comments ("Disable" show/hide icons (change cursor to not look clickable) if section is hidden), but this patch meets that goal with a single CSS rule.
2013-01-09 11:44:15 +13:00
Sam Hemelryk
f44e7d0a77
Merge branch 'MDL-36357' of git://github.com/danpoltawski/moodle
...
Conflicts:
user/view.php
2013-01-09 09:34:22 +13:00
Jerome Mouneyrac
c2bc5a7008
MDL-37194 activity chooser displays entire list of default activities/resources
2013-01-08 16:39:55 +08:00