3897 Commits

Author SHA1 Message Date
Sam Hemelryk
bd5797e6cc Merge branch 'wip-MDL-41676-master' of git://github.com/marinaglancy/moodle 2013-10-01 10:14:04 +13:00
Mark Nielsen
50ae8814e4 MDL-40248 mod: Allow xxx_get_types() to use default display
* Added new constant: MOD_SUBTYPE_NO_CHILDREN
* When MOD_SUBTYPE_NO_CHILDREN is returned from xxx_get_types()
  then default display is used for activity chooser.
* Updated mod/upgrade.txt
* Removed dead code from navigationlib.php instead of updating
  it for new behavior of xxx_get_types
* Updated lib/upgrade.txt
2013-09-30 16:49:37 +10:00
Sam Hemelryk
73cc3bdeb0 Merge branch 'MDL-41227_dd' of https://github.com/andyjdavis/moodle
Conflicts:
	course/yui/toolboxes/toolboxes.js
2013-09-30 16:15:53 +13:00
Marina Glancy
ba3a8f3231 MDL-41676 Corrected logic when to dim the activity name and content 2013-09-27 18:29:36 +10:00
Andrew Nicols
e818be1046 MDL-40811 JavaScript: Cast activityid to string when checking resources to show/hide 2013-09-25 18:14:06 +01:00
Eric Merrill
4ed604996f MDL-41845 Activity Completion: Make default selection an option.
Makes an option to either default to the activity default, or default
to COMPLETION_TRACKING_NONE. This leaves open the possibility of
allowing activities to pick an actual default, instead of just on/off.
2013-09-25 11:41:07 +10:00
Eloy Lafuente (stronk7)
81eba750d4 Merge branch 'MDL-40811-m' of git://github.com/andrewnicols/moodle 2013-09-24 23:23:15 +02:00
Sam Hemelryk
cc6a0ec48f Merge branch 'MDL-36465-master' of git://github.com/andrewnicols/moodle 2013-09-24 08:33:10 +12:00
Andrew Nicols
0082df9d12 MDL-36465 Course JavaScript: Ensure that the zero section is not draggable 2013-09-23 09:21:44 +01:00
Andrew Davis
d0f30b07ce MDL-41227 core_course:fixed up some JS that was confusing activity visibility 2013-09-23 09:35:27 +07:00
Petr Škoda
d79d5ac276 MDL-31501 rework user session architecture
List of changes:
 * New OOP API using PHP namespace \core\session\.
 * All handlers now update the sessions table consistently.
 * Experimental DB session support in Oracle.
 * Full support for session file handler (filesystem locking required).
 * New option for alternative session directory.
 * Official memcached session handler support.
 * Workaround for memcached version with non-functional gc.
 * Improved security - forced session id regeneration.
 * Improved compatibility with recent PHP releases.
 * Fixed borked CSS during install in debug mode.
 * Switched to file based sessions in new installs.
 * DB session setting disappears if DB does not support sessions.
 * DB session setting disappears if session handler specified in config.php.
 * Fast purging of sessions used in request only.
 * No legacy distinction -  file, database and memcached support the same functionality.
 * Session handler name included in performance info.
 * Fixed user_loggedin and user_loggedout event triggering.
 * Other minor bugfixing and improvements.
 * Fixed database session segfault if MUC disposed before $DB.

Limitations:
 * Session access time is now updated right after session start.
 * Support for $CFG->sessionlockloggedinonly was removed.
 * First request does not update userid in sessions table.
 * The timeouts may break badly if server hosting forces PHP.ini session settings.
 * The session GC is a lot slower, we do not rely on external session timeouts.
 * There cannot be any hooks triggered at the session write time.
 * File and memcached handlers do not support session lock acquire timeouts.
 * Some low level PHP session functions can not be used directly in Moodle code.
2013-09-21 13:11:56 +02:00
Andrew Nicols
dd834cba33 MDL-38661 JavaScript: Add missing lazy loading on collapseall 2013-09-18 11:04:31 +01:00
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 278d64572d272c776c564dcd743959c21ee20c8b.

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 0bac49dc1983824e4861086ed1ab9e13af99d76d
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 1f0a9ce48b3e6f8c5dc6628aa692323909925032
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 0bac49dc1983824e4861086ed1ab9e13af99d76d.
This reverts commit 1f0a9ce48b3e6f8c5dc6628aa692323909925032.
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