moodle.git
5 years agoMDL-51427 user: correctly use strings for phone1 and phone2
Marina Glancy [Wed, 16 Sep 2015 05:10:10 +0000 (13:10 +0800)]
MDL-51427 user: correctly use strings for phone1 and phone2

Thanks to Olumuyiwa Taiwo for original patch

AMOS BEGIN
  CPY [phone,core],[phone1,core]
AMOS END

5 years agoweekly release 3.0dev
Eloy Lafuente (stronk7) [Thu, 10 Sep 2015 09:09:52 +0000 (11:09 +0200)]
weekly release 3.0dev

5 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Eloy Lafuente (stronk7) [Thu, 10 Sep 2015 09:09:46 +0000 (11:09 +0200)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

5 years agoMDL-50516 behat: Back/next button reloads page
rajesh Taneja [Thu, 10 Sep 2015 06:30:28 +0000 (14:30 +0800)]
MDL-50516 behat: Back/next button reloads page

When next/back button is pressed in phantomjs/browserkit
it reload page, so adding a bug_phantomjs, so that we can
test the lesson re-attempt scenario

5 years agoMerge branch 'MDL-50015-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Wed, 9 Sep 2015 23:42:06 +0000 (01:42 +0200)]
Merge branch 'MDL-50015-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-50537-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Wed, 9 Sep 2015 23:01:32 +0000 (01:01 +0200)]
Merge branch 'MDL-50537-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-50944-master' of git://github.com/jleyva/moodle
Dan Poltawski [Wed, 9 Sep 2015 13:29:53 +0000 (14:29 +0100)]
Merge branch 'MDL-50944-master' of git://github.com/jleyva/moodle

5 years agoMDL-50537 mod_chat: Use the utility class and several fixes
Juan Leyva [Wed, 29 Jul 2015 14:27:46 +0000 (16:27 +0200)]
MDL-50537 mod_chat: Use the utility class and several fixes

5 years agoMDL-50537 mod_chat: New WS mod_chat_get_chats_by_courses
Costantino Cito [Mon, 15 Jun 2015 07:45:39 +0000 (09:45 +0200)]
MDL-50537 mod_chat: New WS mod_chat_get_chats_by_courses

5 years agoMDL-50537 core_webservice: New external functions utility class
Juan Leyva [Wed, 29 Jul 2015 14:09:18 +0000 (16:09 +0200)]
MDL-50537 core_webservice: New external functions utility class

5 years agoMDL-50995 mod_forum: Fix WS to not rely in the DB ordering defaults
Juan Leyva [Wed, 9 Sep 2015 10:15:17 +0000 (12:15 +0200)]
MDL-50995 mod_forum: Fix WS to not rely in the DB ordering defaults

5 years agoMDL-50995 mod_forum: Coding style fixes
Andrew Nicols [Wed, 9 Sep 2015 08:16:43 +0000 (16:16 +0800)]
MDL-50995 mod_forum: Coding style fixes

5 years agoMerge branch 'MDL-50995-master' of git://github.com/jleyva/moodle
Andrew Nicols [Wed, 9 Sep 2015 08:03:05 +0000 (16:03 +0800)]
Merge branch 'MDL-50995-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-50852-master' of git://github.com/junpataleta/moodle
Andrew Nicols [Wed, 9 Sep 2015 07:38:00 +0000 (15:38 +0800)]
Merge branch 'MDL-50852-master' of git://github.com/junpataleta/moodle

5 years agoMDL-50852 formslib: Fixed client-side form validation problem.
Jun Pataleta [Thu, 20 Aug 2015 02:36:59 +0000 (10:36 +0800)]
MDL-50852 formslib: Fixed client-side form validation problem.

This patch fixes the problem of client validation being broken when
shortforms is not enabled. This issue is caused by moodle-core-event
module not being loaded and the broadcast parameter in the
Y.Global.publish set to 2 instead of true.

5 years agoMDL-50516 mod_lesson: changes to existing behat tests
Mark Nelson [Thu, 13 Aug 2015 06:20:46 +0000 (23:20 -0700)]
MDL-50516 mod_lesson: changes to existing behat tests

5 years agoMDL-50516 mod_lesson: added behat tests
Mark Nelson [Tue, 11 Aug 2015 00:50:49 +0000 (17:50 -0700)]
MDL-50516 mod_lesson: added behat tests

5 years agoMDL-50516 core_behat: added ability to go back, forward and reload the browser
Mark Nelson [Mon, 10 Aug 2015 23:45:38 +0000 (16:45 -0700)]
MDL-50516 core_behat: added ability to go back, forward and reload the browser

5 years agoMDL-50516 mod_lesson: fixed issue with grade not using minquestions
Mark Nelson [Fri, 4 Sep 2015 00:48:11 +0000 (17:48 -0700)]
MDL-50516 mod_lesson: fixed issue with grade not using minquestions

It's possible to reach the end of the lesson, get your result,
click back until you get to the last question, answer it correctly
and then be awarded a result of 100%. This was because the grade
calculation would only include the questions answered, rather than
all of them in the lesson. However, you can not fix this by always
grading by the amount of questions in the lesson as some lessons
bypass certain questions depending on the answer to previous ones.
The minquestion setting can now successfully be used to prevent this
behaviour by rewording the misleading string and adding logic.

5 years agoMDL-50516 mod_lesson: prevented deletion of previous attempts
Mark Nelson [Thu, 13 Aug 2015 20:36:40 +0000 (13:36 -0700)]
MDL-50516 mod_lesson: prevented deletion of previous attempts

The 'startlastseen' flag was removing any previous attempts
the user had from the DB. This meant that the user could
simply re-answer the question, regardless of the number
of attempts allowed.

5 years agoMDL-50516 mod_lesson: prevented user from repeating question
Mark Nelson [Thu, 30 Jul 2015 06:37:01 +0000 (23:37 -0700)]
MDL-50516 mod_lesson: prevented user from repeating question

It was possible in the lesson module for a user to
answer a question, get the result, then click back
in the browser and re-answer it, even if they exceeded
the number of attempts allowed per question.

5 years agoMerge branch 'wip-mdl-51322' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 9 Sep 2015 06:21:45 +0000 (08:21 +0200)]
Merge branch 'wip-mdl-51322' of https://github.com/rajeshtaneja/moodle

