Sam Hemelryk
c35fa27c89
Merge branch 'MDL-35198-MOODLE_23_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE
2012-10-16 11:23:02 +08:00
Dan Poltawski
d50d615d7f
Merge branch 'MDL-33815_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
2012-10-16 11:09:06 +08:00
Adrian Greeve
0c09da65ce
MDL-35265 - blog - Update code for removing orphaned blog association data.
...
Conflicts:
version.php
2012-10-16 10:55:49 +08:00
Dan Poltawski
6244126d6d
Merge branch 'wip-MDL-32184-s23' of http://github.com/phalacee/moodle into MOODLE_23_STABLE
2012-10-16 10:46:49 +08:00
Sam Hemelryk
52d2556ee5
Merge branch 'MDL-35664-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
2012-10-16 10:42:42 +08:00
Sam Hemelryk
86606ad75d
Merge branch 'MDL-35892-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
2012-10-16 10:31:51 +08:00
Dan Poltawski
25ba0f4839
MDL-21801 - mod_lesson: version bump
...
To reflect the new (ppt-less) state
2012-10-16 10:30:31 +08:00
Dan Poltawski
a83497790f
Merge branch 'MDL-21801_b_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
2012-10-16 10:30:00 +08:00
Sam Hemelryk
5004ad85b7
Merge branch 'MDL-35726-m23' of git://github.com/netspotau/moodle-mod_assign into MOODLE_23_STABLE
2012-10-16 10:16:19 +08:00
Adrian Greeve
caa0e70577
MDL-25275 - mod/data - Added a check box to eliminate date searches if desired.
2012-10-16 10:09:24 +08:00
Mark Nielsen
6e763244ed
MDL-34837 backup: Restore does not fail when some courses have the same name
2012-10-15 17:19:37 +08:00
Dan Poltawski
59d9b1b99d
Merge branch 'w42_MDL-35854_m23_usergenerator' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2012-10-15 16:03:59 +08:00
Dan Poltawski
2558abe170
Merge branch 'w42_MDL-35917_m23_cohortdoc' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2012-10-15 15:59:15 +08:00
Aparup Banerjee
60e1dfd078
Merge branch 'MDL-31010-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE
2012-10-15 15:53:40 +08:00
Aparup Banerjee
226398e7d0
Merge branch 'MDL-35986' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
2012-10-15 14:16:06 +08:00
Dan Poltawski
0f46bd4550
Merge branch 'wip-MDL-35661-MOODLE_23_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE
2012-10-15 13:31:22 +08:00
Ankit Agarwal
4981d12420
MDL-35889 blocks: Adding a legend to the fieldset
2012-10-15 11:24:13 +08:00
Frederic Massart
4f977aea5e
MDL-35892 repository: prepare_listing recursively prepares the data
2012-10-15 09:46:00 +08:00
Frederic Massart
82525f5963
MDL-35664 filepicker: Filepicker knows about the current path and uses it
2012-10-15 09:45:59 +08:00
AMOS bot
887d6e175e
Automatically generated installer lang files
2012-10-15 00:34:57 +00:00
Eloy Lafuente (stronk7)
6738413b33
weekly release 2.3.2+
2012-10-15 00:20:33 +02:00
Eloy Lafuente (stronk7)
92e9c3d09f
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE
2012-10-15 00:07:39 +02:00
Eloy Lafuente (stronk7)
8d800a1b8e
Revert "MDL-31968 Make NTLM REMOTE_USER format configurable by the admin"
...
This reverts commit af861e14dc
.
Note that MDL-31968 will be in charge of backporting this to stables
if everything goes well under master (once MDL-31968 is tested and closed)
2012-10-14 23:22:08 +02:00
Petr Škoda
b66c3031f6
MDL-35917 fix cohort phpdocs
...
Credit goes to Brian Kremer, thanks!
2012-10-13 17:55:59 +02:00
Petr Škoda
7358b1742f
MDL-35854 fix username generator
...
This eliminates infinite loop and also fixes potentially invalid email derived from usernames created from unicode first/last name.
2012-10-13 09:56:48 +02:00
Mary Evans
cc3f17d86d
MDL-35986 theme_canvas: add custommenu and block-region to layout files general.php, frontpage.php and report.php to fix regression in theme/serenity since MDL-33110.
2012-10-12 22:57:39 +01:00
Damyon Wiese
0e8aa5027e
MDL-35726: Use a different form identifier for each form when using "Save and next"
...
This prevents a bug where the next student feedback will default to the values that
were on the last submitted form. This is a similar case to having multiple instances
of the same form on the same page - each one needs a unique identifier to distinguish
between them. In this case I include the $rownum which changes as you go to each student
in the list.
2012-10-12 12:07:19 +08:00
Jonathan Harker
84b3cbab33
MDL-36015 lib/bennu: use static functions correctly.
2012-10-12 13:34:19 +13:00
Eloy Lafuente (stronk7)
f2c33d0b69
Merge branch 'MDL-35858-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
2012-10-12 02:18:03 +02:00
Rossiani Wijaya
696527c0fe
MDL-21801 Lesson Module: Removing import power point functionality
2012-10-11 16:11:58 +08:00
Rossiani Wijaya
2c484717e1
MDL-33815 Online Users block: Add query condition to filter out deleted users and lastaccess date greater than now
2012-10-11 16:06:00 +08:00
Ankit Agarwal
0cb1a22cba
MDL-28965 administration: Updating description string for the setting navshowallcourses
2012-10-11 14:25:45 +08:00
Ankit Agarwal
437637a11d
MDL-31010 comments: setup_course should update if passed courseid is different from the cached one
2012-10-11 10:58:26 +08:00
Eloy Lafuente (stronk7)
5ba6db698d
Merge branch 'MDL-35715-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE
2012-10-11 01:54:17 +02:00
Aparup Banerjee
ca93b3af4e
Merge branch 'MDL-35231_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
2012-10-10 13:03:23 +08:00
Aparup Banerjee
1778232f45
Merge branch 'w41_MDL-35839_m23_enroldeletecleanup' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2012-10-10 10:32:02 +08:00
AMOS bot
c5c735f00e
Automatically generated installer lang files
2012-10-10 00:34:20 +00:00
Simon Coggins
d01c6b269b
MDL-35581 lib: Help popups misaligned for right-to-left languages
2012-10-10 08:56:29 +13:00
Eloy Lafuente (stronk7)
86b1d0eb5f
MDL-35898 test reset: Tidyup comment
2012-10-09 11:59:46 +02:00
Eloy Lafuente (stronk7)
5553d3d60f
Merge branch 'w41_MDL-35898_m23_coursereset' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2012-10-09 11:58:35 +02:00
Aparup Banerjee
aedc642091
MDL-35587 fixed up whitespaces
2012-10-09 16:36:20 +08:00
Aparup Banerjee
e72606c83f
Merge branch 'MDL-35587_23' of git://github.com/rlorenzo/moodle into MOODLE_23_STABLE
2012-10-09 16:28:49 +08:00
Frederic Massart
ad87b3a2cc
MDL-35858 question: Fixed display of feedback in cloze questions
2012-10-09 16:13:33 +08:00
Petr Škoda
e22cff45ab
MDL-35898 include static course caches in test resets
2012-10-09 10:10:19 +02:00
Aparup Banerjee
50cef6aa36
Merge branch 'wip-MDL-30754-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE
2012-10-09 14:32:31 +08:00
Aparup Banerjee
976a9da987
Merge branch 'WIP-MDL-35724-M23_quiz' of git://github.com/nadavkav/moodle into MOODLE_23_STABLE
2012-10-09 14:11:32 +08:00
Aparup Banerjee
34983250b1
Merge branch 'MDL-35776_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-10-09 11:53:43 +08:00
Aparup Banerjee
ae48ff8a17
Merge branch 'MDL-35837-M23' of git://github.com/nadavkav/moodle into MOODLE_23_STABLE
2012-10-09 10:25:33 +08:00
Rajesh Taneja
8715a53d90
MDL-30691 Adminstration: Added css to break long word in filter table
2012-10-09 10:02:45 +08:00
AMOS bot
5364f9c7cd
Automatically generated installer lang files
2012-10-09 00:34:42 +00:00