mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
71,161 Commits 36 Branches 519 Tags
Commit Graph

4285 Commits

Author SHA1 Message Date
Sam Hemelryk
469c32955a Merge branch 'MDL-33606_master' of git://github.com/dmonllao/moodle 2014-11-19 09:37:19 +13:00
David Monllao
d931574ff9 MDL-33606 course: Adding section info to course_viewed log 
Also changing references to section id to
section number, that it is what it really is.
 2014-11-17 15:18:18 +08:00
Sam Hemelryk
701772c0e8 MDL-47434 format_topics: section 0 navigation tweak 
Section 0 is now only shown in the navigation block if it contains
activities.
If there are no activities then the section is removed.
This mimicks the display on the course page.
 2014-11-14 11:40:17 +13:00
Sam Hemelryk
f9745259b7 MDL-47434 format_weeks: section 0 navigation tweak 
Section 0 is now only shown in the navigation block if it contains
activities.
If there are no activities then the section is removed.
This mimicks the display on the course page.
 2014-11-14 11:40:17 +13:00
Eloy Lafuente (stronk7)
de881693f7 MDL-48021 bump: Bump all versions to planned release 
This bumps all versions to planned 2.8 release
(2014111000) version and all the dependencies to
current 2.8rc1 (2014110400)
 2014-11-04 17:52:35 +01:00
Damyon Wiese
7a056947e3 Merge branch 'MDL-45636-course_master' of https://github.com/eSrem/moodle 2014-11-04 13:47:51 +08:00
David Monllao
f31d564133 MDL-47950 course: Adding sesskey confirmation when duplicating activities 2014-10-30 16:58:45 +00:00
Sam Hemelryk
45ad1693cd MDL-47183 post-integration fixes 
* Fixed typo with context_module::instance
* Fixed use of $mod->get_context()
 2014-10-28 15:59:59 +13:00
Sam Hemelryk
77b31ba2ce Merge branch 'MDL-47183-master' of git://github.com/andrewnicols/moodle 2014-10-28 14:02:19 +13:00
Damyon Wiese
ae0711d861 MDL-47690 Course: Remove unused variable from unit tests. 2014-10-27 11:26:35 +08:00
Damyon Wiese
d2dbc373f8 Merge branch 'MDL-47690-master' of git://github.com/jleyva/moodle 2014-10-27 11:11:53 +08:00
Sam Hemelryk
7117571c34 Merge branch 'MDL-47555' of https://github.com/rlorenzo/moodle 2014-10-24 11:48:21 +02:00
Dan Poltawski
3456ac3ba0 Merge branch '47684-28' of git://github.com/samhemelryk/moodle 2014-10-24 11:48:16 +02:00
Juan Leyva
e13c152e82 MDL-47690 web services: Fixed invalid return parameter type in mod_url 2014-10-24 09:54:35 +02:00
Adrian Greeve
c42d18183a MDL-47675 phpunit: Update unit tests to pass on MSSQL 
Unit tests were failing on MSSQL. gc_collect_cycles() was
removed from the phpunit utils.php file to save time in running
the tests, but MSSQL doesn't clean up open files as well as
other databases.

This patch includes the garbage collection for the unit tests
that require it.
 2014-10-20 14:26:11 +08:00
Sam Hemelryk
d28e0a2f76 MDL-47684 mod: better validation of rating options 2014-10-20 08:44:35 +13:00
Dan Poltawski
f6aaa184ab Revert "MDL-47684 mod: better validation of rating options" 
This reverts commit 8028df293a4f024a954dc12ed4e6cb5161c951b0.
 2014-10-17 14:27:49 +01:00
Sam Hemelryk
8028df293a MDL-47684 mod: better validation of rating options 2014-10-16 14:50:56 +13:00
Rex Lorenzo
6fa877e243 MDL-47555 core_availability: Issue with page layout & grade restriction 
* Set pagelayout before getting section info, otherwise conditional activity renderers will default to the default 'base' layout.
 2014-10-10 14:57:21 -07:00
Sam Hemelryk
b92a7dd0d8 Merge branch 'MDL-46984_master' of https://github.com/markn86/moodle 2014-10-09 09:16:40 +13:00
Marina Glancy
ae66542027 Merge branch 'MDL-31936-master-workshop-reset' of git://github.com/mudrd8mz/moodle 2014-10-07 10:08:48 +08:00
Sam Hemelryk
3ba4e595fb Merge branch 'MDL-46295-master' of git://github.com/damyon/moodle 2014-10-07 10:36:48 +13:00
Andrew Nicols
f67b5c995e MDL-47183: viewhiddenactivities should use the module context 
Thanks to Paulo Matos for the forum part of this change.
 2014-10-06 12:21:49 +08:00
