3734 Commits

Author SHA1 Message Date
Damyon Wiese
7f198356ef MDL-38359 courselib: Fix unit tests
The courselib tests have hardcoded test data sets for forum and assign
modules that need to be updated every time we add a new feature.
2013-06-11 16:20:55 +08:00
Dan Poltawski
3873f6aa60 Merge branch 'MDL-39449' of git://github.com/timhunt/moodle 2013-06-11 14:09:12 +08:00
Damyon Wiese
19127f6f09 MDL-37459: Fix unprintable chars in wierd commit
Somehow some unprintable chars made it into the last commit.

Removing them all...
2013-06-11 13:25:28 +08:00
Damyon Wiese
3c88a67821 MDL-37459 admin: Admin settings flags
Make "Advanced" and "Lockable" flags for any admin setting.
2013-06-11 12:54:57 +08:00
Sam Hemelryk
9052fc4489 Merge branch 'wip-mdl-33379' of git://github.com/rajeshtaneja/moodle
Conflicts:
	lib/deprecatedlib.php
2013-06-11 10:35:10 +12:00
Sam Hemelryk
fb8010732e Merge branch 'MDL-36090_log2' of git://github.com/andyjdavis/moodle 2013-06-10 12:31:03 +12:00
Marina Glancy
9f370860a4 MDL-40088 fixed bug with not visible course section 2013-06-07 13:55:19 +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
Marina Glancy
3947b8ce4e MDL-21097 corrected course editing roles 2013-06-05 14:30:21 +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)
eb5bc31d24 Merge branch 'MDL-38731-master' of git://github.com/danpoltawski/moodle 2013-06-05 02:29:43 +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
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
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
4dfadbc99b Merge branch 'wip-mdl-39827' of git://github.com/rajeshtaneja/moodle 2013-06-04 11:29:38 +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
Eloy Lafuente (stronk7)
aed9401e14 MDL-39764 style: phpdoc changed to inline comments 2013-06-04 01:41:58 +02:00
Gareth J Barnard
86f590b45f MDL-39764 course_format: Allow courses to have numsections > maxsections. 2013-06-03 23:36:32 +01:00
Dan Poltawski
687732ba6e MDL-38731 course: split course group settings header
Allow translators to translate the heading differently.

AMOS BEGIN
  CPY [groups,group],[groupsettingsheader,group]
AMOS END
2013-05-31 12:03:35 +08:00
Marina Glancy
53dda4f2fc MDL-21097 Allow user to change current section if he does not have any other manageing capability 2013-05-31 13:18:12 +10:00
Marina Glancy
1fda836ca6 MDL-21097 Correctly check capabilities for course settings items
- Make sure that items in course settings (and frontpage settings) are shown depending on user capabilities
- Make sure user is able to turn editing on on the page even if he has only limited number of seciton/modules managing capabilities
2013-05-31 13:17:12 +10:00
Iñaki Arenaza
7469c51270 MDL-34085 Fix the backup options names in core_course_duplicate_course
Fix the option names to match those used by the backup subsystem.
2013-05-30 17:26:29 +02:00
Marina Glancy
74aeac79b4 MDL-39870 correctly determine whether activity is resource or module 2013-05-29 14:45:20 +10:00
sam marshall
a260245739 MDL-39723 Remove unnecessary queries for COURSE, SITE 2013-05-28 13:14:55 +01:00
Rajesh Taneja
0ca328ed23 MDL-39827 course: Trigger invalidate cache event while changing sort-order of category 2013-05-27 10:46:59 +08:00
Eloy Lafuente (stronk7)
9686f7cc04 MDL-36482 Fix slipped error, thanks Petr! 2013-05-22 04:09:10 +02:00
Eloy Lafuente (stronk7)
a42467817b Merge branch 'MDL-36482_master' of https://github.com/mr-russ/moodle 2013-05-21 02:25:41 +02:00
Eloy Lafuente (stronk7)
5e1a48df97 Merge branch 'MDL-39717_master' of git://github.com/dmonllao/moodle 2013-05-21 00:44:05 +02:00
Frederic Massart
4cc4ca963c MDL-39719 course: Pointing to wrong category string in requests 2013-05-20 09:15:08 +08:00
David Monllao
686279d047 MDL-39717 behat: Removing unstable steps and scenarios 2013-05-17 11:24:21 +08:00
David Monllao
7daab4016d MDL-39717 behat: Add info to experimental steps definitions
JS modal dialogs and drag & drop should be
considered experimental as the steps are not
working as expected in all OS/browser combinations.
2013-05-17 11:23:05 +08:00
Dan Poltawski
2a7a5cfa4c Merge branch 'MDL-39599-master-int' of git://github.com/FMCorz/moodle 2013-05-13 13:51:12 +01:00
Frederic Massart
3514319719 MDL-39604 course: Reformat section edit form 2013-05-10 13:52:50 +08:00
Frederic Massart
381ab8e1a3 MDL-39599 course: Fix setType warning in conditional access 2013-05-10 12:17:01 +08:00
Eloy Lafuente (stronk7)
7942df199b Merge branch 'MDL-38559-completion-ui' of git://github.com/mudrd8mz/moodle 2013-05-10 02:37:54 +02:00
David Mudrák
6e5a473c47 MDL-38559 Reorganise course completion settings form
This is a result of a pretty intensive effort to make the form less
sucky, given the completion strings mess around. It partially solves
MDL-39419 too as it clarifies the course completion link in the course
administration block.

