Eloy Lafuente (stronk7)
a72ff024fb
Merge branch 'wip-MDL-34310-master' of git://github.com/marinaglancy/moodle
2012-08-27 20:12:18 +02:00
Eloy Lafuente (stronk7)
7b0c1bf02a
Merge branch 'MDL-34306' of git://github.com/timhunt/moodle
2012-08-27 20:06:19 +02:00
Eloy Lafuente (stronk7)
f599c81597
Merge branch 'MDL-34406_fullname' of git://github.com/andyjdavis/moodle
2012-08-27 20:03:01 +02:00
Eloy Lafuente (stronk7)
af08f5d0af
Merge branch 'MDL-34430' of git://github.com/timhunt/moodle
2012-08-27 18:50:29 +02:00
Eloy Lafuente (stronk7)
d683fcdf98
Merge branch 'MDL-34993' of git://github.com/timhunt/moodle
2012-08-27 18:35:23 +02:00
Eloy Lafuente (stronk7)
1edce590bd
Merge branch 'master_MDL-34994' of git://github.com/danmarsden/moodle
2012-08-27 18:17:55 +02:00
Eloy Lafuente (stronk7)
56f4e2a7a2
Merge branch 'w35_MDL-35072_m24_mancleanup' of git://github.com/skodak/moodle
2012-08-27 18:07:24 +02:00
Eloy Lafuente (stronk7)
4299f5f6a8
Merge branch 'MDL-35026' of git://github.com/timhunt/moodle
2012-08-27 17:53:59 +02:00
Eloy Lafuente (stronk7)
7f7cda07f2
Merge branch 'MDL-35003' of git://github.com/timhunt/moodle
2012-08-27 17:50:55 +02:00
Petr Škoda
eef59b1254
MDL-35070 fix incorrect enrol join
2012-08-27 17:20:47 +02:00
Petr Škoda
764094585b
MDL-35072 fix bogus left enrol join
...
Credit goes to Eloy, thanks.
2012-08-27 17:19:07 +02:00
Eloy Lafuente (stronk7)
05a024d393
Merge branch 'MDL-35023' of git://github.com/timhunt/moodle
2012-08-27 16:32:30 +02:00
Eloy Lafuente (stronk7)
d324394594
Merge branch 'MDL-35038' of git://github.com/timhunt/moodle
2012-08-27 16:24:17 +02:00
Eloy Lafuente (stronk7)
a787a404ea
Merge branch 'MDL-35048' of git://github.com/lazydaisy/moodle
2012-08-27 16:20:19 +02:00
Eloy Lafuente (stronk7)
6b2b869049
Merge branch 'MDL-35055' of git://github.com/timhunt/moodle
2012-08-27 16:16:14 +02:00
Eloy Lafuente (stronk7)
aec4783bf6
Merge branch 'w35_MDL-35061_m24_enrolfields' of git://github.com/skodak/moodle
2012-08-27 15:58:19 +02:00
Aparup Banerjee
f6bc04fe8a
Merge branch 'MDL-31633-master' of git://github.com/ankitagarwal/moodle
2012-08-27 17:26:14 +08:00
Aparup Banerjee
5cbda72684
Merge branch 'MDL-34907' of git://github.com/raymondAntonio/moodle
2012-08-27 17:07:46 +08:00
David Monllao
65cd3f9c16
MDL-35029 core_session Refresh guest session if autologin as guest is enabled
2012-08-27 17:03:11 +08:00
Aparup Banerjee
889754ad31
Merge branch 'MDL-35004' of git://github.com/raymondAntonio/moodle
2012-08-27 16:56:03 +08:00
Rajesh Taneja
25ac6d30f2
MDl-34606 Administration: id for clear button is set properly, and disabled on page load
2012-08-27 15:13:52 +08:00
Ankit Agarwal
b48ceab75b
MDL-26882 profile: Applying cap check (site:viewuseridentity) to email field in user profile
2012-08-27 14:48:50 +08:00
Ankit Agarwal
222ada3765
MDL-26882 profile: Apllying the cap check site:viewuseridentity to user profile
2012-08-27 14:48:50 +08:00
Aparup Banerjee
a1a5d8968e
Merge branch 'MDL-34936-master-1' of git://github.com/andrewnicols/moodle
2012-08-27 14:20:15 +08:00
Rajesh Taneja
9e7cd6e7a5
MDL-34537 Enrolments: Assign alternative odd and even class to manual enrol popup
2012-08-27 13:59:09 +08:00
Aparup Banerjee
d835cdb627
Merge branch 'MDL-34996_master' of git://github.com/grabs/moodle
2012-08-27 13:46:40 +08:00
Aparup Banerjee
13a20081d3
MDL-34429 fixed whitespace.
2012-08-27 12:07:15 +08:00
Aparup Banerjee
ed170bd86c
Merge branch 'wip-MDL-34429-master' of git://github.com/abgreeve/moodle
2012-08-27 12:04:45 +08:00
Aparup Banerjee
7cc32281fc
Merge branch 'MDL-32386b' of git://github.com/srynot4sale/moodle
2012-08-27 11:30:44 +08:00
AMOS bot
3b062da97b
Automatically generated installer lang files
2012-08-27 00:32:45 +00:00
Aaron Barnes
1caeb4b450
MDL-32386 completion: Fix incorrect method parameters
2012-08-27 10:57:52 +12:00
Mary Evans
96a25065da
MDL-35048 theme_formal_white: removed p {margin:0} from style/formal_white.css which was causing a regression in some areas of theme
2012-08-26 20:02:15 +01:00
Petr Škoda
6f6c9e5c6a
MDL-35072 coding style cleanup in enrol_manual
2012-08-26 16:37:49 +02:00
Petr Škoda
005e57a225
MDL-35052 show all enrolled users in enrol UI included those enrolled via disabled plugins
2012-08-26 16:28:18 +02:00
Petr Škoda
d9669db9b3
MDL-35070 coding style cleanup in enrol_self
2012-08-26 16:02:38 +02:00
Petr Škoda
dd6b1f15cf
MDL-23875 add option to limit self-enrol to cohort members only
2012-08-26 15:56:01 +02:00
Petr Škoda
882fb83519
MDL-35061 add more custom fields for enrol instances
...
This delays the splitting of plugin specific enrol info from shared enrol table.
2012-08-26 15:55:03 +02:00
Petr Škoda
84bc3773cc
MDL-35064 add option to keep enrolments when uninstalling plugin
2012-08-26 12:17:11 +02:00
Tim Hunt
19de315e83
MDL-34306 gift question format: allow import of general feedback
...
This change introduces #### as a separator for general feedback. You need
to add ####General feedback goes here as the last thing inside the {...}.
For example
// question: 123 name: Shortanswer
::Shortanswer::Which is the best animal?{
=Frog#Good!
=%50%Cat#What is it with Moodlers and cats?
=%0%*#Completely wrong
####Here is some general feedback!
}
Note that this change is not entirely backwards compatible. It will break
any existing GIFT file where the character sequence #### us used between the
{} as part of the question. This seems highly unlikely.
2012-08-25 14:27:40 +01:00
Petr Škoda
33c7a2d121
MDL-35060 remove unused session test file
2012-08-25 10:14:38 +02:00
Andreas Grabs
2c65cd8462
MDL-34996 - Improve help text for Feedback dependancies
2012-08-24 23:08:55 +02:00
Andreas Grabs
9b90584f43
MDL-34952 - change get_info() to public access
2012-08-24 21:56:45 +02:00
Tim Hunt
aa9d6e4300
MDL-32464 qformat multianswer: fix missing include.
...
Also, add a sample file that can be used for testing, and add a unit
test to verify this is working.
2012-08-24 16:56:18 +01:00
Andrew Robert Nicols
fd0680ff4a
MDL-34936 Warn if the sectioncache property is missing in a get_fast_modinfo call
2012-08-24 15:43:38 +01:00
Tim Hunt
aa5f05110f
MDL-35055 question import: slight error with the Match grades option.
...
Even in the 'Error if grade not listed case', it was applying a small
tolerance. In the case of a fuzzy match, it was returning the inexact
grade from the import file, rather than the precise grade that Moodle
was expecting.
That causes problems when the editing form is displayed, because the
value from the database does not match any of the available options, so
the grade is changed to 0%.
2012-08-24 15:34:20 +01:00
sam marshall
1d1917aeaa
MDL-31973 Groups: groups_members table should have 'component', 'itemid' fields
2012-08-24 15:30:13 +01:00
Petr Škoda
b3aefe3cc8
MDL-34990 improve custom toolbar setting parsing
...
It is probably better to parse the setting every time because somebody may put unsupported values directly into config.php, performance should not be an issue because we do not have editors on every page.
2012-08-24 16:11:00 +02:00
Petr Škoda
0bc9b897f9
MDL-34879 add upgrade.txt notes to editor_tinymce
2012-08-24 16:11:00 +02:00
Petr Škoda
883ecce0e9
MDL-34955 fix missing string
2012-08-24 16:11:00 +02:00
Petr Škoda
0b7858221c
MDL-34955 add full TinyMCE subplugin management
2012-08-24 16:11:00 +02:00