Eloy Lafuente (stronk7)
66e46b4859
Merge branch 'MDL-43439_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2014-01-15 00:11:18 +01:00
Yuliya Bozhko
4768a4768b
MDL-43621 badges: Don't count deleted users as badge recipients
2014-01-15 09:57:26 +13:00
Yuliya Bozhko
b4918e7d8a
MDL-43621 badges: Don't display deleted users in badge recipients list
2014-01-15 09:54:19 +13:00
Eloy Lafuente (stronk7)
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
Frederic Massart
1e8b6e0087
MDL-40533 block_html: Remove styles specific to the block
2014-01-14 19:07:22 +01:00
Ruslan Kabalin
9d649ad7a3
MDL-43693: assignment: Fix JS error on grading page.
2014-01-14 16:14:41 +00:00
Eloy Lafuente (stronk7)
ff48f6f0e7
Merge branch 'MDL-43332_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE
2014-01-14 16:53:40 +01:00
Eloy Lafuente (stronk7)
f5191afd30
Merge branch 'm26_MDL-43222' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE
2014-01-14 16:45:38 +01:00
sam marshall
a6a14f2155
MDL-43619 Roles: reset_role_capabilities unit test, cache fix
2014-01-14 13:47:38 +00:00
sam marshall
bf2c42e8ee
MDL-43619 Roles: reset_role_capabilities function destroys overrides
2014-01-14 13:47:37 +00:00
Frederic Massart
b31c53a372
MDL-41506 theme_bootstrapbase: Implement highlight class
2014-01-14 11:24:10 +01:00
Dan Poltawski
f9d14c4cd7
Merge branch 'MDL-43664-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE
2014-01-14 16:50:09 +08:00
Dan Poltawski
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
Dan Poltawski
33d83d755a
Merge branch 'MDL-43642_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2014-01-14 15:48:52 +08:00
Dan Poltawski
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
Dan Poltawski
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
David Monllao
e906a85cc3
MDL-43439 behat: Save the screenshots to the specified location
2014-01-14 15:24:09 +08:00
Damyon Wiese
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
Damyon Wiese
24607ba326
Merge branch 'MDL-43371-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-01-14 14:05:27 +08:00
Damyon Wiese
eb8f1fef79
Merge branch 'MDL-43460-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-01-14 13:33:30 +08:00
Damyon Wiese
5a0cf2cda0
Merge branch 'w02_MDL-43488_m26_signreq' of https://github.com/skodak/moodle into MOODLE_26_STABLE
2014-01-14 13:18:35 +08:00
David Monllao
58dd0d506e
MDL-43461 testing: Avoid switching to .bat files when running MinGW
...
MinGW can not execute .bat files (http://sourceforge.net/p/mingw/bugs/1902 )
so we should not switch to .bat files when running MinGW.
2014-01-14 13:14:40 +08:00
David Monllao
22a09b7d40
MDL-43461 behat: Using linux-style directory separators when using cygwin
2014-01-14 13:14:14 +08:00
Damyon Wiese
020705cca0
Merge branch 'MDL-43610-m26' of git://github.com/micaherne/moodle into MOODLE_26_STABLE
2014-01-14 12:37:17 +08:00
Adrian Greeve
e5eddec0b7
MDL-31597 gradebook: Update to gradebook behat tests to include testing grade weightings.
2014-01-14 11:48:36 +08:00
Adrian Greeve
7269154b44
MDL-31597 gradebook: Removed the percentage symbol from weights in the gradebook.
2014-01-14 11:48:12 +08:00
Dan Poltawski
1e65c37e97
Merge branch 'm26_MDL-42792' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE
2014-01-14 11:28:44 +08:00
Dan Poltawski
b3eacbd5da
Merge branch 'MDL-43412_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
2014-01-14 10:46:34 +08:00
Andrew Nicols
56f0dc64ed
MDL-43664 Javascript: Use YUI indexOf for pending_js tracking
...
Some old browsers do not support indexOf and so cannot determine whether JS
script is in progress. The YUI Y.Array module polyfills the indexOf
functionality when it does not exist.
2014-01-14 10:40:39 +08:00
Nadav Kavalerchik
f4075b7127
MDL-40752 Login RTL: Swapping the panels on two-panel login pages for RTL
...
Additions to the patch made by Jason Fowler <phalacee@gmail.com>
2014-01-14 09:23:46 +08:00
AMOS bot
1b696dcde0
Automatically generated installer lang files
2014-01-14 00:45:37 +00:00
Mark Nelson
0deddeed2f
MDL-43332 core_grades: automated basic grade viewing functionality performed in MDLQA-317
2014-01-13 15:48:12 -08:00
Eloy Lafuente (stronk7)
8c75f05721
Merge branch 'MDL-43109_26' of https://github.com/mdikih/moodle into MOODLE_26_STABLE
2014-01-13 21:51:54 +01:00
Matteo Scaramuccia
fc33a35857
MDL-43575 Libraries Google_CurlIO ext, typo in the overridden setOption().
2014-01-13 21:34:48 +01:00
Matteo Scaramuccia
5725c1850f
MDL-43577 Messages Incorrect variable expansion in the message template.
2014-01-13 21:11:09 +01:00
Frederic Massart
c7d4465070
MDL-41362 theme_bootstrapbase: Alignment of User Selector controls
2014-01-13 18:41:32 +01:00
Frederic Massart
b4eed40953
MDL-39684 theme: RTL align of restrictions label in file manager
2014-01-13 16:27:52 +01:00
Frederic Massart
08a491e16d
MDL-39683 message: RTL alignment of messages in theme_base
2014-01-13 15:41:30 +01:00
Nadav Kavalerchik
53a26c87d6
MDL-39683 Messages, Themes: Fix "my" and "other person" message alignment in RTL mode (theme/clean)
2014-01-13 15:29:53 +01:00
Dan Poltawski
a377868a50
Merge branch 'MDL-40849-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-01-13 15:50:34 +08:00
Frederic Massart
7e343b7304
MDL-40849 gradingform_guide: Fixed CSS issues with Bootstrapbase
2014-01-13 08:12:18 +01:00
Dan Poltawski
4d2984c136
Merge branch '43598-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
2014-01-13 12:37:26 +08:00
Dan Poltawski
6719aa5ec5
Merge branch 'MDL-39603-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-01-13 12:34:58 +08:00
Dan Poltawski
d9dcb97bbe
Merge branch '41226-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
2014-01-13 11:11:12 +08:00
Dan Poltawski
51bced46a7
Merge branch '40821-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
2014-01-13 11:03:37 +08:00
Dan Poltawski
a893680091
Merge branch '40693-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
2014-01-13 10:07:54 +08:00
Dan Poltawski
67a75acaff
Merge branch 'MDL-41152-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-01-13 10:03:47 +08:00
Sam Hemelryk
6060234de5
MDL-40205 theme: fixed overflow of block headers
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-01-13 09:41:25 +08:00
Dan Poltawski
892173b3f3
Merge branch 'MDL-40705-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-01-13 09:36:12 +08:00
Dan Poltawski
bc7a77f14d
Merge branch 'MDL-39661-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-01-13 08:54:23 +08:00