moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63937 commits 37 branches 540 tags 1.3 GiB
Commit graph

63937 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Hemelryk
c0382dd012 Merge branch 'MDL-40735_lesson' of https://github.com/andyjdavis/moodle 2013-09-10 15:44:49 +12:00
Dan Poltawski
f841aa780d Merge branch 'MDL-38570-master' of https://github.com/timgus/moodle 2013-09-10 11:13:29 +08:00
Dan Poltawski
30d6c394e2 Merge branch 'MDL-41147-master' of git://github.com/sammarshallou/moodle 2013-09-10 10:27:59 +08:00
Andrew Nicols
4dab1c39e2 MDL-38661 JavaScript: Ensure that ARIA tags are set when expanding/collapsing content 2013-09-10 03:22:44 +01:00
Andrew Nicols
1574e6529d MDL-38661: Add keyboard support for expansion 2013-09-10 03:17:13 +01:00
Damyon Wiese
b4c6b42eb6 Merge branch 'wip-MDL-40347-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
	theme/upgrade.txt
 2013-09-10 09:40:10 +08:00
Damyon Wiese
d0eaa8bf49 Merge branch 'MDL-41626-master' of github.com:StudiUM/moodle 2013-09-10 09:30:56 +08:00
Sam Hemelryk
cb7ca00c55 Merge branch 'MDL-41600' of git://github.com/aolley/moodle 2013-09-10 13:12:13 +12:00
Sam Hemelryk
a63d1e2871 Merge branch 'wip-MDL-41556-master' of git://github.com/abgreeve/moodle 2013-09-10 13:07:37 +12:00
Damyon Wiese
934c70040c Merge branch 'MDL-41253-master' of git://github.com/sammarshallou/moodle 2013-09-10 09:03:42 +08:00
Sam Hemelryk
3eb032d743 NOBUG: fixed whitespace 2013-09-10 13:02:35 +12:00
Adam Olley
910051b798 MDL-41600: qformat_blackboard_six Fix test_import_match fail w/ddmatch 
With qtype_ddmatch installed, the unit tests for qformat_blackboard_six
fail as they generate ddmatch questions instead of match ones. This
patch checks for ddmatch and changes the test to expect that instead if
its installed.
 2013-09-10 09:16:51 +09:30
Sam Hemelryk
a775f2c96d Merge branch 'MDL-40731_headings' of https://github.com/andyjdavis/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-09-10 11:22:04 +12:00
Sam Hemelryk
bee0a508ef Merge branch 'MDL-41558-master' of git://github.com/ankitagarwal/moodle 2013-09-10 11:16:30 +12:00
Sam Hemelryk
8242ca0c34 MDL-32862 backup: fixed missing global 2013-09-10 10:57:20 +12:00
Sam Hemelryk
68d3e7682a Merge branch 'MDL-41167-master' of git://github.com/sammarshallou/moodle 2013-09-10 10:31:59 +12:00
Sam Hemelryk
12d50d8216 Merge branch 'wip-MDL-32862-master' of git://github.com/abgreeve/moodle 2013-09-10 09:38:46 +12:00
Sam Hemelryk
9b6415dd38 Merge branch 'MDL-29378-survey' of git://github.com/mudrd8mz/moodle 2013-09-10 09:36:24 +12:00
sam marshall
a7a64d774a MDL-41253 Restore: Mechanism to display progress during UI stages 2013-09-09 12:42:07 +01:00
Dan Poltawski
0df3254212 Merge branch 'MDL-41254-m' of git://github.com/micaherne/moodle 2013-09-09 18:04:05 +08:00
Dan Poltawski
cdf6fc243e Merge branch 'MDL-29069' of https://github.com/bostelm/moodle 2013-09-09 17:37:49 +08:00
Andrew Davis
e5d932cce2 MDL-40734 mod_glossary: cleaned up some headings 2013-09-09 17:30:12 +08:00
David Mudrák
badfeed04c MDL-29378 Fix the recent string modification 
But accident, I have modified the string 'collesaintro' in the previous patch.
The correct string to be amended is 'collesapintro'.
 2013-09-09 11:19:48 +02:00
