4256 Commits

Author SHA1 Message Date
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
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
Frederic Massart
abbee05eb3 MDL-43197 gradereport_user: Parents/mentors can see all the relevant grades 2014-08-19 10:47:34 +08:00
shashirepo
c285740896 MDL-46188 course:show/hide button disappears after action 2014-08-14 20:26:28 +05:30
Eloy Lafuente (stronk7)
f414c5aa9e Merge branch 'MDL-46646_master' of https://github.com/Syxton/moodle 2014-08-12 01:53:23 +02:00
Syxton
fc6a0fe294 MDL-46646 course: regression in behat tests
Newly introduced unit tests are failing because the timestamps used are
too large.  Example timestamps were 11 characters long instead of 10.
2014-08-05 08:43:13 -04:00
Rex Lorenzo
84a1e50a9f MDL-46641 behat: Delete activity step does not work without actions menu open 2014-07-31 11:29:00 -07:00
Dan Poltawski
65f00f063b Merge branch 'MDL-45847_master' of https://github.com/Syxton/moodle 2014-07-21 12:09:10 +01:00
Sam Hemelryk
584539c0fc MDL-42909 course: fixed whitespace 2014-07-21 11:42:52 +12:00
Sam Hemelryk
d90b055ab1 Merge branch 'MDL-42909-master' of git://github.com/phalacee/moodle 2014-07-21 11:35:47 +12:00
Sam Hemelryk
ce61d62c5e Merge branch 'MDL-46159-wip' of https://github.com/willylee/moodle 2014-07-21 10:55:08 +12:00
Jason Fowler
33b6b8c93e MDL-42909 Course: Fix title for move-targets 2014-07-18 14:42:00 +08:00
Syxton
9a4231e993 MDL-45847 resort: Add more course sorting options
MDL-45847 resort: Add more course sorting options

Add descending sort options and course timecreated sort options.
Includes behat and unit test changes.
2014-07-10 16:15:26 -04:00
Eloy Lafuente (stronk7)
b77130af5e Merge branch '41502-28' of git://github.com/samhemelryk/moodle 2014-07-09 00:51:22 +02:00
Eloy Lafuente (stronk7)
fa4f0de6b1 MDL-42609 course: management default missing bits
With the previous commit in this issue, now the course management
UI defaults to show the "default category" courses.

But some bits were missing in order to make that default behavior
fully equivalent with the manual navigation to that category.

This patch:
  - Adds the missing categoryid url param, used by some of the options
    in the UI, like sorting, that was completely broken.
  - Sets the context to the default category, previously was being set to
    system context, incorrectly if now we are defaulting to a category.

That way everything is 100% the same than when we land to the category manually.
2014-07-08 21:21:25 +02:00
Willy Lee
4b07116a20 MDL-46159 course: Add search box to course management pages 2014-07-08 08:59:34 -07:00
Sam Hemelryk
ddd2361e80 MDL-42609 course: management page now selected default category initially 2014-07-04 10:55:40 +12:00
Sam Hemelryk
a67c56d007 MDL-41502 course: removed classes and files deprecated in 2.6 2014-07-04 10:27:40 +12:00
Sam Hemelryk
b9f4c37879 MDL-45209 course: fixed navbar when creating,editing courses 2014-06-27 09:39:47 +12:00
Eloy Lafuente (stronk7)
7c74cfe45c MDL-46031 output: remove leftover line 2014-06-25 03:05:24 +02:00
Damyon Wiese
e9018b50a2 Merge branch 'MDL-46031' of git://github.com/timhunt/moodle 2014-06-24 14:05:54 +08:00
Eloy Lafuente (stronk7)
b362c8f90d Merge branch 'MDL-39883-master' of git://github.com/ankitagarwal/moodle 2014-06-24 00:46:36 +02:00
Eloy Lafuente (stronk7)
fbdb6497d6 Merge branch 'MDL-45958-master' of git://github.com/ankitagarwal/moodle 2014-06-24 00:17:27 +02:00
Tim Hunt
b8459bba14 MDL-46031 output: better handling of once-per-page items
In several places we only want to output a certain bit of HTML (e.g. the
contents on the mod chooser) once per page.

This used to be done with a static variable in the function, which
meant the logic was once per PHP-script execution, not once-per-page.
Now there is a new bit of API in page_requirements_manager to handle
this properly.
2014-06-19 18:50:04 +01:00
Ankit Agarwal
dcbef3f4c2 MDL-39883 events: Trigger a module created event when duplicating a module 2014-06-18 15:40:31 +08:00
Ankit Agarwal
e20d306969 MDL-39883 events: Create a new api create_from_cm for module create event 2014-06-18 15:39:02 +08:00
Ankit Agarwal
0a3d81c261 MDL-45958 courselib: Refactor module duplication code to remove duplication 2014-06-17 14:46:05 +08:00
John Okely
bb8d6e1a81 MDL-43274 Course: Remove ability to delete logs on a course during reset 2014-06-16 09:10:05 +08:00
Eloy Lafuente (stronk7)
71fa28477b Merge branch 'MDL-44620_master' of git://github.com/dmonllao/moodle 2014-06-03 18:11:28 +02:00
Eloy Lafuente (stronk7)
17c9a3ccbf Merge branch 'MDL-34737-master' of git://github.com/andrewnicols/moodle 2014-06-02 11:53:33 +02:00
Marina Glancy
3e6adca945 MDL-45688 added missing library requirement 2014-05-24 18:33:00 +08:00