moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 17:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
69111 commits 37 branches 540 tags 1.3 GiB
Commit graph

4230 commits

Author SHA1 Message Date
Sam Hemelryk
487caf6b65 Revert "MDL-39876 update_course_record function to update global COURSE" 
This reverts commit c290ac5510.

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
Mark Nelson
cd14c5cab8 MDL-39957 course: replaced add_to_log for hiding/showing courses 2013-08-15 18:14:08 +08:00
Mark Nelson
e5959771b2 MDL-39957 course: added PHPUnit assertions for when a course_updated event is triggered by moving a course 2013-08-15 18:14:08 +08:00
Mark Nelson
ed54cb4110 MDL-39957 course: replaced add_to_log for moving courses 2013-08-15 18:14:08 +08:00
Mark Nelson
2bf2f3599e MDL-39957 course: altered the handling of legacy log data for the course_updated event 2013-08-15 18:14:08 +08:00
Mark Nelson
02cbb621d6 MDL-39957 course: added PHPUnit test for the new course_restored event 2013-08-15 18:14:08 +08:00
Mark Nelson
7240cd92f9 MDL-39957 course: added PHPUnit test for the new course_category_deleted event 2013-08-15 18:14:08 +08:00
Mark Nelson
ec8f23de3b MDL-39957 course: added PHPUnit test for the new course_content_deleted event 2013-08-15 18:14:08 +08:00
Mark Nelson
bc3c5b222a MDL-39957 course: added PHPUnit test for the new course_deleted event 2013-08-15 18:14:07 +08:00
Mark Nelson
c347241ac8 MDL-39957 course: replaced the course_deleted legacy event 2013-08-15 18:14:07 +08:00
Mark Nelson
4fd391d515 MDL-39957 course: added PHPUnit test for the new course_updated event 2013-08-15 18:14:07 +08:00
Mark Nelson
53a8e678bf MDL-39957 course: replaced the course_updated legacy event 2013-08-15 18:14:07 +08:00
Mark Nelson
35ad79e20d MDL-39957 course: added PHPUnit test for the new course_created event 2013-08-15 18:14:07 +08:00
Mark Nelson
3c2fab942b MDL-39957 course: replaced the course_created legacy event 2013-08-15 18:14:07 +08:00
Damyon Wiese
bbb483b259 MDL-36002 Drag and Drop: Improvements to keyboard drag and drop 
List of fixes:
* Add a simulated drag start event to fix problems with block drag and drop that
  were expecting it.
* Add an access-hidden title for the General section in a course format. This
  is used to provide the text for the drop region (better than the first activity in the section)
* Changed the text in the list to 'Move to "General"' instead of 'Move after General'. This
  makes more sense for activities when you have a list of activities and sections together.
 2013-08-15 16:15:32 +08:00
Damyon Wiese
dd66b6ab48 MDL-36002 core: Make drag and drop keyboard friendly (round 2) 2013-08-15 14:39:00 +08:00
Sam Hemelryk
702d1f853e Revert "MDL-36002 core: Make drag and drop keyboard friendly" 
This reverts commit 7c271b9, 313e585, ade4695, and 70b4027

Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-08-15 13:59:06 +12:00
Dan Poltawski
387d040b7b Merge branch 'MDL-40668-master' of git://github.com/damyon/moodle 2013-08-13 11:14:37 +08:00
Damyon Wiese
0c0dfa8fbd MDL-40668 tinymce: Remove collapsable editor options 
We have an alternative (pdw toolbars)
Also, allow tinymce to be collapsed down to a single row.
 2013-08-13 10:54:36 +08:00
Sam Hemelryk
615cf2d15a Merge branch 'MDL-41045-master' of git://github.com/sammarshallou/moodle 2013-08-13 10:19:34 +12:00
Sam Hemelryk
6648f17384 Merge branch 'wip-MDL-41114-master' of git://github.com/marinaglancy/moodle 2013-08-13 09:32:48 +12:00
Marina Glancy
a7a04f6d62 MDL-41114 Avoid unnecessary retrieving of coursecat from DB 
- course category depth can be estimated in make_categories_options() by the number of separators
 2013-08-12 15:07:46 +10:00
Dan Poltawski
f2b45ad65f Merge branch 'MDL-36002-master' of git://github.com/damyon/moodle 
Conflicts:
	theme/base/style/core.css
	theme/bootstrapbase/style/moodle.css
 2013-08-12 11:56:37 +08:00
Frederic Massart
5297336942 MDL-41125 course: Only require dndupload library when necessary 2013-08-12 11:34:51 +08:00
sam marshall
5523c34462 MDL-41045 course_add_cm_to_section should not test for sections unless necessary 2013-08-07 17:17:04 +01:00
Petr Škoda
2f1e464a88 MDL-40438 migrate all collatorlib:: and textlib:: uses 2013-08-06 21:04:35 +02:00
Sam Hemelryk
fe33106bb1 Merge branch 'MDL-40955-m' of git://github.com/andrewnicols/moodle 
Conflicts:
	course/format/upgrade.txt
 2013-08-06 12:49:28 +12:00
Sam Hemelryk
468ee9863d Merge branch 'MDL-40953-m' of git://github.com/andrewnicols/moodle 2013-08-06 12:45:20 +12:00
Sam Hemelryk
b09abb05ab Merge branch 'w32_MDL-40901_m26_phpunitcleanup2' of https://github.com/skodak/moodle 2013-08-06 08:53:24 +12:00
Marina Glancy
40e0dbd5ac Merge branch 'MDL-40320-master' of git://github.com/sammarshallou/moodle 2013-08-05 12:30:56 +10:00
Petr Škoda
8252b7c291 MDL-40901 standardise core test case class and file names 
This finally allows us to type only the class name when executing individual core test cases.
 2013-08-04 22:10:31 +02:00
sam marshall
be108c7ab0 MDL-40320 Course page: Text greyed when conditional activity available 2013-08-01 14:14:43 +01:00
Sam Hemelryk
f803ce267f MDL-39814 actionmenu: tweaked the action menu post integration 
The following changes have been made:
 * course_section_cm_edit_actions now allows the caller more options for the
   display of the action menu.
 * The site menu block now disables the JS enhancement of the actionmenu so
   that it displays as it did before. After more testing this seemed like the
   only option that worked in the limited space of the block when it had
   several modules.
 * draganddrop of resources now triggers the action menu enhancement as well.
 * Fixed display of title when the menu is not being enhanced by JS.
 * Fixed the alignment of the completion icon in the bootstrapbase theme.
 * Tweaked the CSS for the standard theme.
 2013-08-01 13:05:04 +12:00
Andrew Nicols
9ce4fa2fd4 MDL-40955 Course: Add a new renderer to give a complete course module 2013-07-31 11:14:05 +01:00