3863 Commits

Author SHA1 Message Date
Marina Glancy
4a3fb71c4f MDL-41436 Removing references to fields course.modinfo, sectioncache
Also add the field cacherev to the lists of default fields in course retrieval functions
2013-09-10 14:11:51 +10:00
Marina Glancy
6d04c4f2a2 MDL-41192 course: Added property-read cm_info::effectivegroupmode 2013-09-10 14:11:36 +10:00
Damyon Wiese
426cdef0bc Merge branch 'wip-MDL-41517-master' of git://github.com/marinaglancy/moodle 2013-09-09 12:43:32 +08:00
Damyon Wiese
1320c3177b Merge branch 'MDL-18375_master' of git://github.com/markn86/moodle 2013-09-09 10:41:12 +08:00
Sam Hemelryk
771080ba7d Merge branch 'MDL-41417_master' of https://github.com/markn86/moodle 2013-09-09 10:54:11 +12:00
Petr Škoda
f9beaf4472 MDL-28094 fix subdirs support in module intro editor 2013-09-07 11:30:19 +02:00
Petr Škoda
5e95223e86 MDL-28094 keep subdirs in content upgraded from 1.x 2013-09-07 11:30:19 +02:00
Mark Nelson
c3bf6181aa MDL-41417 course: allow the use of duplicated idnumbers if they existed before fix 2013-09-06 15:18:23 +08:00
Francis Devine
5536a5617c MDL-41417 course: prevent duplicate idnumbers being used when updating a course 2013-09-06 11:34:04 +08:00
Mark Nelson
df5d27d892 MDL-18375 calendar: only display the choice of calendar types if there is more than one 2013-09-05 18:32:16 +08:00
Mark Nelson
022745acd2 MDL-18375 calendar: implemented the usage of the recently introduced automatic class loading 2013-09-05 18:32:16 +08:00
Mark Nelson
7e52491cf9 MDL-18375 calendar: moved the location of the calendar type select box when editing a course 2013-09-05 18:30:05 +08:00
Mark Nelson
2f00e1b245 MDL-18375 calendar: huge refactor of the initial patch
1) Moved the calendar types location to a sub-folder in the calendar directory.
2) Removed/moved language strings.
3) Removed calendar types that should be downloaded as plugins.
4) Removed a Non-English language pack for the Gregorian calendar type that
should be downloaded separately.
5) Removed custom files responsible for checking for updates and uninstalling
calendar types, which should be done by core.
6) Removed JS from the calendar_month block as there is no non-JS alternative
provided and the JS written does not make use of the YUI library to ensure
multiple browser support.
7) Removed code from the base class responsible for creating timestamps that
are saved in the DB.
8) Added PHPDocs.

Note: In the original patch we are editing core functions responsible for saving
time in the database in the calendar base class. This is very dangerous, we do
not want to touch these functions as it could cause a complete fubar of the
database. There are places we are forcing the use of the gregorian calendar as
we are passing dates generated by the PHP date function, where as sometimes
we pass dates from usergetdate (which was being overwritten to return the
date specific to the calendar). We can not expect third party modules to
change the calendar type depending on the format they pass to these functions.
2013-09-05 18:30:05 +08:00
Shamim Rezaie
6dd59aabfa MDL-18375 calendar: added multiple calendar support
Conflicts:

	course/edit_form.php
	lib/db/install.xml
	lib/form/dateselector.php
	lib/form/datetimeselector.php
	lib/setup.php
2013-09-05 18:30:05 +08:00
Eloy Lafuente (stronk7)
58c80b03a8 Merge branch 'MDL-40566_master' of git://github.com/dmonllao/moodle 2013-09-03 20:38:53 +02:00
Marina Glancy
24f824b924 MDL-41517 Do not call fix_course_sortorder unnecessarily
Thanks to Thomas Worthington
2013-09-03 13:45:00 +10:00
Dan Poltawski
2793260fc0 MDL-41256 course tests: improve robustness
* Fail if an exception isn't recieved
* Don't allow the possibility of an undefined variable being tested
2013-09-03 11:01:15 +08:00
Dan Poltawski
c6569641e7 Merge branch 'MDL-41256-master' of https://github.com/mackensen/moodle 2013-09-03 10:51:27 +08:00
David Monllao
fcc0b5b920 MDL-40566 behat: Update features using the new options 2013-09-03 10:31:57 +08:00
Damyon Wiese
e3f3475079 Merge branch 'wip-MDL-41127-master' of git://github.com/marinaglancy/moodle 2013-08-27 15:55:14 +08:00
Damyon Wiese
cbd91e23e9 Merge branch 'wip-MDL-40931-m26' of git://github.com/samhemelryk/moodle
Conflicts:
	version.php
