Eloy Lafuente (stronk7)
6326817e0f
Merge branch 'MDL-26767' of git://github.com/timhunt/moodle
2011-03-14 12:07:41 +01:00
Eloy Lafuente (stronk7)
3d63eb08f6
Merge branch 'MDL-22478-alternative-langcacheroot' of git://github.com/mudrd8mz/moodle
2011-03-14 12:03:36 +01:00
Dan Marsden
571ae25286
MDL-21432 backup - add plagiarism plugin hooks for course and module
2011-03-14 11:44:14 +01:00
Sam Hemelryk
f786f01115
Merge rebased branch 'formal_white_2011030507' of git://github.com/kordan/moodle.git
2011-03-14 18:02:18 +08:00
Sam Hemelryk
e1f517fcc7
theme-formal_white MDL-26300, MDL-25628 , MDL-25520 Fixed whitespace and nesting issues
2011-03-14 17:59:57 +08:00
kordan
8b759a9a48
theme-formal_white MDL-26789 Fixed up vertical centering in navbar
2011-03-14 17:33:58 +08:00
kordan
5e911b2ea5
theme-formal_white MDL-26300, MDL-25628 , MDL-25520 fixed problems in admin report section pages
2011-03-14 17:33:38 +08:00
kordan
0e412e87a4
theme-formal_white MDL-26300, MDL-25628 , MDL-25520 one more setting and logos with transparent background to allow custom header background color
2011-03-14 17:33:03 +08:00
kordan
4afb01dbb4
formal white from scratch fixing MDL-26300, MDL-25628 , MDL-25520
2011-03-14 17:33:02 +08:00
Kordan
3718dfc771
theme-formal_white MDL-26300, MDL-25628 , MDL-25520 FW last version
2011-03-14 17:32:14 +08:00
Sam Hemelryk
e96aa1a669
Merge branch 's7_MDL-26583_filepicker_lang' of git://github.com/dongsheng/moodle
2011-03-14 16:05:37 +08:00
Sam Hemelryk
4bbe460316
Merge branch 'w11_MDL-26480_20_redirect' of git://github.com/skodak/moodle
2011-03-14 15:41:51 +08:00
Sam Hemelryk
85f1abe304
Merge branch 'MDL-13983' of git://github.com/timhunt/moodle
2011-03-14 15:33:49 +08:00
Sam Hemelryk
9fed82de9c
Merge branch 'MDL-26785' of git://github.com/stronk7/moodle
2011-03-14 11:22:05 +08:00
Sam Hemelryk
2012d82a96
Fixed merge conflicts in nonzero theme
2011-03-14 10:59:58 +08:00
Sam Hemelryk
66c6e870ef
Merge branch 'MDL-25304' of git://github.com/epsd/moodle
2011-03-14 10:54:24 +08:00
Sam Hemelryk
b146486613
Merge branch 'MDL-25786-2' of git://github.com/epsd/moodle
2011-03-14 10:43:42 +08:00
Sam Hemelryk
e9fda1c945
Merge branch 'MDL-25212' of git://github.com/epsd/moodle
2011-03-14 10:36:17 +08:00
Sam Hemelryk
af99e7286b
Merge branch 'MDL-25939-3' of git://github.com/epsd/moodle
2011-03-14 10:33:17 +08:00
Sam Hemelryk
77a5af1f12
Merge branch 'MDL-26084' of git://github.com/epsd/moodle
2011-03-14 10:19:52 +08:00
Sam Hemelryk
df94dbd825
Merge branch 'MDL-24743' of git://github.com/epsd/moodle
2011-03-14 09:57:55 +08:00
Sam Hemelryk
e2d50a6a00
Merge branch 'MDL-26711' of git://github.com/epsd/moodle
2011-03-14 09:51:27 +08:00
Eloy Lafuente (stronk7)
64f3208b7c
Merge branch 'w11_MDL-26698_20_helphttps' of git://github.com/skodak/moodle
2011-03-14 02:12:46 +01:00
Eloy Lafuente (stronk7)
3c38ad5d79
Merge branch 'MDL-26643' of git://github.com/nebgor/moodle
2011-03-14 01:57:08 +01:00
Eloy Lafuente (stronk7)
98fd7dcb72
Merge branch 'w11_MDL-24071_20_tex' of git://github.com/skodak/moodle
2011-03-14 01:53:29 +01:00
Eloy Lafuente (stronk7)
b8f249b43a
Merge branch 'w11_MDL-26634_20_ldapsep' of git://github.com/skodak/moodle
2011-03-14 01:26:22 +01:00
Eloy Lafuente (stronk7)
9f091bcd45
Merge branch 's7_MDL-9376_qaforum' of git://github.com/dongsheng/moodle
2011-03-14 01:22:10 +01:00
Eloy Lafuente (stronk7)
008011875c
MDL-25352 fix tiny typo
2011-03-14 01:12:38 +01:00
Eloy Lafuente (stronk7)
5869d05bb7
Merge branch 'w11_MDL-25352_20_replace' of git://github.com/skodak/moodle
2011-03-14 01:10:35 +01:00
Eloy Lafuente (stronk7)
2b1a23a6aa
Merge branch 'MDL-26594' of git://github.com/nebgor/moodle
2011-03-14 00:54:36 +01:00
Eloy Lafuente (stronk7)
d47070248f
Merge branch 'MDL-26748' of git://github.com/timhunt/moodle
2011-03-14 00:53:28 +01:00
Petr Skoda
c3b5e8290b
MDL-25352 fix multiple issues in admin/replace.php
...
Make sure admins know things can go wrong, MSSQL and Oracle were never working, fix block_html config saving issue, skip a lot more tables because the data there is serialised() or can not be changed in case of config tables, more warnings and checkbox confirmation.
2011-03-14 00:51:42 +01:00
Eloy Lafuente (stronk7)
6bfddc2e38
Merge branch 'MDL-26773' of git://github.com/timhunt/moodle
2011-03-14 00:49:11 +01:00
Eloy Lafuente (stronk7)
7e0579cb8c
Merge branch 'MDL-26714' of git://github.com/timhunt/moodle
2011-03-14 00:43:58 +01:00
Eloy Lafuente (stronk7)
9929445926
Merge branch 'MDL-19555_m20' of git://github.com/rwijaya/moodle
2011-03-14 00:35:03 +01:00
Eloy Lafuente (stronk7)
f934143c6c
Merge branch 'AMOS-install-strings' of git://github.com/mudrd8mz/moodle
2011-03-14 00:32:01 +01:00
Eloy Lafuente (stronk7)
e9579e548d
Merge branch 'w11_MDL-26621_20_profilemail' of git://github.com/skodak/moodle
2011-03-14 00:25:04 +01:00
Eloy Lafuente (stronk7)
5cd0d27089
Merge branch 'MDL-26730' of git://github.com/timhunt/moodle
2011-03-13 23:50:20 +01:00
Eloy Lafuente (stronk7)
b5686d021b
Merge branch 'MDL-26735' of git://github.com/timhunt/moodle
2011-03-13 23:41:48 +01:00
Eloy Lafuente (stronk7)
d93c27ec95
Merge branch 'MDL-26734' of git://github.com/timhunt/moodle
2011-03-13 23:33:09 +01:00
Eloy Lafuente (stronk7)
908b892d9c
Merge branch 'MDL-21446' of git://github.com/timhunt/moodle
2011-03-13 23:31:05 +01:00
Eloy Lafuente (stronk7)
22acfde076
Merge branch 'MDL-26733' of git://github.com/timhunt/moodle
2011-03-13 23:28:07 +01:00
Eloy Lafuente (stronk7)
40b204b863
Merge branch 'wip-MDL-26606' of git://github.com/sammarshallou/moodle
2011-03-13 23:22:04 +01:00
Eloy Lafuente (stronk7)
4f7fd61a7a
Merge branch 'MDL-26724' of git://github.com/timhunt/moodle
2011-03-13 22:57:06 +01:00
AMOS bot
8dc0b786d0
Automatic installer lang files (20110313)
2011-03-13 19:45:51 +01:00
Petr Skoda
69542fb3af
MDL-26698 use https for help ajax loginhttps pages
2011-03-13 17:08:50 +01:00
Petr Skoda
f7f0909ce5
PULL-442 multiple TeX related fixes
...
Prevent moodle_url error, cleanup entity encoding and decoding, disable tex source view when TeX and Algebra plugins disabled, localise TeX source popup and prevent phishing attempts, fix executable permission of Algebra pearl script, prevent image error in tex debug when Tex/Ghostscript not configured properly, fix copyright blocks and phpdocs, improve coding style, fix wrong source display link in Algebra filter.
2011-03-13 15:18:07 +01:00
Petr Skoda
b399e43592
MDL-26480 IIS redirect bug workaround
...
Credit goes to Zenger Sergey
2011-03-13 10:47:47 +01:00
Petr Skoda
ee69d85a1f
MDL-26634 LDAP NTLM SSO Multiple subnet separator is not specified and people use a wrong one
...
Credit goes to Inaki Arenaza.
2011-03-13 10:14:20 +01:00
Petr Skoda
181991e791
MDL-26621 respect email privacy settings on the main user profile and fix missing context
2011-03-12 19:04:26 +01:00