5 years agoMerge branch 'wip-MDL-51357-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Wed, 9 Sep 2015 06:00:46 +0000 (08:00 +0200)]
Merge branch 'wip-MDL-51357-master' of git://github.com/marinaglancy/moodle

5 years agoMDL-51357 roles: fix table layout after MDL-38763
Marina Glancy [Wed, 9 Sep 2015 05:07:11 +0000 (13:07 +0800)]
MDL-51357 roles: fix table layout after MDL-38763

5 years agoMDL-50173 ratings: Use proper checks to ensure ratings are viewable.
Ankit Agarwal [Mon, 8 Jun 2015 09:03:26 +0000 (14:33 +0530)]
MDL-50173 ratings: Use proper checks to ensure ratings are viewable.

Mainly to verify groups visibility this new callback has been created.

Note this was originally 3 commits but for amending purposes they have
been squashed.

5 years agoMerge branch 'wip-MDL-34938-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Wed, 9 Sep 2015 01:00:27 +0000 (09:00 +0800)]
Merge branch 'wip-MDL-34938-master' of git://github.com/marinaglancy/moodle

5 years agoMerge branch 'MDL-50013-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 8 Sep 2015 14:21:27 +0000 (15:21 +0100)]
Merge branch 'MDL-50013-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-50853-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 8 Sep 2015 12:37:35 +0000 (13:37 +0100)]
Merge branch 'MDL-50853-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-51194' of git://github.com/lazydaisy/moodle
Dan Poltawski [Tue, 8 Sep 2015 12:27:37 +0000 (13:27 +0100)]
Merge branch 'MDL-51194' of git://github.com/lazydaisy/moodle

5 years agoMDL-51132 course: add tag require
Dan Poltawski [Tue, 8 Sep 2015 12:22:54 +0000 (13:22 +0100)]
MDL-51132 course: add tag require

5 years agoMDL-50709 groups: Prevent XSS in grouping description
John Okely [Tue, 28 Jul 2015 09:00:04 +0000 (17:00 +0800)]
MDL-50709 groups: Prevent XSS in grouping description

5 years agoMerge branch 'wip-MDL-51132-master' of https://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 8 Sep 2015 09:46:38 +0000 (10:46 +0100)]
Merge branch 'wip-MDL-51132-master' of https://github.com/marinaglancy/moodle

5 years agoMerge branch 'wip-MDL-50323-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Tue, 8 Sep 2015 08:14:14 +0000 (09:14 +0100)]
Merge branch 'wip-MDL-50323-master' of git://github.com/abgreeve/moodle

