Barbara Ramiro
447cfc94a2
MDL-36622 usability: New icons on course category page
2012-11-15 19:47:12 +08:00
Dan Poltawski
b34e88508b
MDL-36526 calendar: Convert webcal:// to http://
...
Curl doesn't understand webcal, so needs to use http. Also fixed some
php warnings spotted during testing.
2012-11-15 15:48:24 +08:00
Dan Poltawski
391678f6fa
Merge branch 'MDL-36331_redirect' of git://github.com/andyjdavis/moodle
2012-11-15 14:40:42 +08:00
Dan Poltawski
491391873e
Merge branch 'MDL-36061_userid' of git://github.com/andyjdavis/moodle
2012-11-15 14:32:51 +08:00
Dan Poltawski
21dfaa0133
Merge branch 'wip-MDL-35770-master' of git://github.com/marinaglancy/moodle
2012-11-15 13:51:07 +08:00
Marina Glancy
399ad6bf3b
MDL-35770 Include file defining base class in order to work correctly in cron
2012-11-15 13:26:28 +08:00
Dan Poltawski
f138b38705
Merge branch 'w47_MDL-36524_m24_ieagain' of git://github.com/skodak/moodle
2012-11-15 11:20:12 +08:00
Aparup Banerjee
6eff995f08
MDL-30643 fixed whitespace
2012-11-15 11:16:35 +08:00
Aparup Banerjee
244e907235
Merge branch 'MDL-30643_master-log-speed' of git://github.com/tbannister/moodle
...
Conflicts:
lib/tests/statslib_test.php
2012-11-15 11:15:00 +08:00
Andrew Davis
69bcca5e9c
MDL-36061 core_grade: added some unit tests related to refresh_grades()
2012-11-15 11:14:21 +08:00
Dan Poltawski
f315d159c8
Merge branch 'wip-MDL-35770-master' of git://github.com/marinaglancy/moodle
...
Conflicts:
course/format/lib.php
2012-11-15 10:59:17 +08:00
Dan Poltawski
e4a9cc642f
Merge branch 'MDL-36417-master' of git://github.com/FMCorz/moodle
2012-11-15 10:39:08 +08:00
Dan Poltawski
211f815719
Merge branch 'MDL-36526-master' of git://github.com/ankitagarwal/moodle
2012-11-15 10:06:00 +08:00
Dan Poltawski
a3f3ea2684
MDL-36111 cache: remove double semicolons
...
Thanks to Matteo Scaramuccia!
2012-11-15 09:25:56 +08:00
Dan Poltawski
532a704d95
Merge branch 'wip-MDL-36576-m24' of git://github.com/amygroshek/moodle
2012-11-15 08:56:43 +08:00
Amy Groshek
8ebb84e281
MDL-36576 - change generalbox classname to generaltable to fix rounded corners on the table background color
2012-11-14 12:49:41 -06:00
Petr Škoda
9172fd82b7
MDL-36524 do not set meta tag for IE compatibility, header should be enough
2012-11-14 19:42:24 +01:00
Tyler Bannister
68203f451c
MDL-30643 - Fixed group by for MSSQL and Oracle.
...
- MSSQL and Oracle don't allow column aliases to be used in group by.
2012-11-14 09:46:50 -05:00
Marina Glancy
081c8f7fe0
MDL-36594 Add function format_base::is_section_current()
...
- added function format_base::is_section_current()
- overwritten in format_weeks::is_section_current()
- deprecated function format_section_renderer_base::is_section_current()
2012-11-14 15:54:13 +08:00
Frederic Massart
253251a804
MDL-36446 usability: Resource icon on activity block read from page module
2012-11-14 15:00:40 +08:00
Marina Glancy
1b2581f430
MDL-35770 Moved format_weeks_get_section_dates() to format_weeks::get_section_dates()
2012-11-14 14:31:07 +08:00
Dan Poltawski
cbb0459962
Merge branch 'MDL-36561-master-int' of git://github.com/FMCorz/moodle
2012-11-14 14:29:48 +08:00
Dan Poltawski
43b8730381
Merge branch 'MDL-36449-master-int' of git://github.com/FMCorz/moodle
2012-11-14 14:26:06 +08:00
Frederic Massart
85947dcc22
MDL-36449 usability: Fixed spinner position in lightbox
2012-11-14 14:24:51 +08:00
Dan Poltawski
cc94106b71
Merge branch 'MDL-36565-master-int' of git://github.com/FMCorz/moodle
2012-11-14 14:16:30 +08:00
Dan Poltawski
ebdbc6b781
Merge branch 'MDL-36323-master-int' of git://github.com/FMCorz/moodle
2012-11-14 14:10:49 +08:00
Barbara Ramiro
b7494afe49
MDL-36323 usability: Final icons for i/assignroles and i/switchrole
2012-11-14 14:07:40 +08:00
Frederic Massart
fbb207c57a
MDL-36323 usability: New icon names to assign and switch roles
2012-11-14 14:07:40 +08:00
Barbara Ramiro
57dba02813
MDL-36323 usability: Resized icons to 16x16
2012-11-14 14:07:40 +08:00
Frederic Massart
045d946ccc
MDL-36323 usability: CSS for block headers
2012-11-14 14:07:40 +08:00
Frederic Massart
11f8718780
MDL-36323 usability: Normalising icons used in blocks
2012-11-14 14:07:40 +08:00
Marina Glancy
0f070867b8
MDL-35770 Converted weeks format to new course formats API
2012-11-14 13:58:40 +08:00
Marina Glancy
222cd9c996
MDL-35770 Converted topics format to new course formats API
2012-11-14 13:58:35 +08:00
Marina Glancy
62a3f7ef46
MDL-35770 Created class format_weeks as copy of format_legacy
2012-11-14 13:58:34 +08:00
Marina Glancy
2fb8c9a2e9
MDL-35770 Created class format_topics as copy of format_legacy
2012-11-14 13:58:34 +08:00
Marina Glancy
bf1a9494a4
MDL-35770 Converted social format to new course formats API
2012-11-14 13:58:28 +08:00
Marina Glancy
cad5cba676
MDL-35770 Converted scorm format to new course formats API
2012-11-14 13:58:21 +08:00
Marina Glancy
5ef23705f6
MDL-36048 Allow course formats to add course headers and footers
...
- Added functions in class format_base
- Added global functions in course/lib.php
- Added calling of course header/footer functions to the base theme
- output renderer checks if theme calls the coures content header/footer functions, if not calls them explicitly and displays a development warning
2012-11-14 13:50:10 +08:00
Dan Poltawski
1720550b5d
Merge branch 'MDL-36575_modLtiGenerator' of git://github.com/moodlerooms/moodle
2012-11-14 12:22:54 +08:00
Frederic Massart
81063d1fe6
MDL-36565 mod_url: The default activity icon is the module icon
2012-11-14 12:21:57 +08:00
Frederic Massart
d5dfb8d621
MDL-36444 themes: Fixed margin of activities on course page
2012-11-14 12:05:26 +08:00
Frederic Massart
10994f27a1
MDL-36449 usability: Improved renaming toolbox and alignment on course page
2012-11-14 11:38:11 +08:00
Frederic Massart
8a3b8918cb
MDL-36449 usability: Course drag and drop field styling
2012-11-14 11:38:10 +08:00
Frederic Massart
bb128107e3
MDL-36449 usability: Normalising icons on course page
2012-11-14 11:38:06 +08:00
Dan Poltawski
7fc7a8b94c
Merge branch 'w46_MDL-36457_m24_jsmin' of git://github.com/skodak/moodle
2012-11-14 11:32:52 +08:00
Dan Poltawski
8051e85a3f
Merge branch 'w46_MDL-36283_m24_cohortmembers' of git://github.com/skodak/moodle
2012-11-14 11:25:54 +08:00
Frederic Massart
f7d6e65032
MDL-36417 course: Unit tests for section visibility
2012-11-14 11:22:20 +08:00
Dan Poltawski
124b3fcef7
Merge branch 'MDL-35358' of git://github.com/rwijaya/moodle
2012-11-14 11:16:47 +08:00
Dan Poltawski
3484a69861
Merge branch 'wip-MDL-36267-master' of git://github.com/marinaglancy/moodle
2012-11-14 10:45:19 +08:00
Dan Poltawski
5ebe0ca37a
Merge branch 'MDL-26660-master' of git://github.com/FMCorz/moodle
2012-11-14 10:33:45 +08:00