Eloy Lafuente (stronk7)
58c9faeaca
Merge branch 'MDL-38661-m-wip' of git://github.com/andrewnicols/moodle
...
Conflicts:
theme/base/style/core.css
theme/bootstrapbase/style/moodle.css
2013-09-17 19:59:55 +02:00
Andrew Nicols
9bda17ee6f
MDL-40811 JavaScript: Use the new moodle-course-util functions
2013-09-16 21:05:02 +01:00
Andrew Nicols
36c1ac9b7a
MDL-40811 JavaScript: Create a course-util module to reduce code duplication
2013-09-16 20:44:19 +01:00
Ankit Agarwal
63deb5c379
MDL-39959 events: Replace add_to_log() calls with events for course module actions (create, delete and update)
2013-09-16 15:29:56 +08:00
Ankit Agarwal
b9b994c7d2
MDL-39959 events: Add unit tests for course module events
...
test_course_module_created_event()
test_course_module_created_event_exceptions()
test_course_module_updated_event()
test_course_module_updated_event_exceptions()
test_course_module_deleted_event()
test_course_module_deleted_event_exceptions()
2013-09-16 13:42:37 +08:00
Rajesh Taneja
3a11e2d2d6
MDL-41557 Events: Fixed event data snapshot to save valid data
2013-09-13 16:05:23 +08:00
Marina Glancy
e2e9cb6a14
MDL-37028 Fixed bug, orphaned modules are moved to the 0-section
2013-09-13 10:28:52 +10:00
Dan Poltawski
1d49a5cdc6
Revert "MDL-40829: courses heading: remove 'headerblock' class from header and fix heading levels"
...
This reverts commit 278d64572d
.
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-09-12 19:21:43 +08:00
Damyon Wiese
749ce98e63
MDL-37028 Integrity check for course modules and sections
...
This commit reinstates:
commit 0bac49dc19
Author: Marina Glancy <marina@moodle.com>
Date: Tue Sep 3 17:14:13 2013 +1000
MDL-37028 Integrity check for course modules and sections
If section mentioned in 'orphaned' module does not exist module is added to the first available section. Also corrected whitespaces
commit 1f0a9ce48b
Author: Marina Glancy <marina@moodle.com>
Date: Mon Aug 12 14:06:48 2013 +1000
MDL-37028 Integrity check for course modules and sections
created function, unittest, build-in quick integrity check on each call to rebuild_course_cache()
also added CLI script
2013-09-11 10:47:49 +08:00
Eloy Lafuente (stronk7)
34ac96bf6d
Merge branch 'wip-MDL-41508-master' of git://github.com/marinaglancy/moodle
2013-09-10 14:09:34 +02:00
Rossiani Wijaya
278d64572d
MDL-40829: courses heading: remove 'headerblock' class from header and fix heading levels
2013-09-10 17:09:38 +08:00
Dan Poltawski
62b35d5852
Merge branch 'MDL-40833-master' of git://github.com/phalacee/moodle
2013-09-10 16:00:52 +08:00
Damyon Wiese
eceecb72f3
Revert "MDL-37028 Integrity check for course modules and sections"
...
This is failing unit tests.
This reverts commit 0bac49dc19
.
This reverts commit 1f0a9ce48b
.
2013-09-10 14:34:07 +08:00
Damyon Wiese
4fae13bb5e
Merge branch 'wip-MDL-37028-master' of git://github.com/marinaglancy/moodle
2013-09-10 12:51:33 +08:00
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
Andrew Nicols
4dab1c39e2
MDL-38661 JavaScript: Ensure that ARIA tags are set when expanding/collapsing content
2013-09-10 03:22:44 +01:00
Andrew Nicols
1574e6529d
MDL-38661: Add keyboard support for expansion
2013-09-10 03:17:13 +01: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
Andrew Robert Nicols
53c1b936e5
MDL-38661 Course: Add JS category expander.
...
This adds a category expanded which:
* fetches child content in a category tree if it has not already been loaded;
* toggles relevant classes on the category node to show and hide child content; and
* applies appropriate animations to improve user experience.
2013-09-06 10:05:36 +10: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
Jason Fowler
2e2d0f75dd
MDL-40833 Course - Single topic pages need h3 for section heading
2013-09-04 15:39:27 +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
0bac49dc19
MDL-37028 Integrity check for course modules and sections
...
If section mentioned in 'orphaned' module does not exist module is added to the first available section. Also corrected whitespaces
2013-09-03 17:14:13 +10:00
Marina Glancy
30fe1181b5
MDL-41508 Changes in indentation
2013-09-03 14:21:28 +10: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
Marina Glancy
aec8fe2f9b
MDL-41508 move_courses() bug fix and DB query improvement
2013-08-30 16:47:25 +10:00
Marina Glancy
1f0a9ce48b
MDL-37028 Integrity check for course modules and sections
...
created function, unittest, build-in quick integrity check on each call to rebuild_course_cache()
also added CLI script
2013-08-30 16:41:13 +10: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 af62237d0e
.
This reverts commit 87a4194fdc
.
This reverts commit b2c66eb60c
.
Conflicts:
version.php
2013-08-22 13:31:25 +08:00