5 years agoMerge branch 'MDL-51307-master' of git://github.com/cameron1729/moodle
Dan Poltawski [Tue, 8 Sep 2015 08:11:57 +0000 (09:11 +0100)]
Merge branch 'MDL-51307-master' of git://github.com/cameron1729/moodle

5 years agoMerge branch 'MDL-51281-master' of git://github.com/jleyva/moodle
Andrew Nicols [Tue, 8 Sep 2015 06:07:27 +0000 (14:07 +0800)]
Merge branch 'MDL-51281-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-51325-master' of git://github.com/jleyva/moodle
Andrew Nicols [Tue, 8 Sep 2015 04:51:30 +0000 (12:51 +0800)]
Merge branch 'MDL-51325-master' of git://github.com/jleyva/moodle

5 years agoMDL-51307 navigation: hide message button
Cameron Ball [Tue, 8 Sep 2015 04:10:07 +0000 (12:10 +0800)]
MDL-51307 navigation: hide message button

5 years agoMDL-34938 enrol_meta: sync enrolment start/end dates
Marina Glancy [Tue, 8 Sep 2015 02:16:51 +0000 (10:16 +0800)]
MDL-34938 enrol_meta: sync enrolment start/end dates

5 years agoMerge branch 'MDL-51245' of git://github.com/stronk7/moodle
Andrew Nicols [Tue, 8 Sep 2015 01:24:00 +0000 (09:24 +0800)]
Merge branch 'MDL-51245' of git://github.com/stronk7/moodle

5 years agoMDL-50323 themes: Course unordered lists correctly styled.
Adrian Greeve [Wed, 12 Aug 2015 08:51:43 +0000 (16:51 +0800)]
MDL-50323 themes: Course unordered lists correctly styled.

Thank you to Ann Adamcik for providing this patch.

5 years agoMDL-51245 sqlsrv: Diagnose missing READ_COMMITTED_SNAPSHOT mode
Eloy Lafuente (stronk7) [Fri, 4 Sep 2015 01:00:52 +0000 (03:00 +0200)]
MDL-51245 sqlsrv: Diagnose missing READ_COMMITTED_SNAPSHOT mode

Without it, transactions are executed in standard READ_COMMITED
mode, without snapshoting/row versioning, leading to update
conflicts under high concurrency.

5 years agoMDL-51245 mssql: Diagnose missing READ_COMMITTED_SNAPSHOT mode
Eloy Lafuente (stronk7) [Fri, 4 Sep 2015 00:05:29 +0000 (02:05 +0200)]
MDL-51245 mssql: Diagnose missing READ_COMMITTED_SNAPSHOT mode

Without it, transactions are executed in standard READ_COMMITED
mode, without snapshoting/row versioning, leading to update conflicts
under high concurrency.

5 years agoMerge branch 'MDL-50287-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Tue, 8 Sep 2015 00:18:03 +0000 (08:18 +0800)]
Merge branch 'MDL-50287-master' of git://github.com/danpoltawski/moodle

5 years agoMDL-50860 core: improve creation of random strings
Petr Skoda [Tue, 18 Aug 2015 21:33:12 +0000 (09:33 +1200)]
MDL-50860 core: improve creation of random strings

5 years agoMDL-42670 mod_assign: Fix recent activity block when blind marking is on
Tim Lock [Thu, 23 Jul 2015 04:01:26 +0000 (13:31 +0930)]
MDL-42670 mod_assign: Fix recent activity block when blind marking is on

5 years agoMDL-50744 enrol_meta: fix incorrect role assign
Marina Glancy [Wed, 2 Sep 2015 06:45:01 +0000 (14:45 +0800)]
MDL-50744 enrol_meta: fix incorrect role assign

5 years agoMDL-48371 editors: Option for removing managefiles
Adrian Greeve [Tue, 25 Aug 2015 04:57:43 +0000 (12:57 +0800)]
MDL-48371 editors: Option for removing managefiles

We want to remove the managefiles button from the
editors in the wiki so that students don't delete
each others files.

5 years agoMDL-51132 tags: do not use user tags for tagging courses
Marina Glancy [Sat, 22 Aug 2015 12:55:37 +0000 (20:55 +0800)]
MDL-51132 tags: do not use user tags for tagging courses

