mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-25 18:12:29 +01:00
Code Issues Projects Releases Wiki Activity
71,527 Commits 36 Branches 527 Tags
Commit Graph

4311 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
9f0b21eda6 Merge branch 'MDL-46491-master' of git://github.com/andrewnicols/moodle 2014-12-16 00:35:46 +01:00
Andrew Nicols
f6749ba690 MDL-46491 course: Correct activity visibility on section show 2014-12-11 14:48:25 +08:00
Sam Hemelryk
44a4b3d072 Merge branch 'MDL-40552-master' of git://github.com/danpoltawski/moodle 2014-12-09 16:13:40 +13:00
Sam Hemelryk
13ff5c990c Merge branch 'wip-MDL-31851-master' of git://github.com/marinaglancy/moodle 2014-12-09 15:13:33 +13:00
Sam Hemelryk
c62d077b0e MDL-21724 course: fixed handling of returnto=0 2014-12-04 12:14:31 +00:00
Eloy Lafuente (stronk7)
010c36e9e2 Merge branch '48425-48374-29' of git://github.com/samhemelryk/moodle 2014-12-04 12:14:30 +00:00
Eloy Lafuente (stronk7)
8b9bb799f9 Merge branch '21724-29' of git://github.com/samhemelryk/moodle 2014-12-04 12:14:29 +00:00
Dan Poltawski
13e0300961 Merge branch '26226-48304-29' of git://github.com/samhemelryk/moodle 2014-12-04 12:06:04 +00:00
Dan Poltawski
3d891e3263 Merge branch 'MDL-47628-master' of https://github.com/sammarshallou/moodle 
Conflicts:
	availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-min.js
 2014-12-04 12:04:07 +00:00
Dan Poltawski
7b58b245bf Merge branch 'MDL-40241_master' of https://github.com/dmonllao/moodle 2014-12-04 11:33:27 +00:00
Sam Hemelryk
24d0d813e9 MDL-21724 course: ability to return when editing/creating 2014-12-03 10:21:54 +13:00
Sam Hemelryk
fafb221336 MDL-48425 course: management behat tests improved 2014-12-02 11:45:25 +13:00
David Monllao
95d1a366ea MDL-40241 core_completion: Minor fixes to provided patch 
Thanks to Aaron Barnes and Jon Sharp for working on this issue.
 2014-12-01 15:03:18 +08:00
Marina Glancy
c6fb5a7e1e MDL-31851 course request: do not autologin 2014-12-01 14:36:06 +08:00
Andrew Nicols
64e7aa4de1 MDL-28286 JavaScript: Convert all uses of M.str to M.util.get_string 2014-12-01 08:32:04 +13:00
Dan Poltawski
141e7d8747 MDL-40552 course: fixup unit test 
Previously there was an assertion which was never used, now
we ensure to test the course themes functionality each time.
 2014-11-29 12:20:36 +00:00
sam marshall
a4c318325c MDL-47628 Availability: Restrict by selected grouping button 2014-11-28 15:55:41 +00:00
Aaron Barnes
37ee40f3e0 MDL-40241 completion: Default roles unable to manually complete course 
Thanks to Jon Sharp for authoring the original patch!
 2014-11-28 16:50:50 +08:00
Eloy Lafuente (stronk7)
4ef19b1789 Merge branch 'MDL-48277-master' of git://github.com/danpoltawski/moodle 2014-11-25 18:38:24 +01:00
Sam Hemelryk
328e4e4c77 Merge branch 'MDL-23839-master' of git://github.com/andrewnicols/moodle 2014-11-25 14:07:08 +13:00
Sam Hemelryk
4cbf997db0 Merge branch 'MDL-48197-master' of git://github.com/andrewnicols/moodle 2014-11-25 11:02:19 +13:00
David Monllao
03c39daad8 MDL-31500 backup: Allow front page backup/restore 
Removes restore on front page restrictions and allows
front page modules duplication.
 2014-11-21 14:55:09 +08:00
Sam Hemelryk
53623a70f0 MDL-26226 course: new setting for sections as links 
This commit adds a new setting to always display course sections
as links (if possible).
 2014-11-20 15:41:24 +13:00
Andrew Nicols
fc05c1b8e5 MDL-48197 testing: Normalise uses of noemailever and phpmailer sink 2014-11-19 09:09:50 +08:00
Andrew Nicols
494cf9b81c MDL-23839 navigation: Check for assignable course category roles 2014-11-19 08:54:53 +08:00
Dan Poltawski
4b4974881b MDL-48277 css: remove empty CSS files 
To avoid tools moaning and uncessary file loads
* course/style.css was mistakenly added empty in 01e0e7044
* theme/canvas/style/question.css has been empty since 2.1 481dc639
 2014-11-18 22:11:35 +00:00
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