3273 Commits

Author SHA1 Message Date
Dan Poltawski
19a8646822 MDL-33624 lang - remove incosistent use of placeholder 2012-07-12 13:10:52 +08:00
Aparup Banerjee
60829d8094 MDL-34225 course completion : moved criteria classes into criteria subdir 2012-07-12 12:04:36 +08:00
Aaron Barnes
eb8f89a976 MDL-22259 completion: Rename "Course Prerequisites" to "Completion Dependencies" 2012-07-12 15:55:34 +12:00
Aparup Banerjee
7534234322 MDL-34225 course completion : move /lib/completion/* up to /completion 2012-07-10 11:06:41 +08:00
Dan Poltawski
e1980f8bb9 Merge branch 'w28_MDL-8249_m24_roletranslations' of git://github.com/skodak/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2012-07-10 09:43:23 +08:00
Sam Hemelryk
2e87278cbd Merge branch 'w28_MDL-34155_m24_visibilitydefault' of git://github.com/skodak/moodle 2012-07-10 12:51:50 +12:00
Sam Hemelryk
871c06e583 Merge branch 'MDL-29538_usercond' of git://github.com/markn86/moodle 2012-07-09 11:44:39 +12:00
Davo Smith
4d40dc9256 MDL-34214 Course dndupload - removed unneeded classes from preview element 2012-07-07 19:02:23 +01:00
Michael Aherne
945a81a943 MDL-34205 Activity chooser default setting 2012-07-06 15:29:08 +01:00
Petr Skoda
c52551dc3c MDL-8249 localise standard role names and descriptions if empty 2012-07-06 08:22:34 +02:00
Petr Škoda
2b42c88170 MDL-34155 use course visibility default when creator does not have moodle/course:visibility 2012-07-06 07:58:07 +02:00
Juan Leyva
30e772a478 MDL-34083 Deleted user_files from backup options 2012-07-04 10:34:24 +02:00
Eloy Lafuente (stronk7)
4fcc358e12 Merge branch 'MDL-33426-master' of git://github.com/sammarshallou/moodle 2012-07-03 16:08:03 +02:00
sam marshall
110f73ad57 MDL-33426 Completion: Multilang activity names wrong in alt/title 2012-07-03 13:10:14 +01:00
Dan Poltawski
eb85dafc8b Merge branch 'MDL-33937-master' of git://github.com/sammarshallou/moodle 2012-07-03 12:29:57 +08:00
Dan Poltawski
1b1ad55b9f MDL-33995 - unit tests: fix class name collision 2012-07-02 14:53:32 +08:00
Dan Poltawski
9bf41fb6aa Merge branch 'MDL-33776' of git://github.com/mouneyrac/moodle 2012-07-02 14:12:53 +08:00
Dan Poltawski
c6ace6b16a Merge branch 'MDL-33995' of git://github.com/mouneyrac/moodle 2012-07-02 14:09:13 +08:00
Jerome Mouneyrac
2a7a021695 MDL-33995 Course external PHPunit test + externallib_testcase helper class 2012-06-27 16:24:22 +08:00
Mark Nelson
be2534fd88 MDL-29538 core_condition: Populating form with wrong value 2012-06-26 15:18:54 +08:00
Mark Nelson
e01fbcf765 MDL-29538 core_condition: Integrated with the latest code, can now place user field conditions on sections as well 2012-06-26 15:18:53 +08:00
Sam Hemelryk
33e657c7e7 MDL-29538 core_condition: Pre-integration merge cleanup
* Fixed up database installation and upgrade code
* Reverted some whitespace optimisations to minimise conflicts
* Optimised commits made by Mark to reduce complexity and add tracker issue numbers
2012-06-26 15:18:53 +08:00
Mark Nelson
95a9bc0e4a MDL-29538 core_condition: ignore any fields that have none selected 2012-06-26 15:18:53 +08:00
Mark Nelson
a6b538a862 MDL-29538 core_condition: validate whether a field has been declared before for that activity 2012-06-26 15:18:52 +08:00
Mark Nelson
a8f84c287c MDL-29538 core_condition: code cleanup 2012-06-26 15:18:52 +08:00
Mark Nelson
af2ce7806b MDL-29538 core_condition: delete the course modules records in the course_module_avail_fields table when deleted 2012-06-26 15:18:52 +08:00
Mark Nelson
cb4492c200 MDL-29538 core_condition: changed the logic in the code so that it works with the new database structure as well as tidying up parts of the code 2012-06-26 15:18:52 +08:00
Mark Nelson
76af15bb4c MDL-29538 core_condition: initial commit to add support for making things conditional on user profile fields 2012-06-26 15:18:51 +08:00
Aaron Barnes
08f19f4848 MDL-32249 completion: Make grade criteria more consistent
Also, round course grades and remove hardcoded string.

Note: This patch also removes the ability to update the course grade
from the completion interface
2012-06-26 13:53:01 +12:00
Andrew Robert Nicols
26992cf171 MDL-33926 Add window scrolling when drag/dropping 2012-06-25 15:27:46 +08:00
Sam Hemelryk
31ea84a503 Merge branch 'MDL-32769-master' of git://github.com/ankitagarwal/moodle 2012-06-22 14:40:09 +12:00
Sam Hemelryk
0e5533b607 MDL-32769 completion: Fixed up display of completion information 2012-06-22 10:42:56 +12:00
sam marshall
c069dacfc1 MDL-33937 Paged course view: Allows view of sections that are not visible 2012-06-21 16:25:52 +01:00
Andrew Robert Nicols
c397e0c8bc MDL-33936 Detect activity chooser in block_site_main_menu correctly 2012-06-21 09:19:20 +01:00
Ankit Agarwal
dce49c1c38 MDL-32769 course: Moving the completion status to a new line 2012-06-21 16:16:48 +08:00
Ankit Agarwal
68b8cc84af MDL-32769 course: Do not show a completion status of 0/0 2012-06-21 13:29:46 +08:00
Andrew Robert Nicols
ae86017339 MDL-33683 Determine sectionid for activity chooser at display time
Rather than calculate the sectionid for the activity chooser on page load,
we do so when opening the chooser. This resolves issues where sections have
been moved without swapping all of the section IDs around.
2012-06-20 10:32:10 +01:00
Jerome Mouneyrac
e6d1218ade MDL-33776 Web services: get_categories - subcategories should be checked against visible/theme keys 2012-06-20 15:49:20 +08:00
Dan Poltawski
a3086f3233 Merge branch 'MDL-33875' of git://github.com/stronk7/moodle 2012-06-20 13:45:49 +08:00
Ankit Agarwal
7c05cd0e1f MDL-32769 course: Adding completion summary to course sections 2012-06-20 09:38:35 +08:00
Eloy Lafuente (stronk7)
4388b63177 MDL-33875 delete category: fix E_STRICT reset() by ref. 2012-06-20 03:31:44 +02:00
Andrew Robert Nicols
a51cf9302b MDL-33862 Ensure that a chooserspan exists before trying to set it up 2012-06-19 15:43:14 +01:00
Eloy Lafuente (stronk7)
926b08ca4b Merge branch 'MDL-33623' of git://github.com/danpoltawski/moodle 2012-06-19 03:05:52 +02:00
Dan Poltawski
3248a1e1e4 Merge branch 'MDL-33794' of git://github.com/stronk7/moodle
Conflicts:
	mod/assign/version.php
2012-06-18 16:08:39 +08:00
Dan Poltawski
f715dc3fd5 Merge branch 'MDL-33573-master-1' of git://git.luns.net.uk/moodle 2012-06-18 15:35:05 +08:00
Frederic Massart
a41b1d96b6 MDL-33775 Course: fix redirect to course/section in paged mode 2012-06-18 15:10:33 +08:00
Eloy Lafuente (stronk7)
c5e783e512 MDL-33794 version.php: Bump all versions, requires and dependencies to 2012061700 2012-06-18 02:37:00 +02:00
Eloy Lafuente (stronk7)
b37681d59c Merge branch 'MDL-33726' of git://github.com/danpoltawski/moodle 2012-06-15 12:16:56 +02:00
Andrew Robert Nicols
8ff6c5ee51 MDL-33769 Switch Submit and Cancel buttons around on Activity Chooser 2012-06-15 08:16:11 +01:00
Dan Poltawski
f898b935af Merge branch 'MDL-33730' of git://github.com/mouneyrac/moodle 2012-06-15 11:07:48 +08:00