Dan Poltawski
111c649600
MDL-41565 events: fix unit test
2013-09-11 10:25:31 +08:00
Frederic Massart
de170aacda
MDL-41436 modinfo: Concatenate SQL fields instead of passing array
2013-09-11 10:02:41 +08:00
Sam Hemelryk
6b909c759d
Merge branch 'wip-mdl-41605' of git://github.com/rajeshtaneja/moodle
2013-09-11 10:50:08 +12:00
Sam Hemelryk
214816fb19
Merge branch 'MDL-40742-master' of git://github.com/ankitagarwal/moodle
2013-09-11 10:13:29 +12:00
Sam Hemelryk
b3602b3e5e
Merge branch 'MDL-40687' of git://github.com/rwijaya/moodle
2013-09-11 09:47:41 +12:00
Eloy Lafuente (stronk7)
a13f06aec0
Merge branch 'MDL-41619_master' of https://github.com/markn86/moodle
2013-09-10 23:45:20 +02:00
Sam Hemelryk
2ecaec9bb6
Merge branch 'MDL-41658_master' of git://github.com/kordan/moodle
2013-09-11 09:42:40 +12:00
Sam Hemelryk
bf6181d451
Merge branch 'MDL-40262' of git://github.com/kordan/moodle
2013-09-11 09:39:13 +12:00
Sam Hemelryk
67c52739d3
Merge branch 'MDL-41634-url-download-warning' of https://github.com/mnoorenberghe/moodle
2013-09-11 09:32:33 +12:00
Sam Hemelryk
087bc6ba67
Merge branch 'MDL-41238-master' of git://github.com/phalacee/moodle
2013-09-11 09:28:42 +12:00
Sam Hemelryk
ba5d7f8b1c
Merge branch 'MDL-41528_master' of https://github.com/nitzo/moodle
2013-09-11 09:26:44 +12:00
Sam Hemelryk
f773cb2e94
Merge branch 'MDL-41630-master' of git://github.com/FMCorz/moodle
2013-09-11 09:20:53 +12:00
Sam Hemelryk
cde5c4a58e
Merge branch 'MDL-41632-master' of git://github.com/FMCorz/moodle
2013-09-11 09:12:32 +12:00
Sam Hemelryk
3623d74adc
Merge branch 'wip-MDL-41578-master' of git://github.com/marinaglancy/moodle
2013-09-11 09:00:54 +12:00
Sam Hemelryk
994009ddfe
Merge branch 'MDL-41599-master' of git://github.com/ankitagarwal/moodle
2013-09-11 08:54:26 +12:00
Sam Hemelryk
33636b4040
Merge branch 'MDL-41587_master' of git://github.com/dmonllao/moodle
2013-09-11 08:52:52 +12:00
Sam Hemelryk
f605403fe2
Merge branch 'MDL-41555_master' of git://github.com/dmonllao/moodle
2013-09-11 08:51:02 +12:00
Sam Hemelryk
79257da228
Merge branch 'wip-mdl-41590' of git://github.com/rajeshtaneja/moodle
2013-09-11 08:45:22 +12:00
Sam Hemelryk
c4f5f0ee59
Merge branch 'MDL-40471_master' of https://github.com/totara/openbadges
2013-09-11 08:42:37 +12:00
Sam Hemelryk
e0a8b60f5d
Merge branch 'MDL-41236-master' of git://github.com/phalacee/moodle
2013-09-11 08:36:54 +12:00
Sam Hemelryk
c02045ddc4
Merge branch 'wip-mdl-41589' of git://github.com/rajeshtaneja/moodle
2013-09-11 08:34:58 +12:00
Eloy Lafuente (stronk7)
f073ea045e
Merge branch 'wip-MDL-41288-fix' of git://github.com/marinaglancy/moodle
2013-09-10 14:16:14 +02:00
Eloy Lafuente (stronk7)
34ac96bf6d
Merge branch 'wip-MDL-41508-master' of git://github.com/marinaglancy/moodle
2013-09-10 14:09:34 +02:00
Marina Glancy
341e2460cd
MDL-41288 Bugfix of error occuring when subwiki is not set
2013-09-10 22:02:24 +10:00
Dan Poltawski
261dc01734
Merge branch 'MDL-40733_forum_name' of https://github.com/andyjdavis/moodle
2013-09-10 17:35:40 +08:00
Dan Poltawski
50d7cc8463
Merge branch 'MDL-41566' of git://github.com/rwijaya/moodle
2013-09-10 17:30:04 +08:00
Rossiani Wijaya
b25e7d8599
MDL-41562 file resource: fix page heading levels.
...
Also removing printheading options setting.
2013-09-10 17:22:08 +08:00
Dan Poltawski
89cb942c6d
Merge branch 'MDL-41305-master' of git://github.com/FMCorz/moodle
2013-09-10 17:14:40 +08:00
Rossiani Wijaya
d184f9bd4a
MDL-41567 url resource: fix page heading levels.
...
Also removing printheading options setting.
2013-09-10 17:13:18 +08:00
Rossiani Wijaya
278d64572d
MDL-40829: courses heading: remove 'headerblock' class from header and fix heading levels
2013-09-10 17:09:38 +08:00
Dan Poltawski
62b35d5852
Merge branch 'MDL-40833-master' of git://github.com/phalacee/moodle
2013-09-10 16:00:52 +08:00
Dan Poltawski
c219df86d1
Merge branch 'MDL-41564' of git://github.com/rwijaya/moodle
2013-09-10 15:29:23 +08:00
Dan Poltawski
4bdabf5968
Merge branch 'MDL-41565-master' of git://github.com/FMCorz/moodle
2013-09-10 15:21:49 +08:00
Dan Poltawski
f2ee9b5c27
Merge branch 'MDL-39992-master' of git://github.com/damyon/moodle
2013-09-10 14:58:54 +08:00
Damyon Wiese
eceecb72f3
Revert "MDL-37028 Integrity check for course modules and sections"
...
This is failing unit tests.
This reverts commit 0bac49dc1983824e4861086ed1ab9e13af99d76d.
This reverts commit 1f0a9ce48b3e6f8c5dc6628aa692323909925032.
2013-09-10 14:34:07 +08:00
Dan Poltawski
92d92606ba
Merge branch 'MDL-40631-master' of git://github.com/damyon/moodle
2013-09-10 14:33:41 +08:00
Damyon Wiese
a01914128d
MDL-41237 Atto: Add missing js method docs.
2013-09-10 14:30:02 +08:00
Jason Fowler
2b6361305d
MDL-41237 Atto - Adjusting the text styles for the editor
2013-09-10 14:30:02 +08:00
Dan Poltawski
3b46f8dfe1
MDL-41235 fix whitespace
2013-09-10 14:26:53 +08:00
Dan Poltawski
03608c253d
Merge branch 'MDL-41235-master' of git://github.com/phalacee/moodle
2013-09-10 14:25:48 +08:00
Jason Fowler
37b16441b8
MDL-41235 atto - Matching the width of the html view to the wysiwyg view
2013-09-10 14:13:14 +08:00
Dan Poltawski
f07c2243b1
Merge branch '41189-26' of git://github.com/samhemelryk/moodle
2013-09-10 14:12:14 +08:00
Rossiani Wijaya
876c0ac382
MDL-41288 wiki: improve heading levels and styling
2013-09-10 14:08:34 +08:00
Damyon Wiese
b10ce36806
Merge branch 'MDL-40736' of git://github.com/rwijaya/moodle
2013-09-10 13:48:01 +08:00
Dan Poltawski
e025a2fc43
Merge branch 'MDL-40686' of git://github.com/rwijaya/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-09-10 13:39:01 +08:00
Damyon Wiese
f1f4a860c6
Merge branch 'w37_MDL-41408_m26_loginredirect' of https://github.com/skodak/moodle
2013-09-10 13:33:27 +08:00
Dan Poltawski
f7e719eb38
Merge branch 'MDL-41117_master' of git://github.com/kordan/moodle
2013-09-10 13:23:47 +08:00
Ankit Agarwal
28c4399b6b
MDL-21415 reports: Adding support of groups to course participation reports
...
Also introducing new api groups_allgroups_course_menu() that generates a selector for all groups in course"
2013-09-10 13:14:33 +08:00
Damyon Wiese
bfcc07504e
MDL-23335 forum: Fix whitespace
2013-09-10 12:59:49 +08:00
Damyon Wiese
6aca3fc419
Merge branch 'wip-mdl-23335-master' of https://github.com/deraadt/moodle
2013-09-10 12:56:40 +08:00