Dan Poltawski
06b5e81bcd MDL-43472 course: behat tests for searching courses 2014-10-04 08:40:32 +01:00
Julien Boulen
0556eaa9b0 MDL-46984 core_course: added grouping name for activities with no link 2014-10-03 13:10:01 -07:00
Willy Lee
fe3999eca2 MDL-43472 course: Add bulk move to management search page 2014-10-03 06:46:18 -07:00
David Mudrák
e04a0f6b34 MDL-31936 course: Add missing file level docblock to the reset_form.php 
Not related to the issue itself but spotted while working on the
workshop reset feature.  Assigning copyleft holder to Petr as the
original author of the file.
 2014-10-03 10:45:23 +02:00
Willy Lee
cc6b20fbc8 MDL-46295 course: add search box to all course listings, manage button when appropriate 2014-10-01 22:31:24 +08:00
Dan Poltawski
2633f23627 Merge branch 'MDL-47322-master' of https://github.com/sammarshallou/moodle 2014-09-29 11:12:29 +01:00
Sam Hemelryk
525b6ebeb9 Merge branch 'MDL-47033_master' of https://github.com/totara/openbadges 2014-09-29 15:18:03 +13:00
Sam Hemelryk
29b72af1b2 Merge branch 'MDL-43566' of https://github.com/willylee/moodle 2014-09-29 09:51:35 +13:00
sam marshall
06c0603825 MDL-47322 Availability: empty availability should be saved as null 
As part of the unit test modifications for this change, I added the get_json
function to the availability conditions that didn't have it. (This is a function
for use in unit tests.)
 2014-09-26 15:42:37 +01:00
Willy Lee
14cea3164f MDL-43566 course: add delete icon to search returns in course management listings 2014-09-25 05:56:11 -07:00
Marina Glancy
daad1b4b97 MDL-46937 modinfo: Allow course format to overwrite section availability 2014-09-18 16:18:22 +08:00
Marina Glancy
a80f592298 MDL-46834 dndupload: check course dndupload cap on course level 2014-09-11 11:23:32 +08:00
Marina Glancy
e6a0f10152 MDL-46834 dndupload: check course dndupload cap on course level 2014-09-10 15:00:35 +08:00
Yuliya Bozhko
369484bf87 MDL-47033 general: Fix incorrect use of 'course' layout 
It should use 'incourse' layout in most cases

Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
 2014-09-05 09:25:43 +12:00
Syxton
60df67878b MDL-46428 course: Remove confirm when duplicating 
A confirm dialog is given when Javascript is off but not when it is on.
This aligns the two so that they neither have a confirm when duplicating
an activity.
 2014-09-04 15:19:17 -04:00
sam marshall
4717a5fca6 MDL-44725 Availability: Replace groupmembersonly - forms (4) 
Remove groupmembersonly option from module editing forms.
 2014-09-02 13:03:13 +01:00
sam marshall
061e6b2864 MDL-44725 Availability: Replace groupmembersonly - upgrade, core (1) 
* Upgrades existing data so that the groupmembersonly option is
  replaced with equivalent data for the new availability API.
* Removes the database field and admin setting used for
  groupmembersonly.
* Changes core modinfo library to remove/deprecate groupmembersonly
  data and functions.
* Changes other core library files to remove groupmembersonly
  references.

Includes deprecation of several functions, listed in lib/upgrade.txt.
 2014-09-02 13:03:07 +01:00
Virgil Ashruf
118a9b4308 MDL-45636 course_rest: changed modcontext to coursecontext 2014-09-01 12:36:04 +02:00
Damyon Wiese
49025fdda7 Merge branch 'MDL-46902_master' of git://github.com/markn86/moodle 2014-09-01 15:53:44 +08:00
Mark Nelson
09fef88c64 MDL-46902 core_course: display meaningful message when no courses found 2014-08-29 14:15:31 -07:00
Marina Glancy
cdd9c80f1a MDL-39233 mod_url: added unittest for get_course_content 2014-08-26 13:53:13 +08:00
Damyon Wiese
7c32b87bfd Merge branch 'MDL-45029-master' of git://github.com/lameze/moodle 
Conflicts:
	course/modlib.php
 2014-08-20 13:58:22 +08:00
Mark Nelson
617dbe49ed MDL-46188 core_course: use correct hide/show icon 2014-08-20 12:04:35 +08:00
Simey Lameze
78618bc677 MDL-45029 core_course: set aggregationcoef while creating a new course module 2014-08-20 11:56:11 +08:00
Damyon Wiese
391da2bf82 Merge branch 'MDL-45029-master' of git://github.com/lameze/moodle 2014-08-20 10:21:20 +08:00
Simey Lameze
82f336aa84 MDL-45029 core_course: set aggregationcoef while creating a new course module 2014-08-19 17:06:49 +08:00
Marina Glancy
dd924ea9db Merge branch 'MDL-43197-master-2nd' of git://github.com/FMCorz/moodle 2014-08-19 13:25:32 +08:00