5f074a6bb0
Merge branch 'wip-MDL-41062-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE
2014-01-20 15:29:21 +08:00
4f02d0074a
Merge branch '42682-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
2014-01-20 15:25:49 +08:00
1605660ad2
Merge branch 'MDL-43690_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
2014-01-20 14:24:44 +08:00
e35e70f83d
Merge branch 'MDL-42495-m26' of git://github.com/micaherne/moodle into MOODLE_26_STABLE
2014-01-20 13:21:34 +08:00
8a073e4364
Merge branch 'MDL-42980_m26' of git://github.com/rwijaya/moodle into MOODLE_26_STABLE
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-01-20 12:56:20 +08:00
8de9100136
MDL-41062 gradebook: corrections to grade_item upgrade script, more tests
2014-01-20 12:25:56 +08:00
b53af0f2a6
Merge branch 'MDL-39683-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-01-20 11:29:21 +08:00
5b860c69a2
Merge branch '43675-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
2014-01-20 10:56:34 +08:00
37b0d3adad
Merge branch 'MDL-43671_message_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE
2014-01-20 10:53:53 +08:00
da2e9d519b
Merge branch 'MDL-40139-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-01-20 10:33:38 +08:00
df25d33379
Merge branch 'MDL-43733_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
2014-01-20 10:13:54 +08:00
9fade08632
MDL-43671 message: removed an overly cautious check
2014-01-20 10:06:27 +08:00
e53eb2a208
Merge branch 'wip-mdl-43306-m26' of git://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE
2014-01-20 09:45:44 +08:00
0b8749c892
Merge branch 'MDL-40752-26' of git://github.com/phalacee/moodle into MOODLE_26_STABLE
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-01-20 09:26:12 +08:00
4c4fc6d629
MDL-43733 use any auto-saved responses when questions are finished.
...
Before this, autosave was only working to save data when a student went
back in to continue an attempt. If the student, having crashed out,
never went back in and continued the attempt, their auto-saved responses
were not used when the attempt was automatically finished. That was a
rather bad oversight, which should now be fixed.
2014-01-17 17:17:49 +00:00
217d839ded
MDL-43690 quiz_question_tostring missing s().
...
This meant that the edit quiz page sometimes had invalid HTML.
2014-01-17 10:47:00 +00:00
15fac63956
MDL-41062 gradebook: remove sortorder duplicates
...
* Upgrade function to remove duplicates from the grade item duplicates
column. Duplicates were causing sorting to fail in some cases.
* Add some unit tests which simulate sort order duplicate data and
verify that they have been removed.
2014-01-17 17:36:37 +08:00
dc842aaa36
MDL-42980 clean theme: fixed add/cancel buttons position for safari on iPhone with ios7.
2014-01-17 16:14:14 +08:00
aafc6872e4
MDL-43675 navigation: courses branch is now recognised as expandable
2014-01-17 10:27:05 +13:00
d073c81248
MDL-42682 theme_bootstrapbase: fixed styling of discussion selector
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-01-17 10:25:26 +13:00
74aa973e8e
MDL-42682 theme_bootstrapbase: fixed forum search alignment
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-01-17 10:25:24 +13:00
9c1c9d8954
weekly release 2.6.1+
2014-01-16 18:51:19 +01:00
40e8488c8d
Merge branch 'install_26_STABLE' of git://git.moodle.org/moodle-install into MOODLE_26_STABLE
2014-01-16 18:51:14 +01:00
9a57b4bc0b
Automatically generated installer lang files
2014-01-16 00:43:16 +00:00
ba541f01b6
Merge branch 'm26_MDL-43222' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE
2014-01-15 22:02:29 +01:00
64156342ad
MDL-43222 SCORM: Fix invalid sql
2014-01-16 09:49:36 +13:00
ebc09cc3ad
MDL-43306 restore: Fix grade_item sortorder after restoring course
...
While restoring course/activity, restore will blindly insert grade_item
sortorder. Which cause dulicate sortorder and lead to unpredicatble sorting
results.
Now we will call grade_item::fix_duplicate_sortorder() after restore is finished
to fix duplicate sortorder and order grade items to the closest order possible
2014-01-15 13:31:57 +08:00
5af6a32866
Merge branch 'MDL-43621_26' of https://github.com/totara/openbadges into MOODLE_26_STABLE
2014-01-15 13:30:58 +08:00
f0040e7daf
MDL-43621 badges: Fix has_awards() result when deleted users are the only recipients of a badge
2014-01-15 16:25:48 +13:00
893139fd12
Merge branch 'MDL-43439_26-dateformat' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2014-01-15 04:01:11 +01:00
f5d810b4f3
Merge branch 'MDL-43461_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2014-01-15 09:38:46 +08:00
e5ee31453a
MDL-43439 behat: Dir date without - separators
2014-01-15 09:18:55 +08:00
05297cc0a8
Merge branch 'MDL-43619-m26' of git://github.com/sammarshallou/moodle into MOODLE_26_STABLE
2014-01-15 08:20:39 +08:00
66e46b4859
Merge branch 'MDL-43439_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2014-01-15 00:11:18 +01:00
4768a4768b
MDL-43621 badges: Don't count deleted users as badge recipients
2014-01-15 09:57:26 +13:00
b4918e7d8a
MDL-43621 badges: Don't display deleted users in badge recipients list
2014-01-15 09:54:19 +13:00
65e9de16c2
Merge branch 'wip-MDL-31597-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE
2014-01-14 21:49:37 +01:00
ff48f6f0e7
Merge branch 'MDL-43332_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE
2014-01-14 16:53:40 +01:00
f5191afd30
Merge branch 'm26_MDL-43222' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE
2014-01-14 16:45:38 +01:00
a6a14f2155
MDL-43619 Roles: reset_role_capabilities unit test, cache fix
2014-01-14 13:47:38 +00:00
bf2c42e8ee
MDL-43619 Roles: reset_role_capabilities function destroys overrides
2014-01-14 13:47:37 +00:00
f9d14c4cd7
Merge branch 'MDL-43664-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE
2014-01-14 16:50:09 +08:00
79c8b9fcae
Merge branch 'm26_MDL-43577_Incorrect_Variable_Expansion' of https://github.com/scara/moodle into MOODLE_26_STABLE
2014-01-14 15:58:12 +08:00
33d83d755a
Merge branch 'MDL-43642_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2014-01-14 15:48:52 +08:00
4a2ac9676a
Merge branch 'm26_MDL-43575_Typo_In_The_Overridden_setOption' of https://github.com/scara/moodle into MOODLE_26_STABLE
2014-01-14 15:37:04 +08:00
30354dc0d2
Merge branch 'MDL-43178_forum_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE
2014-01-14 15:26:52 +08:00
e906a85cc3
MDL-43439 behat: Save the screenshots to the specified location
2014-01-14 15:24:09 +08:00
7b0e78bf83
Merge branch 'w02_MDL-43511_m26_bankcache' of https://github.com/skodak/moodle into MOODLE_26_STABLE
2014-01-14 14:29:34 +08:00
24607ba326
Merge branch 'MDL-43371-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-01-14 14:05:27 +08:00
eb8f1fef79
Merge branch 'MDL-43460-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-01-14 13:33:30 +08:00
Dan Poltawski