mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
61,490 Commits 36 Branches 519 Tags
Commit Graph

3714 Commits

Author SHA1 Message Date
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
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
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
Dan Poltawski
cbd77ed9bb Merge branch 'wip-MDL-39065-master' of git://github.com/marinaglancy/moodle 2013-05-06 13:25:51 +01:00
Marina Glancy
8a3d804a32 MDL-39520 always include lib file when accessing coursecat class 2013-05-06 21:06:55 +10:00
Eloy Lafuente (stronk7)
081bfdc5ff Merge branch 'MDL-39348_master' of git://github.com/dmonllao/moodle 2013-05-06 01:49:51 +02:00
David Monllao
00ea74cb54 MDL-39348 behat: Chaining strings instead of splitting strings in lines 2013-05-03 10:16:44 +08:00
David Monllao
4d40089d88 MDL-39348 behat: Changing to correct activity names 2013-05-03 10:16:44 +08:00
Marina Glancy
89a24463ad MDL-39065 fixed bug with quick jump to category 2013-05-03 11:28:41 +10:00
Tim Hunt
6382060daf MDL-39450 course formats: add static cache to get_format_or_default 
This function gets called hundreds of times on every page, often with
exactly the same input, so I added a static cache.
 2013-05-02 16:38:52 +01:00
Damyon Wiese
e7c5ee5102 Merge branch 'MDL-30775-master' of git://github.com/mouneyrac/moodle 
Conflicts:
	course/externallib.php
 2013-05-02 16:20:30 +08:00
Eloy Lafuente (stronk7)
cedb0aab5a MDL-39434 Bump all versions near 2.5 release 2013-05-01 18:03:29 +02:00
sam marshall
a9f5fc158c MDL-38315 Completion: Bugs with 'locked' status in activity form 2013-05-01 11:57:29 +01:00
Eloy Lafuente (stronk7)
6fc4895276 Merge branch 'wip-MDL-39432-m25' of git://github.com/samhemelryk/moodle 2013-05-01 01:33:18 +02:00
Sam Hemelryk
d25103c4ef Merge branch 'MDL-39422-master' of git://github.com/danpoltawski/moodle 
Conflicts:
	mod/wiki/mod_form.php
 2013-05-01 11:15:24 +12:00
Sam Hemelryk
eb426f2480 Merge branch 'wip-MDL-39099_master' of git://github.com/gjb2048/moodle 2013-05-01 11:05:05 +12:00
Eloy Lafuente (stronk7)
6a222aa127 Merge branch 'MDL-39232_master' of git://github.com/dmonllao/moodle 2013-05-01 00:47:32 +02:00
Sam Hemelryk
91a8b40427 MDL-39432 course: converted closures to lambda functions 2013-05-01 10:41:00 +12:00
Dan Poltawski
4fb3df32ac MDL-39422 course: prevent module names longer 255 chars 
To prevent ugly DB errors.
 2013-04-30 17:21:15 +01:00
Gareth J Barnard
3f435f899d MDL-39099 course_format: Allow section_summary() to be overridden. 2013-04-30 16:56:55 +01:00
Jerome Mouneyrac
9f3cc17d8f MDL-30775 get_course_contents: remove warnings when the section is empty 2013-04-30 14:06:44 +08:00