Dan Poltawski
8eb80a2c42 Merge branch 'MDL-37804' of github.com:recreate/moodle 2013-09-09 17:13:22 +08:00
Mary Evans
ddfc16c87e MDL-40575 theme_bootstrapbase: Unable to scroll language menu in theme/clean. 2013-09-09 16:11:00 +08:00
Dan Poltawski
867af9c4f3 Merge branch 'MDL-41163-master' of git://github.com/sammarshallou/moodle 2013-09-09 15:29:48 +08:00
Dan Poltawski
8250a11688 MDL-41438 version bump 2013-09-09 14:25:07 +08:00
Dan Poltawski
76c88eaffb Merge branch 'MDL-41438' of git://github.com/rwijaya/moodle 2013-09-09 14:23:41 +08:00
Damyon Wiese
426cdef0bc Merge branch 'wip-MDL-41517-master' of git://github.com/marinaglancy/moodle 2013-09-09 12:43:32 +08:00
Damyon Wiese
437b86f0ad MDL-18275 Calendar types: Add a major version + redirect for ci server fail. 2013-09-09 11:25:02 +08:00
Damyon Wiese
7bb89ae042 Merge branch 'master_MDL-41290' of git://github.com/danmarsden/moodle 2013-09-09 10:46:59 +08:00
Damyon Wiese
1320c3177b Merge branch 'MDL-18375_master' of git://github.com/markn86/moodle 2013-09-09 10:41:12 +08:00
Rossiani Wijaya
bea4ed1b44 MDL-41621 Assign mod: fix page heading levels 2013-09-09 10:24:19 +08:00
Dan Poltawski
d95e8420df Merge branch 'MDL-41151-master' of git://github.com/sammarshallou/moodle 2013-09-09 10:22:02 +08:00
Rossiani Wijaya
4e5f53e90e MDL-41566 page resource: fix page heading levels. 
Also removing printheading options setting.
 2013-09-09 10:19:11 +08:00
Rossiani Wijaya
7265e7c784 MDL-41564 folder resource: fix page heading levels 2013-09-09 10:17:28 +08:00
Rossiani Wijaya
5def24cf32 MDL-40736 Survey: improve heading levels and styling 2013-09-09 09:50:42 +08:00
Rossiani Wijaya
846cebe5b3 MDL-40687 Feedback: improve page heading levels and layouts 2013-09-09 09:48:05 +08:00
Rossiani Wijaya
d8a6d49c5f MDL-40686 book: fix heading level and styling 2013-09-09 09:46:27 +08:00
Rossiani Wijaya
3b42864d65 MDL-41438 core renderer: additional patch to remove .main definition from all core themes 2013-09-09 09:39:03 +08:00
Rossiani Wijaya
699e2fd0de MDL-41438 core_renderer: Update the parameters for heading() and heading_with_help(). 
heading(), change the default value for classes from 'main' to null.
heading_with_help(), add 2 additional parameters for level and classnames. Default value of level is set to 2 and classnames is set to null.

With the changes for heading_with_help(), icon image vertical alignment needs to be adjusted, so it display in the middle of the heading.

Also added some notes in theme/upgrade.txt file.
 2013-09-09 09:39:03 +08:00
AMOS bot
e2b3dc4b77 Automatically generated installer lang files 2013-09-09 00:44:14 +00:00
Yuliya Bozhko
4c3f809b21 MDL-41637 badges: Update modules ids retrieval 2013-09-09 11:55:47 +12:00
Yuliya Bozhko
497c676f0e MDL-41662 badges: Fix viewing user profile when not logged in 2013-09-09 11:21:39 +12:00
Paul Nicholls
59de735095 MDL-41451 - formslib: use create_function instead of inline function 
As per MDL-39432, closure-style inline functions can result in fatal
errors when using eAccelerator and thus should be avoided.
 2013-09-09 11:21:33 +12:00
Sam Hemelryk
33909ed001 Merge branch 'MDL-38794' of https://github.com/prateeksachan/moodle 2013-09-09 11:12:56 +12:00
Sam Hemelryk
771080ba7d Merge branch 'MDL-41417_master' of https://github.com/markn86/moodle 2013-09-09 10:54:11 +12:00
Sam Hemelryk
fb76f7492e Merge branch 'MDL-29378-survey' of git://github.com/mudrd8mz/moodle 2013-09-09 10:48:13 +12:00
Sam Hemelryk
58cc269d0c Merge branch 'w37_MDL-28094_m26_subdirs' of https://github.com/skodak/moodle 2013-09-09 10:19:00 +12:00
Matt Petro
d871a0df65 MDL-41660 backup ims-cc: Use correct temp directory 2013-09-08 17:28:33 -04:00