Eloy Lafuente (stronk7)
06b2987aad
Merge branch 'wip-mdl-43766-m26' of https://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE
2014-01-27 19:20:02 +01:00
Eloy Lafuente (stronk7)
227164c9b6
Merge branch 'MDL-43773-MOODLE_26_STABLE' of https://github.com/lucisgit/moodle into MOODLE_26_STABLE
2014-01-27 17:22:49 +01:00
Eloy Lafuente (stronk7)
ff04a96ba2
Merge branch 'MDL-43581_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
2014-01-27 17:04:11 +01:00
Eloy Lafuente (stronk7)
866bbb05f7
Merge branch 'wip-MDL-43800-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE
2014-01-27 12:02:36 +01:00
Tim Hunt
b8e91060b1
MDL-43581 additionalhtmlfooter should be added to every page
...
Not just pages with a visible footer.
2014-01-27 10:26:02 +00:00
Eloy Lafuente (stronk7)
7a6ad10586
Merge branch 'MDL-43809_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
2014-01-27 11:00:32 +01:00
Mark Nielsen
91e6e56014
MDL-43734: Prevent purging of all user session cache
2014-01-27 00:28:53 +01:00
Sam Hemelryk
250611b579
Merge branch 'w04_MDL-43746_m26_courselogin' of https://github.com/skodak/moodle into MOODLE_26_STABLE
2014-01-27 11:32:25 +13:00
Sam Hemelryk
5ccfa40292
Merge branch 'MDL-43794_m26' of https://github.com/merrill-oakland/moodle into MOODLE_26_STABLE
2014-01-27 11:16:15 +13:00
Tony Butler
bd538db810
MDL-43773 mod_choice: Swap order of name column headings in text export
2014-01-24 11:22:39 +00:00
Petr Skoda
c22d036916
MDL-43746 fix require_course_login regression caused by MDL-25981
2014-01-24 13:51:54 +08:00
Jason Fowler
a4ea4e2b1a
MDL-40786 User profile: Fixing narrow screen RTL collapse
2014-01-24 08:38:27 +08:00
Nadav Kavalerchik
d86801bed7
MDL-40786 User Profile: Right align profile fields in RTL mode (theme/bootstrapbase, theme/clean)
2014-01-24 08:38:23 +08:00
Tim Hunt
8b080d52ff
MDL-43809 qformat_xml messes up $s in multianswer questions.
2014-01-23 15:19:13 +00:00
Eloy Lafuente (stronk7)
b88bb98ab7
weekly release 2.6.1+
2014-01-23 12:38:43 +01:00
Eloy Lafuente (stronk7)
fc27206268
Merge branch 'install_26_STABLE' of git://git.moodle.org/moodle-install into MOODLE_26_STABLE
2014-01-23 12:38:39 +01:00
Marina Glancy
9b4e4b7f64
MDL-43800 course: groupings are sorted alphabetically
2014-01-23 09:07:54 +08:00
Eric Merrill
ff71f55265
MDL-43794 Files API Set the mtime of files to extraction time.
...
The restore cleanup code expects the mtime to be the time of extraction
not the mtime before archiving. If set to the old mtime, the restore
files may be cleaned up before the restore is complete.
This behaviour also matches the behaviour of the zip unpacker.
2014-01-22 11:07:07 -05:00
Dan Poltawski
8f89ca5780
Merge branch 'MDL-41506-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-01-21 23:29:25 +08:00
Dan Poltawski
32418eeee0
Merge branch 'mdl34020-moodle26' of https://github.com/tlock/moodle into MOODLE_26_STABLE
2014-01-21 15:21:20 +08:00
Dan Poltawski
0469922b5f
Merge branch '43714-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
2014-01-21 14:49:27 +08:00
Dan Poltawski
1cbda6fabd
Merge branch 'MDL-43760-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE
2014-01-21 14:28:52 +08:00
Damyon Wiese
eef0d3043c
Merge branch 'MDL-43725-26' of git://github.com/ankitagarwal/moodle into MOODLE_26_STABLE
2014-01-21 13:55:49 +08:00
Dan Poltawski
1f77f14fb9
Merge branch 'wip-MDL-43700-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE
2014-01-21 12:24:41 +08:00
Dan Poltawski
574111a94e
Merge branch 'MDL-43717_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2014-01-21 12:19:36 +08:00
Dan Poltawski
66b74e5aa5
Merge branch 'MDL-43693-MOODLE_26_STABLE' of https://github.com/lucisgit/moodle into MOODLE_26_STABLE
2014-01-21 11:21:54 +08:00
Damyon Wiese
9717c4b19c
Merge branch 'MDL-41688-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-01-21 09:37:04 +08:00
Damyon Wiese
d6d18a2b7b
Merge branch 'MDL-43732_m26' of github.com:merrill-oakland/moodle into MOODLE_26_STABLE
2014-01-21 09:29:40 +08:00
Eloy Lafuente (stronk7)
8d8e51b073
Merge branch 'wip-MDL-43333-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE
2014-01-21 02:01:35 +01:00
Eric Merrill
2d73ec85ea
MDL-43732 quiz Fix styles so that question div doesn't overlap controls.
2014-01-20 19:57:10 -05:00
Eloy Lafuente (stronk7)
b61b21d7ee
Merge branch 'wip-MDL-43211-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE
2014-01-21 01:54:09 +01:00
Eloy Lafuente (stronk7)
a45dbb214b
Merge branch 'MDL-43401-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-01-21 01:46:54 +01:00
Eloy Lafuente (stronk7)
f973e5f968
Merge branch 'MDL-43480_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2014-01-21 01:44:45 +01:00
Eloy Lafuente (stronk7)
3e1eb36d77
Merge branch 'MDL-41693-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-01-21 01:13:54 +01:00
Eloy Lafuente (stronk7)
3677e0c1aa
Merge branch 'MDL-39684-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-01-21 00:20:51 +01:00
Eloy Lafuente (stronk7)
133e38fdbb
Merge branch 'MDL-40533-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-01-21 00:17:39 +01:00
Eloy Lafuente (stronk7)
7c5074ce82
Merge branch 'MDL-43743_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2014-01-21 00:05:11 +01:00
Eloy Lafuente (stronk7)
a7029b542e
Merge branch 'MDL-41362-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-01-21 00:02:11 +01:00
Frederic Massart
b12cc0679f
MDL-41688 gradebook: Improved grading layout on bootstrapbase themes
2014-01-20 10:43:10 +01:00
Tony Butler
cfd4b8a3f5
MDL-43632 mod_feedback: Use SSL for reCAPTCHA API request if Moodle is using it
2014-01-20 17:14:38 +08:00
Rajesh Taneja
ee7bb53ccd
MDL-43766 reports: Fixed wrong string variable
2014-01-20 16:47:01 +08:00
Dan Poltawski
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
Dan Poltawski
4f02d0074a
Merge branch '42682-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
2014-01-20 15:25:49 +08:00
Dan Poltawski
1605660ad2
Merge branch 'MDL-43690_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
2014-01-20 14:24:44 +08:00
Damyon Wiese
62415470ae
MDL-43760 Potential fix for fletcher scott issues with fullname.
2014-01-20 13:39:19 +08:00
Damyon Wiese
e35e70f83d
Merge branch 'MDL-42495-m26' of git://github.com/micaherne/moodle into MOODLE_26_STABLE
2014-01-20 13:21:34 +08:00
Dan Poltawski
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
Marina Glancy
8de9100136
MDL-41062 gradebook: corrections to grade_item upgrade script, more tests
2014-01-20 12:25:56 +08:00
Damyon Wiese
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
Damyon Wiese
5b860c69a2
Merge branch '43675-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
2014-01-20 10:56:34 +08:00