Eloy Lafuente (stronk7)
cd8e9b19c5
Merge branch 'w23_MDL-39503_m26_signup' of git://github.com/skodak/moodle
2013-06-05 16:10:39 +02:00
Eloy Lafuente (stronk7)
6c1c8b8ce0
Merge branch 'wip-MDL-21097-master' of git://github.com/marinaglancy/moodle
2013-06-05 10:36:16 +02:00
Dan Poltawski
ed15e8a8a8
MDL-39940 tags: missing setType call
2013-06-05 16:16:49 +08:00
Marina Glancy
56b4d0282d
MDL-21097 Correctly check capabilities for frontpage editing mode
2013-06-05 18:11:08 +10:00
Dan Poltawski
1caff55c2c
Merge branch 'wip-MDL-21097-master' of git://github.com/marinaglancy/moodle
2013-06-05 13:10:12 +08:00
Rossiani Wijaya
01a9646138
MDL-39773 bootstrapbase: add style for .centerpadded.
...
Relocate .centerpadded styling from standard to base themes
2013-06-05 12:43:56 +08:00
Marina Glancy
3947b8ce4e
MDL-21097 corrected course editing roles
2013-06-05 14:30:21 +10:00
Dan Poltawski
c05660fc35
Merge branch 'MDL-39977' of git://github.com/lazydaisy/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-06-05 10:11:42 +08:00
Marina Glancy
cdb6045d54
MDL-38773 Purge coursecat cache on course restore
2013-06-05 12:02:33 +10:00
Andrew Davis
afd2efc0e8
MDL-36090 core_grade: added logging of overriding of student grades
2013-06-05 08:51:53 +08:00
Eloy Lafuente (stronk7)
371bf22cc6
Merge branch 'master-MDL-39409-auth-cas-use-moodle-web-proxy' of https://github.com/brki/moodle
2013-06-05 02:45:37 +02:00
Eloy Lafuente (stronk7)
8c07c404be
Merge branch 'w23_MDL-39416_m26_pagelog' of git://github.com/skodak/moodle
2013-06-05 02:43:21 +02:00
AMOS bot
27da58aee0
Automatically generated installer lang files
2013-06-05 00:39:44 +00:00
Eloy Lafuente (stronk7)
796b57ea0b
Merge branch 'MDL-39968-master' of git://github.com/danpoltawski/moodle
2013-06-05 02:32:29 +02:00
Eloy Lafuente (stronk7)
eb5bc31d24
Merge branch 'MDL-38731-master' of git://github.com/danpoltawski/moodle
2013-06-05 02:29:43 +02:00
Eloy Lafuente (stronk7)
28820155d1
Merge branch 'MDL-37332-master' of git://github.com/danpoltawski/moodle
2013-06-05 02:27:08 +02:00
Eloy Lafuente (stronk7)
3294f68f4a
Merge branch 'm25_MDL-38545_PHP_Strict_error' of https://github.com/scara/moodle
2013-06-05 02:22:22 +02:00
Yuliya Bozhko
33a43a3386
MDL-39790 Add badges block to the course page
2013-06-05 01:49:40 +02:00
Eloy Lafuente (stronk7)
32ce8b6803
Merge branch 'wip-MDL-21097-master' of git://github.com/marinaglancy/moodle
2013-06-05 01:43:03 +02:00
Mary Evans
665c8e972a
MDL-40018 theme_sky_high: Fixed footer in admin pages.
2013-06-04 23:36:38 +01:00
Eloy Lafuente (stronk7)
a182f88f7f
MDL-39723 prevent update_courses() bad habits.
...
All the external functions end calling require_login() that is
always in charge of setting the $COURSE global. This is not a
problem, but in the case of core_course_external::update_courses()
testing, where we are, in the same "request", both setting and getting
the $COURSE information and it's clearly outdated, so the test fails.
Alternative solution would be to modify the external function to ensure
that, after updating a course, $COURSE is also updated with the changes
but it does not seem to be necessary for "normal" usage (both UI/WS POVs).
2013-06-04 21:45:15 +02:00
Eloy Lafuente (stronk7)
79452da1c8
Merge branch 'MDL-39723-master' of git://github.com/sammarshallou/moodle
2013-06-04 17:47:45 +02:00
Mark Nelson
ec16252734
MDL-40010 notes: passing an object rather than an id to avoid debugging message
2013-06-04 18:19:30 +08:00
Gareth J Barnard
321e7cb52d
MDL-39820 theme_bootstrapbase: Fix form button alignment for badges.
2013-06-04 11:12:37 +01:00
Mark Nelson
35a391d3ab
MDL-40009 notes: corrected the form element names passed to setType
2013-06-04 17:59:24 +08:00
Dan Poltawski
dd03ed1051
Merge branch 'MDL-39945' of git://github.com/timhunt/moodle
2013-06-04 15:53:56 +08:00
Dan Poltawski
20fe8676ea
Merge branch 'MDL-39835_M26' of github.com:lazydaisy/moodle
2013-06-04 14:44:35 +08:00
Dan Poltawski
93ab081025
Merge branch 'wip-MDL-39819_master' of git://github.com/gjb2048/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-06-04 14:37:55 +08:00
Dan Poltawski
e404e040d3
Merge branch 'wip-MDL-39870-master' of git://github.com/marinaglancy/moodle
2013-06-04 14:14:18 +08:00
Dan Poltawski
31e9ffe0ac
MDL-39931 less: recompile with whitespace removed
2013-06-04 14:08:28 +08:00
Dan Poltawski
42d00d3638
Merge branch 'MDL-39931' of github.com:lazydaisy/moodle
2013-06-04 13:31:34 +08:00
Dan Poltawski
7f639dd352
Merge branch 'MDL-39536-master' of git://github.com/FMCorz/moodle
2013-06-04 13:18:49 +08:00
Frederic Massart
1530fe2192
MDL-39536 completion: Unit tests for get_activities and has_activities
2013-06-04 12:57:13 +08:00
Frederic Massart
8ca0c12370
MDL-39536 completion: Prevent DB call when fetching activities
2013-06-04 12:57:10 +08:00
Dan Poltawski
984dc35457
Merge branch 'MDL-39939-scorm-basic-report-name' of git://github.com/mudrd8mz/moodle
2013-06-04 12:27:30 +08:00
Mark Nelson
85c402a89d
MDL-40008 forms: fixed ordering of the calendar icon and enable checkbox for the date selector element
2013-06-04 11:55:48 +08:00
Dan Poltawski
4dfadbc99b
Merge branch 'wip-mdl-39827' of git://github.com/rajeshtaneja/moodle
2013-06-04 11:29:38 +08:00
Dan Poltawski
ea746c0166
Merge branch 'MDL-39317-master' of git://github.com/damyon/moodle
2013-06-04 11:26:28 +08:00
Frederic Massart
89f9dce0f7
MDL-39865 navigation: Removed unaccessible repositories node
...
A user is not allowed to edit another user's repositories, in any
circumstances. The repositories node under 'Profile setting for X'
does not make sense under those conditions.
2013-06-04 11:08:22 +08:00
Frederic Massart
0595d1d5a9
MDL-39865 navigation: 'Profile settings for ...' always displayed
...
Before this patch, 'Profile settings for X' would only be displayed
if X can access the course, which means that if the course is hidden
the node would be hidden as well. We changed this so that the user
needs to be enrolled in the course.
2013-06-04 11:07:49 +08:00
Dan Poltawski
0d9121a1c4
Merge branch 'MDL-39743-master' of git://github.com/damyon/moodle
2013-06-04 11:03:39 +08:00
Dan Poltawski
820b66be58
Merge branch 'wip_master_mdl-34085' of https://github.com/iarenaza/moodle
2013-06-04 10:42:45 +08:00
AMOS bot
d7d235e025
Automatically generated installer lang files
2013-06-04 00:46:34 +00:00
Eloy Lafuente (stronk7)
b50ddbdbd5
Merge branch 'wip-MDL-39801-master' of git://github.com/marinaglancy/moodle
2013-06-04 01:51:10 +02:00
Eloy Lafuente (stronk7)
aed9401e14
MDL-39764 style: phpdoc changed to inline comments
2013-06-04 01:41:58 +02:00
Eloy Lafuente (stronk7)
00169e862e
Merge branch 'wip-MDL-39764_master_3' of git://github.com/gjb2048/moodle
2013-06-04 01:36:16 +02:00
Eloy Lafuente (stronk7)
fd4c01566e
Merge branch 'w23_MDL-39882_m26_behatconfig' of git://github.com/skodak/moodle
2013-06-04 01:31:54 +02:00
Eloy Lafuente (stronk7)
422595e282
Merge branch 'MDL-39821-master' of git://github.com/damyon/moodle
2013-06-04 01:14:09 +02:00
Eloy Lafuente (stronk7)
d13d3f2d31
MDL-39465 Show env. info instead of part twice.
2013-06-04 00:50:15 +02:00
Gareth J Barnard
86f590b45f
MDL-39764 course_format: Allow courses to have numsections > maxsections.
2013-06-03 23:36:32 +01:00