Dan Poltawski
c7ad6f4504
Merge branch 'w51_MDL-37301_m23_coursecatinfoas' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2013-01-08 10:27:12 +08:00
Dan Poltawski
053f6ebc42
Merge branch 'w51_MDL-37254_m23_courseinfoas' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2013-01-08 10:24:21 +08:00
Sam Hemelryk
b7af1eee2d
Merge branch 'wip-mdl-36958-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE
2013-01-08 14:06:36 +13:00
David Mudrák
53499f8d35
MDL-36977 Be more picky when it comes to migrating files in moodle1 backups
2013-01-08 08:54:29 +08:00
David Mudrák
02a6f3b04f
MDL-36977 Add more unit tests for moodle1 backup conversion
2013-01-08 08:54:29 +08:00
Paul Nicholls
330686c9fb
MDL-35074: grader report - Ease limit on number of students per page
...
The limit imposed by max_input_vars "applies only to each nesting level of
a multi-dimensional input array"
(http://www.php.net/manual/en/info.configuration.php#ini.max-input-vars ).
Turning the grader report fields into arrays (they were all top-level form
fields, i.e. elements of the top-level array) makes the number of students
become the only limiting factor, thereby allowing us to relax the limit on
number of students per page greatly (to 1 less than max_input_vars, for
safety).
2013-01-08 12:55:56 +13:00
Eloy Lafuente (stronk7)
5050a19ff7
Merge branch 'MDL-35794_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2013-01-07 22:38:48 +01:00
Eloy Lafuente (stronk7)
0858993db8
Merge branch 'MDL-35792_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2013-01-07 22:36:29 +01:00
sam marshall
b12d8cd881
MDL-36095 Section availability: Make behaviour consistent with activities
2013-01-07 15:55:12 +00:00
Davo Smith
db529c2346
MDL-31641 filemanager - display help message when drag and drop upload is not supported
2013-01-07 08:16:35 +00:00
Didier Raboud
7db20e0073
MDL-37157: Normalize short answers before comparison
...
This ensures that ambiguous Unicode representations can be compared sanely.
Also add some tests to ensure it keeps working.
Thanks to Tim Hunt for the syntax check.
2013-01-07 14:00:26 +08:00
Dan Poltawski
1f1dc87fc1
Merge branch 'w51_MDL-37128_m23_rssrestore' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2013-01-07 13:57:10 +08:00
Dan Poltawski
d068c79e48
Merge branch 'w51_MDL-36893_m23_mnetestrict' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2013-01-07 13:53:29 +08:00
Dan Poltawski
b0c49cea12
Merge branch 'MDL-27884-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE
2013-01-07 13:30:43 +08:00
Andrew Davis
b65bd8b658
MDL-33117 grade: adding unit tests for the user report function inject_rowspans()
2013-01-07 12:00:16 +08:00
Damyon Wiese
7e57119342
MDL-37244 Assignment: Submission comments plugin does not implement comments callbacks.
...
This allows anyone to view or modify anyone elses submission comments.
2013-01-07 10:49:20 +08:00
Ankit Agarwal
77a7ed6535
MDL-33340 completion: Incorrect logic in hidden field check
...
Credit to Jody Steele
2013-01-07 10:37:38 +08:00
Simon Coggins
1e8335fb82
MDL-35991 - use PARAM_LOCALURL for local urls
2013-01-07 10:10:32 +08:00
Rajesh Taneja
9d40987c6d
MDL-37062 Course: Show one 'Add new course' button
...
Currently if there is no course and admin/course creator go to create course, he/she see two
'Add new course' buttons.
2013-01-07 09:48:26 +08:00
Dan Poltawski
523dafe824
Merge branch 'MDL-36667-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2013-01-07 09:45:15 +08:00
Sam Hemelryk
fc77cb3d85
Merge branch 'MDL-37161-moodle23' of https://github.com/StudiUM/moodle into MOODLE_23_STABLE
2013-01-07 14:14:28 +13:00
Sam Hemelryk
178a5b4102
Merge branch 'w51_MDL-36212_m23_entities' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2013-01-07 13:44:36 +13:00
Sam Hemelryk
52817fdbbc
Merge branch 'MDL-37068_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2013-01-07 13:39:52 +13:00
Sam Hemelryk
757376d7dd
Merge branch 'w51_MDL-37281_m23_othersnav' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2013-01-07 13:33:45 +13:00
Sam Hemelryk
a68bc19fa6
Merge branch 'MDL-36855-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE
2013-01-07 12:04:51 +13:00
Charles Fulton
c1fcc89f71
MDL-4781 forum: show discussion link when user has ability to view discussion
...
Conflicts:
mod/forum/lib.php
2013-01-07 11:17:58 +13:00
Davo Smith
318b859ac8
MDL-35887 course dndupload - correct default used for completion tracking when resources created by drag and drop
2013-01-07 11:07:45 +13:00
Sam Hemelryk
d9402acd03
Merge branch 'MDL-16730-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE
2013-01-07 10:14:54 +13:00
Mark Nelson
70badb4824
MDL-37359 groups: fixing typo in the web service function create_groupings_parameters
2013-01-07 09:47:49 +13:00
Sam Hemelryk
a3a84720d3
Merge branch 'MDL-29327_none_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE
2013-01-07 09:34:52 +13:00
Sam Hemelryk
a589b0dc77
Merge branch 'MDL-36741_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE
2013-01-07 09:15:34 +13:00
Jean-Philippe Gaudreau
d71792da4f
MDL-37161 Backup: Database error caused by grade book settings when importing or restoring a course
2013-01-04 09:53:03 -05:00
Damyon Wiese
3f1b2800ae
MDL-36712: Assignment - Do not always send feedback available emails when grade is created
...
The entry in the assign_grades table contains grades feedback and other settings such as locked.
Only send the student an email about new feedback if it is actually grades or feedback that
has been added. This is done by using another state for the mailed flag (2) which means "unset".
Conflicts:
mod/assign/feedback/file/importziplib.php
mod/assign/feedback/file/locallib.php
mod/assign/feedback/offline/locallib.php
mod/assign/locallib.php
2013-01-04 15:02:50 +08:00
Jerome Mouneyrac
7441838054
MDL-37355 Fix the REST server that didn't send back the cleaned values
2013-01-04 14:39:10 +08:00
Andrew Davis
d674a0e16f
MDL-29327 core_grade: removing some code that is messing up the categories and items screen when no grade categories are used
2013-01-04 08:58:25 +08:00
Ankit Agarwal
7f7e18c3a2
MDL-36855 scorm: update to api get_scorm_question_count()
...
get_scorm_question_count() should return 0 not 1 when no attempt is made in a scorm by any student
2013-01-03 14:42:18 +08:00
Ankit Agarwal
2e505a05d1
MDL-27884 Implement proper username validation during csv import
2013-01-02 14:10:16 +08:00
Ankit Agarwal
f439b4242c
MDL-27884 blocks: Correcting config title string
...
AMOS BEGIN
CPY [configtitle,block_html],[configtitle,block_tags]
AMOS END
Conflicts:
blocks/tags/edit_form.php
blocks/tags/lang/en/block_tags.php
2013-01-02 10:54:51 +08:00
AMOS bot
c2f393b2b5
Automatically generated installer lang files
2013-01-01 00:43:01 +00:00
Eloy Lafuente (stronk7)
10ad21dc9a
weekly release 2.3.3+
2012-12-30 01:05:13 +01:00
Petr Škoda
00f9bca84a
MDL-36893 fix mnet E_STRICT issue
2012-12-27 14:33:37 +01:00
Petr Škoda
575d91977e
MDL-37128 fix E_STRICT rss restore issue
2012-12-27 13:41:20 +01:00
Petr Škoda
a340e04df7
MDL-37301 fix missing AS in select
...
This was breaking pg 8.3. Credit goes to Thomas Robb, thanks.
2012-12-26 22:27:34 +01:00
Dan Poltawski
48d53d9fd6
Merge branch 'MDL-35569-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE
2012-12-24 11:43:41 +08:00
Dan Poltawski
cd665c200d
Merge branch 'w51_MDL-37233_m23_skype' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2012-12-24 11:34:55 +08:00
Dan Poltawski
1cb195dabc
Merge branch 'wip-MDL-37290-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE
2012-12-24 10:55:37 +08:00
Dan Poltawski
ca0cbfd4db
Merge branch 'w51_MDL-37283_m23_spell' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2012-12-24 10:35:47 +08:00
Sam Hemelryk
76dee48562
MDL-37290 course: fixed up navbar when editing categories
2012-12-24 13:06:25 +13:00
Sam Hemelryk
185eff01fa
Merge branch 'wip-MDL-35833-stable23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE
2012-12-24 11:43:37 +13:00
Sam Hemelryk
fec305739d
Merge branch 'MDL-36966-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-24 11:16:07 +13:00