5 years agoMDL-51194 theme_bootstrapbase: Move CSS classes from /less/moodle.less
lazydaisy [Wed, 2 Sep 2015 15:05:12 +0000 (16:05 +0100)]
MDL-51194 theme_bootstrapbase: Move CSS classes from /less/moodle.less

5 years agoMDL-50013 mod_book: New WS mod_book_view_book
Juan Leyva [Fri, 10 Jul 2015 14:15:39 +0000 (16:15 +0200)]
MDL-50013 mod_book: New WS mod_book_view_book

5 years agoMDL-50013 mod_book: Move logging and completion to new API
Juan Leyva [Fri, 10 Jul 2015 14:15:13 +0000 (16:15 +0200)]
MDL-50013 mod_book: Move logging and completion to new API

5 years agoMDL-50015 mod_imscp: New WS mod_imscp_view_imscp
Juan Leyva [Fri, 10 Jul 2015 11:57:30 +0000 (13:57 +0200)]
MDL-50015 mod_imscp: New WS mod_imscp_view_imscp

5 years agoMDL-50015 mod_imscp: Move logging and completion to new API
Juan Leyva [Fri, 10 Jul 2015 11:56:33 +0000 (13:56 +0200)]
MDL-50015 mod_imscp: Move logging and completion to new API

5 years agoMDL-51281 completion: Fixed incorrect returned parameter type
Juan Leyva [Thu, 3 Sep 2015 13:02:20 +0000 (15:02 +0200)]
MDL-51281 completion: Fixed incorrect returned parameter type

Parameter status in external function get_course_completion_status

5 years agoMDL-51325 notes: Fix external get_course_notes to return site notes
Juan Leyva [Fri, 4 Sep 2015 08:36:45 +0000 (10:36 +0200)]
MDL-51325 notes: Fix external get_course_notes to return site notes

5 years agoMDL-51322 behat: ensure the window is properly closed
rajesh Taneja [Fri, 4 Sep 2015 02:19:52 +0000 (10:19 +0800)]
MDL-51322 behat: ensure the window is properly closed

This is to ensure we have other window closed
so there is no race-around condition

5 years agoAutomatically generated installer lang files
AMOS bot [Thu, 3 Sep 2015 16:04:05 +0000 (00:04 +0800)]
Automatically generated installer lang files

5 years agoweekly release 3.0dev
Dan Poltawski [Thu, 3 Sep 2015 11:31:49 +0000 (12:31 +0100)]
weekly release 3.0dev