2013-08-27 15:29:49 +08:00
Marina Glancy
d55f05ef43 MDL-41181 function moveto_module does not modify properties of object
instead it returns the new value for module visibility
2013-08-27 15:36:40 +10:00
Marina Glancy
955d91c698 MDL-41181 No need to reset modinfo cache after moveto_module()
it is already reset inside the function
2013-08-27 15:36:21 +10:00
Damyon Wiese
f6c2af867f Merge branch 'master_MDL-40122' of git://github.com/danmarsden/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2013-08-27 13:16:55 +08:00
Charles Fulton
9930e4267c MDL-41256 course: improved debugging on course creation 2013-08-26 06:59:33 -07:00
Marina Glancy
46ecaa5827 MDL-41127 Remove the quick category move dropdowns if page is too big 2013-08-26 15:40:24 +10:00
Sam Hemelryk
c3d2fbf9cd MDL-40931 useragent: separated user agent functionality into a lib
This commit moves user agent related functionality out of several
core libraries and combines it into a more manageable class.
All core uses are converted and functions deprecated in favor
of the new class.
2013-08-26 13:59:19 +12:00
Damyon Wiese
9ead041cdb Revert "MDL-40931 useragent: separated user agent functionality into a lib"
This reverts commit af62237d0e6e27df868d50848f7098f57c103f86.
This reverts commit 87a4194fdcd322d4aee5a6207b55a8da0864da94.
This reverts commit b2c66eb60c01805f26cc791966f05be52af7b406.

Conflicts:

	version.php
2013-08-22 13:31:25 +08:00
Dan Marsden
3d1808c6e2 MDL-40122 SCORM: replace SCORM course format with singleactivity 2013-08-21 20:26:06 +12:00
Damyon Wiese
74df2951d1 Revert "MDL-39876 Change get_record('course') calls to get_course"
This reverts commit ab7632b74c331540c90229bf03d13aa2e6bdd9be.
2013-08-21 13:42:30 +08:00
Dan Poltawski
a101c7f011 Merge branch 'MDL-41143-master' of git://github.com/FMCorz/moodle 2013-08-21 13:40:23 +08:00
Frederic Massart
30905b5bcb MDL-41143 course: Missing formslib required for constant use 2013-08-21 13:31:59 +08:00
Dan Poltawski
d99a300563 Merge branch 'wip-MDL-36690-master' of git://github.com/marinaglancy/moodle 2013-08-21 11:35:27 +08:00
Sam Hemelryk
487caf6b65 Revert "MDL-39876 update_course_record function to update global COURSE"
This reverts commit c290ac5510ca06b3eae557c2165c2f106dde46aa.

Conflicts:
	course/lib.php
2013-08-21 15:21:06 +12:00
Marina Glancy
4fcdb0123c MDL-36690 Do not cache objects inside course.modinfo as they may fail to serialize
convert moodle_url (all other fields are numbers or strings) to string before caching and then back to moodle_url when restoring.
Otherwise serialized modinfo can contain \0 byte which cause problems in Postgres DB
2013-08-21 12:30:38 +10:00
Sam Hemelryk
6eee89bc8f Merge branch 'MDL-39876-master' of git://github.com/sammarshallou/moodle
Conflicts:
	course/lib.php
2013-08-21 12:08:46 +12:00
Marina Glancy
e542bc26d9 Merge branch 'wip-mdl-40042' of git://github.com/rajeshtaneja/moodle 2013-08-21 10:02:41 +10:00
Dan Poltawski
43964b852a Merge branch 'MDL-41125-master' of git://github.com/FMCorz/moodle 2013-08-20 17:10:05 +08:00
Damyon Wiese
89959d9ad1 Merge branch 'wip-MDL-40931-m26' of git://github.com/samhemelryk/moodle 2013-08-20 16:45:33 +08:00
Mark Nelson
9e2d9135f6 MDL-39957 course: added missing assertions for events
This occurred when an add_to_log call, with no associated legacy event,
was replaced with a new event. We should still call assertEventLegacyData
even though there is no legacy event data to compare with, simply ensure
that the expected data was passed.
2013-08-20 15:59:11 +08:00
Dan Poltawski
7d7e0292cb Merge branch 'wip-MDL-40974-m26' of git://github.com/samhemelryk/moodle 2013-08-20 15:13:02 +08:00
Damyon Wiese
5a10d2a7ae Merge branch 'wip-mdl-40043' of git://github.com/rajeshtaneja/moodle
Conflicts:
	course/tests/courselib_test.php
	lang/en/moodle.php
2013-08-20 14:40:42 +08:00
Rajesh Taneja
71298fea03 MDL-40043 Events API: Added user_loggedinas event to replace add_to_log 2013-08-20 14:07:35 +08:00
Rajesh Taneja
ed29bf0f66 MDL-40043 Events API: Added course_section_updated event to replace add_to_log 2013-08-20 14:07:35 +08:00
Dan Poltawski
91a888df34 Merge branch 'MDL-39957_master' of https://github.com/markn86/moodle 2013-08-20 12:38:08 +08:00
Rajesh Taneja
135dde74ed MDL-40042 Completion: added course_completion_updated event to remove related add_to_log 2013-08-16 09:34:23 +08:00
Sam Hemelryk
af62237d0e MDL-40931 useragent: separated user agent functionality into a lib
This commit moves user agent related functionality out of several
core libraries and combines it into a more manageable class.
All core uses are converted and functions deprecated in favor
of the new class.
2013-08-16 09:02:01 +12:00
Sam Hemelryk
25c605a526 MDL-40974 course: fixed group mode icon now has tooltip 2013-08-16 08:59:01 +12:00
sam marshall
c290ac5510 MDL-39876 update_course_record function to update global COURSE 2013-08-15 11:31:21 +01:00
sam marshall
ab7632b74c MDL-39876 Change get_record('course') calls to get_course 2013-08-15 11:31:20 +01:00