I must admit and record here that I'm pretty desperate by the current
state of the core_completion and how strings from it are inconsistently
used at various places with different meanings. For example the 'Completion
tracking' may mean the mode of how activities are tracked within the
course as well as the overall feature of course and activities tracking.
While a same phrase can be used in English for both this meanings, not
all languages have such luck and translating it is a pain in the ass.

Finally, let me give the credit for wording and UI design suggestions to
Helen Foster and all others who helped with this. This has been one of
the most ugliest forms in Moodle and we believe we made it better
(although we know it's far from perfect).
2013-05-09 23:14:57 +02:00
David Monllao
5d7b6307b1 MDL-39586 behat: Closed list of stackeholders 2013-05-09 18:38:13 +08:00
David Monllao
b576bdc75d MDL-39051 behat: New tests
To cover all course controls functionalities with
and without Javascript and with and without paged
course mode.
2013-05-09 17:20:58 +08:00
David Monllao
0e575f010e MDL-39051 behat: New steps for activity related actions 2013-05-09 17:15:25 +08:00
David Mudrák
b3b13e9941 MDL-38559 Clean-up the course completion settings code
This patch does not alter the code, only some syntax fixes and
coding guidelines rules are applied. Strings are re-ordered
alphabetically with no change of their wording. PHP doc blocks
reconstructed using the Git log records.
2013-05-09 08:47:34 +02:00
David Monllao
a07ad80ae6 MDL-39051 behat: Using new steps definitions 2013-05-09 14:27:41 +08:00
Damyon Wiese
b55248d5ad MDL-39462 course: Fix typo in $changesinccoursecat 2013-05-09 14:22:26 +08:00
Russell Smith
48cb2c824d MDL-36482 activities block: Allow mod display without intro's 2013-05-09 09:57:39 +10:00
Dan Poltawski
ca463dcf1c Merge branch 'wip-MDL-39520-master' of git://github.com/marinaglancy/moodle 2013-05-08 12:33:19 +01:00
Dan Poltawski
1d8288f242 Merge branch 'wip-MDL-39462-master' of git://github.com/marinaglancy/moodle 2013-05-08 09:21:42 +01:00
Frederic Massart
31f4725932 MDL-39542 course: Return to right section when JS is off 2013-05-08 11:32:25 +08:00
Marina Glancy
b80a50f7c9 MDL-39462 added missing clearing of coursecat cache 2013-05-08 11:02:45 +10:00
Damyon Wiese
69a0e65c56 MDL-38315 Fix unit tests for module completion 2013-05-06 23:27:40 +08:00
Damyon Wiese
14cd6479de Merge branch 'MDL-38315-master' of git://github.com/sammarshallou/moodle 2013-05-06 22:27:41 +08:00