5 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Thu, 3 Sep 2015 11:31:47 +0000 (12:31 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

5 years agoMDL-51090 behat: switch to main window
rajesh Taneja [Thu, 3 Sep 2015 09:10:45 +0000 (17:10 +0800)]
MDL-51090 behat: switch to main window

5 years agoMDL-38763 roles: Fix example context for mustache templates.
Damyon Wiese [Thu, 3 Sep 2015 06:44:57 +0000 (14:44 +0800)]
MDL-38763 roles: Fix example context for mustache templates.

5 years agoMDL-49536 theme_clean: update help text for logo
Ryan Wyllie [Thu, 3 Sep 2015 01:22:05 +0000 (01:22 +0000)]
MDL-49536 theme_clean: update help text for logo

Updated the help text on the theme settings page to
mention that the theme logo will only be displayed on
the front page and login page.

Conflicts:
theme/upgrade.txt

5 years agoMDL-50919 behat: temporary fix until behat learns to wait for JQuery
Marina Glancy [Thu, 3 Sep 2015 01:10:19 +0000 (09:10 +0800)]
MDL-50919 behat: temporary fix until behat learns to wait for JQuery

5 years agoMerge branch 'MDL-29801_master' of git://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Wed, 2 Sep 2015 17:19:27 +0000 (19:19 +0200)]
Merge branch 'MDL-29801_master' of git://github.com/markn86/moodle

5 years agoMDL-50853 mod_chat: Unit tests for the external lib
Juan Leyva [Thu, 16 Jul 2015 12:47:18 +0000 (14:47 +0200)]
MDL-50853 mod_chat: Unit tests for the external lib

5 years agoMDL-50853 mod_chat: New Web Service mod_chat_view_chat
Juan Leyva [Mon, 27 Jul 2015 12:00:11 +0000 (14:00 +0200)]
MDL-50853 mod_chat: New Web Service mod_chat_view_chat

5 years agoMDL-50853 mod_chat: New Web Service mod_chat_get_chat_latest_messages
Juan Leyva [Thu, 16 Jul 2015 10:55:57 +0000 (12:55 +0200)]
MDL-50853 mod_chat: New Web Service mod_chat_get_chat_latest_messages

5 years agoMDL-50853 mod_chat: New Web Service mod_chat_send_chat_message
Juan Leyva [Thu, 16 Jul 2015 10:22:49 +0000 (12:22 +0200)]
MDL-50853 mod_chat: New Web Service mod_chat_send_chat_message

5 years agoMDL-50853 mod_chat: New Web Service mod_chat_get_chat_users
Juan Leyva [Thu, 16 Jul 2015 09:58:07 +0000 (11:58 +0200)]
MDL-50853 mod_chat: New Web Service mod_chat_get_chat_users

5 years agoMDL-50853 mod_chat: New Web Service mod_chat_login_user
Juan Leyva [Thu, 16 Jul 2015 09:14:41 +0000 (11:14 +0200)]
MDL-50853 mod_chat: New Web Service mod_chat_login_user

5 years agoMDL-50919 tags: minor fixes and version bump
Eloy Lafuente (stronk7) [Wed, 2 Sep 2015 11:25:44 +0000 (13:25 +0200)]
MDL-50919 tags: minor fixes and version bump

This fixes:
- An incorrect exception message.
- tablelib weird behavior creating up to
  pagesize empty rows.

Also forces a version bump so new webservices will become installed.

5 years agoMDL-50995 mod_forum: New WS mod_forum_add_discussion_post
Juan Leyva [Wed, 5 Aug 2015 13:37:57 +0000 (15:37 +0200)]
MDL-50995 mod_forum: New WS mod_forum_add_discussion_post

5 years agoMerge branch 'wip-MDL-50919-master' of https://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Wed, 2 Sep 2015 09:42:11 +0000 (11:42 +0200)]
Merge branch 'wip-MDL-50919-master' of https://github.com/marinaglancy/moodle

5 years agoMDL-50944 mod_choice: Unit tests for external functions
Juan Leyva [Wed, 29 Jul 2015 09:44:49 +0000 (11:44 +0200)]
MDL-50944 mod_choice: Unit tests for external functions

5 years agoMDL-29801 core_message: added behat test for deleting messages
Mark Nelson [Sat, 28 Mar 2015 02:26:04 +0000 (19:26 -0700)]
MDL-29801 core_message: added behat test for deleting messages

5 years agoMDL-50944 mod_choice: New Web Service mod_choice_view_choice
Juan Leyva [Wed, 29 Jul 2015 09:29:19 +0000 (11:29 +0200)]
MDL-50944 mod_choice: New Web Service mod_choice_view_choice

5 years agoMDL-50944 mod_choice: New Web Service mod_choice_submit_choice_response
Juan Leyva [Wed, 29 Jul 2015 09:19:39 +0000 (11:19 +0200)]
MDL-50944 mod_choice: New Web Service mod_choice_submit_choice_response

5 years agoMDL-50944 mod_choice: New Web Service mod_choice_get_choice_options
Juan Leyva [Wed, 29 Jul 2015 07:48:23 +0000 (09:48 +0200)]
MDL-50944 mod_choice: New Web Service mod_choice_get_choice_options

5 years agoMDL-50944 mod_choice: New Web Service mod_choice_get_choice_results
Juan Leyva [Tue, 28 Jul 2015 14:44:38 +0000 (16:44 +0200)]
MDL-50944 mod_choice: New Web Service mod_choice_get_choice_results

5 years agoMDL-29801 core_message: added ability to delete messages
Mark Nelson [Wed, 25 Mar 2015 00:11:15 +0000 (17:11 -0700)]
MDL-29801 core_message: added ability to delete messages

Thanks goes to Jetha for providing the HTML and CSS.

5 years agoMDL-29801 core_message: added delete message caps
Mark Nelson [Wed, 25 Mar 2015 01:28:08 +0000 (18:28 -0700)]
MDL-29801 core_message: added delete message caps

5 years agoMerge branch 'MDL-50891_master-unit-test-fix' of git://github.com/dmonllao/moodle
Dan Poltawski [Wed, 2 Sep 2015 08:23:07 +0000 (09:23 +0100)]
Merge branch 'MDL-50891_master-unit-test-fix' of git://github.com/dmonllao/moodle

5 years agoMDL-51090 question manual grading: fixing for testing issues
Tim Hunt [Wed, 2 Sep 2015 06:55:51 +0000 (07:55 +0100)]
MDL-51090 question manual grading: fixing for testing issues

5 years agoMDL-50919 tags: new WS core_tag_get_tags
Marina Glancy [Mon, 31 Aug 2015 05:18:21 +0000 (13:18 +0800)]
MDL-50919 tags: new WS core_tag_get_tags

5 years agoMDL-50919 tags: new UI for managing tags
Marina Glancy [Sat, 18 Jul 2015 02:38:19 +0000 (10:38 +0800)]
MDL-50919 tags: new UI for managing tags

5 years agoMDL-50919 behat: Step for keypress event in behat
Marina Glancy [Mon, 10 Aug 2015 08:06:15 +0000 (16:06 +0800)]
MDL-50919 behat: Step for keypress event in behat

5 years agoMDL-50891 core_useragent: Restore default after tests
David Monllao [Wed, 2 Sep 2015 05:08:30 +0000 (13:08 +0800)]
MDL-50891 core_useragent: Restore default after tests

5 years agoMDL-51172 core_files: Using an invented file format
David Monllao [Wed, 2 Sep 2015 02:23:25 +0000 (10:23 +0800)]
MDL-51172 core_files: Using an invented file format

5 years agoMerge branch 'MDL-51172' of git://github.com/ramdesh/moodle
David Monllao [Wed, 2 Sep 2015 02:25:24 +0000 (10:25 +0800)]
Merge branch 'MDL-51172' of git://github.com/ramdesh/moodle

5 years agoMerge branch 'MDL-50529_dupe' of git://github.com/andyjdavis/moodle
David Monllao [Wed, 2 Sep 2015 01:58:17 +0000 (09:58 +0800)]
Merge branch 'MDL-50529_dupe' of git://github.com/andyjdavis/moodle

5 years agoMerge branch 'MDL-51090' of git://github.com/timhunt/moodle
David Monllao [Wed, 2 Sep 2015 01:47:34 +0000 (09:47 +0800)]
Merge branch 'MDL-51090' of git://github.com/timhunt/moodle

5 years agoMerge branch 'MDL-50971' of git://github.com/NeillM/moodle
David Monllao [Wed, 2 Sep 2015 01:23:11 +0000 (09:23 +0800)]
Merge branch 'MDL-50971' of git://github.com/NeillM/moodle

5 years agoMerge branch 'MDL-50891-master' of git://github.com/andrewnicols/moodle
David Monllao [Wed, 2 Sep 2015 00:54:55 +0000 (08:54 +0800)]
Merge branch 'MDL-50891-master' of git://github.com/andrewnicols/moodle

Conflicts:
lib/deprecatedlib.php

5 years agoMerge branch 'MDL-50920' of git://github.com/sk-unikent/moodle
David Monllao [Wed, 2 Sep 2015 00:44:36 +0000 (08:44 +0800)]
Merge branch 'MDL-50920' of git://github.com/sk-unikent/moodle

5 years agoMerge branch 'MDL-50641-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 1 Sep 2015 23:53:09 +0000 (01:53 +0200)]
Merge branch 'MDL-50641-master' of git://github.com/danpoltawski/moodle

5 years agoMDL-43896 admin: Avoid empty(expression), not working under PHP 5.4
Eloy Lafuente (stronk7) [Tue, 1 Sep 2015 23:20:09 +0000 (01:20 +0200)]
MDL-43896 admin: Avoid empty(expression), not working under PHP 5.4

5 years agoMerge branch 'MDL-48494-master-component' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 1 Sep 2015 22:32:13 +0000 (00:32 +0200)]
Merge branch 'MDL-48494-master-component' of git://github.com/mudrd8mz/moodle

5 years agoMerge branch 'MDL-43896-master-modulesyntax' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 1 Sep 2015 22:29:29 +0000 (00:29 +0200)]
Merge branch 'MDL-43896-master-modulesyntax' of git://github.com/mudrd8mz/moodle

5 years agoMDL-51090 question: further refinements to validating manual grades
Tim Hunt [Thu, 20 Aug 2015 20:17:24 +0000 (21:17 +0100)]
MDL-51090 question: further refinements to validating manual grades

5 years agoMDL-50690 themes: fix commenting coding style
Dan Poltawski [Tue, 1 Sep 2015 20:11:11 +0000 (21:11 +0100)]
MDL-50690 themes: fix commenting coding style

(See also CONTRIB-5891)