moodle.git
7 years agoMerge branch 'master_MDL-46816' of https://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Mon, 25 Aug 2014 22:09:51 +0000 (00:09 +0200)]
Merge branch 'master_MDL-46816' of https://github.com/danmarsden/moodle

7 years agoMerge branch 'wip-MDL-46874-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 25 Aug 2014 20:10:09 +0000 (22:10 +0200)]
Merge branch 'wip-MDL-46874-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'm28_MDL-46900' of https://github.com/totara/moodle
Eloy Lafuente (stronk7) [Mon, 25 Aug 2014 18:55:09 +0000 (20:55 +0200)]
Merge branch 'm28_MDL-46900' of https://github.com/totara/moodle

7 years agoMerge branch 'MDL-46917-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Mon, 25 Aug 2014 08:54:47 +0000 (16:54 +0800)]
Merge branch 'MDL-46917-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-46894' of git://github.com/timhunt/moodle
Marina Glancy [Mon, 25 Aug 2014 08:52:21 +0000 (16:52 +0800)]
Merge branch 'MDL-46894' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-46916' of git://github.com/timhunt/moodle
Marina Glancy [Mon, 25 Aug 2014 08:49:52 +0000 (16:49 +0800)]
Merge branch 'MDL-46916' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-46923_master' of git://github.com/markn86/moodle
Damyon Wiese [Mon, 25 Aug 2014 08:48:27 +0000 (16:48 +0800)]
Merge branch 'MDL-46923_master' of git://github.com/markn86/moodle

7 years agoMerge branch 'wip_MDL-43918_m28_cm' of https://github.com/skodak/moodle
Damyon Wiese [Mon, 25 Aug 2014 08:45:15 +0000 (16:45 +0800)]
Merge branch 'wip_MDL-43918_m28_cm' of https://github.com/skodak/moodle

7 years agoMerge branch 'MDL46887_assignment_file_max_size' of git://github.com/Dave-B/moodle
Marina Glancy [Mon, 25 Aug 2014 08:28:49 +0000 (16:28 +0800)]
Merge branch 'MDL46887_assignment_file_max_size' of git://github.com/Dave-B/moodle

7 years agoMerge branch 'MDL-46895' of git://github.com/colchambers/moodle
Marina Glancy [Mon, 25 Aug 2014 08:27:49 +0000 (16:27 +0800)]
Merge branch 'MDL-46895' of git://github.com/colchambers/moodle

7 years agoMDL-46776 gradereport_grader: Improve Grader report user interface
Rex Lorenzo [Mon, 14 Jul 2014 04:01:03 +0000 (22:01 -0600)]
MDL-46776 gradereport_grader: Improve Grader report user interface

* Adding assignments to test course generator to more easily test the grader report with large number of students and graded activities.

7 years agoMerge branch 'MDL-46191-master' of git://github.com/FMCorz/moodle
Marina Glancy [Mon, 25 Aug 2014 07:43:29 +0000 (15:43 +0800)]
Merge branch 'MDL-46191-master' of git://github.com/FMCorz/moodle

7 years agoMDL-46191 gradereport_history: Final clean up for integration
Frederic Massart [Mon, 25 Aug 2014 06:52:06 +0000 (14:52 +0800)]
MDL-46191 gradereport_history: Final clean up for integration

7 years agoMerge branch 'MDL-46450_master' of git://github.com/nadavkav/moodle
Marina Glancy [Mon, 25 Aug 2014 06:45:22 +0000 (14:45 +0800)]
Merge branch 'MDL-46450_master' of git://github.com/nadavkav/moodle

7 years agoMerge branch 'MDL-46904-master' of git://github.com/damyon/moodle
Marina Glancy [Mon, 25 Aug 2014 06:45:05 +0000 (14:45 +0800)]
Merge branch 'MDL-46904-master' of git://github.com/damyon/moodle

7 years agoMerge branch 'wip-MDL-46812_master' of git://github.com/lazydaisy/moodle
Damyon Wiese [Mon, 25 Aug 2014 06:03:00 +0000 (14:03 +0800)]
Merge branch 'wip-MDL-46812_master' of git://github.com/lazydaisy/moodle

7 years agoMerge branch 'wip-MDL-46703-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Mon, 25 Aug 2014 05:49:05 +0000 (13:49 +0800)]
Merge branch 'wip-MDL-46703-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'MDL-46918' of git://github.com/timhunt/moodle
Marina Glancy [Mon, 25 Aug 2014 04:01:10 +0000 (12:01 +0800)]
Merge branch 'MDL-46918' of git://github.com/timhunt/moodle

7 years agoMDL-43918 add more validation to $modulename parameter when fetching cms
Petr Skoda [Wed, 6 Aug 2014 23:13:22 +0000 (11:13 +1200)]
MDL-43918 add more validation to $modulename parameter when fetching cms

7 years agoMDL-46450 availability/info: Add links to module names inside restrict access availab...
Nadav Kavalerchik [Fri, 15 Aug 2014 22:22:13 +0000 (01:22 +0300)]
MDL-46450 availability/info: Add links to module names inside restrict access availabilityinfo box

7 years agoMDL-46895 qtype_calculated_find_formula_errors not defined causes Calculated question...
Colin Chambers [Tue, 19 Aug 2014 15:21:06 +0000 (16:21 +0100)]
MDL-46895 qtype_calculated_find_formula_errors not defined causes Calculated question type test to fail

7 years agoMDL-46907 gradereport_history: Refactor user_button class to remove js methods
Ankit Agarwal [Thu, 21 Aug 2014 02:25:29 +0000 (10:25 +0800)]
MDL-46907 gradereport_history: Refactor user_button class to remove js methods

Part of MDL-46191

7 years agoMDL-46191 gradereport_history: Fix minor issues after the review
Ankit Agarwal [Tue, 19 Aug 2014 05:35:43 +0000 (13:35 +0800)]
MDL-46191 gradereport_history: Fix minor issues after the review

Part of MDL-46191

7 years agoMDL-46573 gradereport_history: Cross DB query relying on timemodified
Frederic Massart [Tue, 12 Aug 2014 07:40:38 +0000 (15:40 +0800)]
MDL-46573 gradereport_history: Cross DB query relying on timemodified

Part of MDL-46191

7 years agoMDL-46678 gradereport_history: Write unit tests for get_graders api
Ankit Agarwal [Mon, 11 Aug 2014 05:27:17 +0000 (13:27 +0800)]
MDL-46678 gradereport_history: Write unit tests for get_graders api

Part of MDL-46191

7 years agoMDL-46678 gradereport_history: Move hardcoded sql from index.php to an api
Ankit Agarwal [Fri, 8 Aug 2014 05:43:39 +0000 (13:43 +0800)]
MDL-46678 gradereport_history: Move hardcoded sql from index.php to an api

Part of MDL-46191

7 years agoMDL-46571 gradereport_history: Unit tests for helper user methods
Frederic Massart [Fri, 8 Aug 2014 08:34:04 +0000 (16:34 +0800)]
MDL-46571 gradereport_history: Unit tests for helper user methods

Part of MDL-46191

7 years agoMDL-46571 gradereport_history: Unit tests for the table_sql results
Frederic Massart [Fri, 8 Aug 2014 02:51:22 +0000 (10:51 +0800)]
MDL-46571 gradereport_history: Unit tests for the table_sql results

Part of MDL-46191

7 years agoMDL-46649 gradereport_history: Add apis to get users and user count, also refactor...
Ankit Agarwal [Thu, 7 Aug 2014 08:05:20 +0000 (16:05 +0800)]
MDL-46649 gradereport_history: Add apis to get users and user count, also refactor users_ajax.php

Part of MDL-46191

7 years agoMDL-46649 gradereport_history: delete the old class grade_report_history
Ankit Agarwal [Wed, 6 Aug 2014 06:28:13 +0000 (14:28 +0800)]
MDL-46649 gradereport_history: delete the old class grade_report_history

Part of MDL-46191

7 years agoMDL-46570 gradereport_history: Selected users are saved across page loads
Frederic Massart [Fri, 8 Aug 2014 07:16:42 +0000 (15:16 +0800)]
MDL-46570 gradereport_history: Selected users are saved across page loads

Part of MDL-46191

7 years agoMDL-46570 gradereport_history: Update the logic of button helper method
Frederic Massart [Fri, 8 Aug 2014 06:35:16 +0000 (14:35 +0800)]
MDL-46570 gradereport_history: Update the logic of button helper method

Part of MDL-46191

7 years agoMDL-46570 gradereport_history: Clean up of styling and minor inconsistencies
Frederic Massart [Fri, 8 Aug 2014 04:50:24 +0000 (12:50 +0800)]
MDL-46570 gradereport_history: Clean up of styling and minor inconsistencies

Part of MDL-46191

7 years agoMDL-46570 gradereport_history: Styling for RTL languages
Frederic Massart [Wed, 6 Aug 2014 04:33:55 +0000 (12:33 +0800)]
MDL-46570 gradereport_history: Styling for RTL languages

Part of MDL-46191

7 years agoMDL-46570 gradereport_history: Making the users list an ARIA widget
Frederic Massart [Tue, 5 Aug 2014 11:10:59 +0000 (19:10 +0800)]
MDL-46570 gradereport_history: Making the users list an ARIA widget

Part of MDL-46191

7 years agoMDL-46570 gradereport_history: Reworked search and load more mechanism
Frederic Massart [Tue, 5 Aug 2014 08:56:09 +0000 (16:56 +0800)]
MDL-46570 gradereport_history: Reworked search and load more mechanism

Part of MDL-46191

7 years agoMDL-46570 gradereport_history: Improving accessibility and selection mechanism
Frederic Massart [Mon, 4 Aug 2014 06:13:53 +0000 (14:13 +0800)]
MDL-46570 gradereport_history: Improving accessibility and selection mechanism

Part of MDL-46191

7 years agoMDL-46570 gradereport_history: Convert to moodle dialogue
Frederic Massart [Fri, 1 Aug 2014 10:18:06 +0000 (18:18 +0800)]
MDL-46570 gradereport_history: Convert to moodle dialogue

Part of MDL-46191

7 years agoMDL-46570 gradereport_history: Adding JS documentation
Frederic Massart [Fri, 1 Aug 2014 08:19:06 +0000 (16:19 +0800)]
MDL-46570 gradereport_history: Adding JS documentation

Part of MDL-46191

7 years agoMDL-46570 gradereport_history: Simplifying the select/deselect buttons logic
Frederic Massart [Fri, 1 Aug 2014 07:43:01 +0000 (15:43 +0800)]
MDL-46570 gradereport_history: Simplifying the select/deselect buttons logic

Part of MDL-46191

7 years agoMDL-46570 gradereport_history: Convert to use templates and selectors
Frederic Massart [Fri, 1 Aug 2014 07:23:13 +0000 (15:23 +0800)]
MDL-46570 gradereport_history: Convert to use templates and selectors

Part of MDL-46191

7 years agoMDL-46570 gradereport_history: Safer use of language strings
Frederic Massart [Fri, 1 Aug 2014 05:47:54 +0000 (13:47 +0800)]
MDL-46570 gradereport_history: Safer use of language strings

Part of MDL-46191

7 years agoMDL-46570 gradereport_history: Converting JS to namespace'd module
Frederic Massart [Thu, 31 Jul 2014 06:50:17 +0000 (14:50 +0800)]
MDL-46570 gradereport_history: Converting JS to namespace'd module

Part of MDL-46191

7 years agoMDL-46574 gradereport_history: added report viewed event
Mark Nelson [Wed, 6 Aug 2014 00:07:46 +0000 (17:07 -0700)]
MDL-46574 gradereport_history: added report viewed event

Part of MDL-46191

7 years agoMDL-46569 gradereport_history: Use table_sql for the report
Ankit Agarwal [Tue, 5 Aug 2014 06:03:06 +0000 (14:03 +0800)]
MDL-46569 gradereport_history: Use table_sql for the report

Part of MDL-46191
This patch includes:-
- Convertion of the code to use new renderable/renderer apis
- Rewrote the code to remove all custom sorting, etc and use table sql instead
- Usernames are now clickable
- Grade items are now clickable
- Grade history is now displayed even if the grade item is deleted
- We are now using table sql for downloads so export in multiple formats is supported
- Feedback is now properly formatted
- Source fields are not capitilised anymore
- Paging is not shown on top of filters anymore

7 years agoMDL-46569 gradereport_history: Create a helper class
Ankit Agarwal [Thu, 7 Aug 2014 05:47:36 +0000 (13:47 +0800)]
MDL-46569 gradereport_history: Create a helper class

Part of MDL-46191

7 years agoMDL-46569 gradereport_history: Move class gradereport_history_filter_form to proper...
Ankit Agarwal [Mon, 4 Aug 2014 07:51:40 +0000 (15:51 +0800)]
MDL-46569 gradereport_history: Move class gradereport_history_filter_form to proper namespaced location

Part of MDL-46191

7 years agoMDL-46569 gradereport_history: Move class gradereport_history_user_button to proper...
Ankit Agarwal [Tue, 5 Aug 2014 06:03:15 +0000 (14:03 +0800)]
MDL-46569 gradereport_history: Move class gradereport_history_user_button to proper namespaced location

Part of MDL-46191

7 years agoMDL-46567 gradereport_history: Basic codestyle, phpdocs and other minor cleanups
Ankit Agarwal [Tue, 29 Jul 2014 07:54:08 +0000 (15:54 +0800)]
MDL-46567 gradereport_history: Basic codestyle, phpdocs and other minor cleanups

Part of MDL-46191
This commit includes following changes:-
- Fix codestyle issues
- Remove readme file
- Fix and add file headers
- Fix and add missing phpdocs

7 years agoMDL-46567 gradereport_history: Basic readme.md
Adam Olley [Thu, 10 Jul 2014 06:18:00 +0000 (15:48 +0930)]
MDL-46567 gradereport_history: Basic readme.md

Part of MDL-46191

7 years agoMDL-46567 gradereport_history: Extra version.php info
Adam Olley [Thu, 10 Jul 2014 05:59:51 +0000 (15:29 +0930)]
MDL-46567 gradereport_history: Extra version.php info

Part of MDL-46191

7 years agoMDL-46567 gradereport_history: Move paging implementation to db layer
Luke Tucker [Thu, 10 Jul 2014 05:53:00 +0000 (15:23 +0930)]
MDL-46567 gradereport_history: Move paging implementation to db layer

Part of MDL-46191

7 years agoMDL-46567 gradereport_history: Fix bug with paging
Matthew Tavella [Wed, 14 May 2014 00:29:15 +0000 (09:59 +0930)]
MDL-46567 gradereport_history: Fix bug with paging

Part of MDL-46191

7 years agoMDL-46567 gradereport_history: Prevent duplicate username column from rendering
Matthew Tavella [Wed, 14 May 2014 00:28:41 +0000 (09:58 +0930)]
MDL-46567 gradereport_history: Prevent duplicate username column from rendering

Part of MDL-46191

7 years agoMDL-46567 gradereport_history: Initial commit with basic structure of the report
Adam Olley [Tue, 13 May 2014 06:59:59 +0000 (23:59 -0700)]
MDL-46567 gradereport_history: Initial commit with basic structure of the report

Part of MDL-46191

7 years agoMDL-46917 atto: Focus on the editor when the form label is selected
Andrew Nicols [Thu, 21 Aug 2014 08:38:05 +0000 (16:38 +0800)]
MDL-46917 atto: Focus on the editor when the form label is selected

7 years agoMDL-46816 mod_asssign plagiarism: Remove unnecessary code.
Dan Marsden [Thu, 14 Aug 2014 01:06:15 +0000 (13:06 +1200)]
MDL-46816 mod_asssign plagiarism: Remove unnecessary code.

7 years agoMDL-46918 ddl: cover behavior with unit test
Eloy Lafuente (stronk7) [Thu, 21 Aug 2014 00:12:02 +0000 (02:12 +0200)]
MDL-46918 ddl: cover behavior with unit test

7 years agoMDL-46918 ddl: fix error when renaming table already exists
Tim Hunt [Wed, 20 Aug 2014 21:03:32 +0000 (22:03 +0100)]
MDL-46918 ddl: fix error when renaming table already exists

7 years agoMDL-46916 behat: improve question state test.
Tim Hunt [Wed, 20 Aug 2014 17:53:46 +0000 (18:53 +0100)]
MDL-46916 behat: improve question state test.

7 years agoMDL-46894 make Behat backup steps more robust.
Tim Hunt [Tue, 19 Aug 2014 16:38:14 +0000 (17:38 +0100)]
MDL-46894 make Behat backup steps more robust.

7 years agoMDL-46880 mod_forum: move cron to scheduled task
Dan Poltawski [Tue, 19 Aug 2014 10:26:01 +0000 (11:26 +0100)]
MDL-46880 mod_forum: move cron to scheduled task

Note that this is a very basic conversion without doing any refactoring
to split the tasks up better. That will come in MDL-44734, this is about
being a safe backportable change to give admins better control over the
running of the forum cron task.

7 years agoMDL-46812 grade/report/grader: Need to tie up loose ends in Gradebook after MDL-43824
Mary Evans [Thu, 21 Aug 2014 10:13:56 +0000 (11:13 +0100)]
MDL-46812 grade/report/grader: Need to tie up loose ends in Gradebook after MDL-43824

Squashed commit of the following:

commit 5881cccc95c135e1440ce0c5441a84b462941758
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Thu Aug 21 02:15:05 2014 +0100

    MDL-46812 grade/report/grader: Reset previous commit for left scroller.

commit 5abeb60470f02ab4c79c27b2a6f6187e75891e0b
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Thu Aug 21 01:29:41 2014 +0100

    MDL-46812 grade/report/grader: Added jsenabled css body class to rtl style.

commit a95d23d8b753a590d980e5427e8c74ba597c2b91
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Thu Aug 21 00:59:06 2014 +0100

    MDL-46812 theme_base; Removed more redundent CSS.

commit 3fb326e5b39738343e0b7c0d9c8da17adf5a09bb
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Wed Aug 20 13:24:59 2014 +0100

    MDL-46812 theme_base: Removed redundent grade/report/grader CSS in style/grade.css

commit c602e7e277f9ce1fed6d0eccf72c547432e130b6
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Thu Aug 14 12:50:14 2014 +0100

    MDL-46812 grade/report/grader: Need to tie up loose ends in Gradebook after MDL-43824

        1. fixed gradebook layout when JS is disabled
        2. added height and background color to scroller when JS is enabled
        3. removed redundent top margin in user-grades table

7 years agoMDL-46923 core_behat: fixed typos in function names
Mark Nelson [Thu, 21 Aug 2014 05:09:29 +0000 (22:09 -0700)]
MDL-46923 core_behat: fixed typos in function names

7 years agoMDL-46900 theme: allowed more than 1 nav collapse element
Brian Barnes [Wed, 20 Aug 2014 03:24:52 +0000 (15:24 +1200)]
MDL-46900 theme: allowed more than 1 nav collapse element

7 years agoweekly release 2.8dev
Marina Glancy [Thu, 21 Aug 2014 02:18:37 +0000 (10:18 +0800)]
weekly release 2.8dev

7 years agoNOBUG: Fixed file access permissions
Marina Glancy [Thu, 21 Aug 2014 02:18:37 +0000 (10:18 +0800)]
NOBUG: Fixed file access permissions

7 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Marina Glancy [Thu, 21 Aug 2014 02:18:35 +0000 (10:18 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

7 years agoAutomatically generated installer lang files
AMOS bot [Wed, 20 Aug 2014 16:05:27 +0000 (00:05 +0800)]
Automatically generated installer lang files

7 years agoMDL-46904 core_task: Gracefully handle rubbish entries in the tasks table.
Damyon Wiese [Wed, 20 Aug 2014 05:51:59 +0000 (13:51 +0800)]
MDL-46904 core_task: Gracefully handle rubbish entries in the tasks table.

7 years agoMerge branch 'MDL-45029-master' of git://github.com/lameze/moodle
Damyon Wiese [Wed, 20 Aug 2014 05:58:22 +0000 (13:58 +0800)]
Merge branch 'MDL-45029-master' of git://github.com/lameze/moodle

Conflicts:
course/modlib.php

7 years agoMerge branch 'MDL-46792-master' of git://github.com/xow/moodle
Damyon Wiese [Wed, 20 Aug 2014 04:10:13 +0000 (12:10 +0800)]
Merge branch 'MDL-46792-master' of git://github.com/xow/moodle

7 years agoMDL-46188 core_course: use correct hide/show icon
Mark Nelson [Wed, 20 Aug 2014 03:52:46 +0000 (20:52 -0700)]
MDL-46188 core_course: use correct hide/show icon

7 years agoMDL-46792 core_group: Add unit tests to ensure that group updates and grouping update...
John Okely [Wed, 20 Aug 2014 04:02:58 +0000 (12:02 +0800)]
MDL-46792 core_group: Add unit tests to ensure that group updates and grouping updates do not require names

7 years agoMDL-45029 core_course: set aggregationcoef while creating a new course module
Simey Lameze [Fri, 1 Aug 2014 07:43:10 +0000 (15:43 +0800)]
MDL-45029 core_course: set aggregationcoef while creating a new course module

7 years agoMerge branch 'MDL-45029-master' of git://github.com/lameze/moodle
Damyon Wiese [Wed, 20 Aug 2014 02:21:20 +0000 (10:21 +0800)]
Merge branch 'MDL-45029-master' of git://github.com/lameze/moodle

7 years agoMDL-46302 correct atto img float right
uhunkler [Thu, 24 Jul 2014 15:24:37 +0000 (17:24 +0200)]
MDL-46302 correct atto img float right

Correct the atto image "float right" margin CSS

7 years agoMerge branch 'MDL-46536_oauthSig' of https://github.com/moodlerooms/moodle
Eloy Lafuente (stronk7) [Tue, 19 Aug 2014 18:27:52 +0000 (20:27 +0200)]
Merge branch 'MDL-46536_oauthSig' of https://github.com/moodlerooms/moodle

7 years agoAutomatically generated installer lang files
AMOS bot [Tue, 19 Aug 2014 16:05:24 +0000 (00:05 +0800)]
Automatically generated installer lang files

7 years agoMerge branch 'MDL-46051_LTI_event' of https://github.com/moodlerooms/moodle
Eloy Lafuente (stronk7) [Tue, 19 Aug 2014 13:59:03 +0000 (15:59 +0200)]
Merge branch 'MDL-46051_LTI_event' of https://github.com/moodlerooms/moodle

7 years agoNormalize request header names.
Michael Wheeler [Wed, 13 Aug 2014 18:51:44 +0000 (14:51 -0400)]
Normalize request header names.

7 years agoMDL-46887 mod_assign: Enforce module's maxbytes setting at submission.
David Balch [Tue, 19 Aug 2014 12:29:15 +0000 (13:29 +0100)]
MDL-46887 mod_assign: Enforce module's maxbytes setting at submission.

7 years agoMDL-46885 mod_forum: diverge version numbers
Dan Poltawski [Tue, 19 Aug 2014 10:44:50 +0000 (11:44 +0100)]
MDL-46885 mod_forum: diverge version numbers

Before this patch the version number could dangerously clash with
27_STABLE increments - and miss the upgrade steps for MDL-1626

7 years agoMerge branch 'wip-mdl-46327' of git://github.com/rajeshtaneja/moodle
Marina Glancy [Tue, 19 Aug 2014 09:28:55 +0000 (17:28 +0800)]
Merge branch 'wip-mdl-46327' of git://github.com/rajeshtaneja/moodle

7 years agoMDL-46327 phpunit: drop_table should be used, rather then drop_temp_table
Rajesh Taneja [Tue, 19 Aug 2014 09:16:55 +0000 (17:16 +0800)]
MDL-46327 phpunit: drop_table should be used, rather then drop_temp_table

7 years agoMerge branch 'MDL-46706-master' of https://github.com/sammarshallou/moodle
Damyon Wiese [Tue, 19 Aug 2014 09:13:05 +0000 (17:13 +0800)]
Merge branch 'MDL-46706-master' of https://github.com/sammarshallou/moodle

Conflicts:
lib/tests/modinfolib_test.php

7 years agoMDL-45029 core_course: set aggregationcoef while creating a new course module
Simey Lameze [Fri, 1 Aug 2014 07:43:10 +0000 (15:43 +0800)]
MDL-45029 core_course: set aggregationcoef while creating a new course module

7 years agoMerge branch 'MDL-18014-master' of git://github.com/damyon/moodle
Marina Glancy [Tue, 19 Aug 2014 08:57:05 +0000 (16:57 +0800)]
Merge branch 'MDL-18014-master' of git://github.com/damyon/moodle

7 years agoMerge branch 'MDL-46538_master' of git://github.com/lazydaisy/moodle
Marina Glancy [Tue, 19 Aug 2014 08:51:46 +0000 (16:51 +0800)]
Merge branch 'MDL-46538_master' of git://github.com/lazydaisy/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'wip_MDL-46711_m28_memcachesrvs' of https://github.com/skodak/moodle
Damyon Wiese [Tue, 19 Aug 2014 08:31:06 +0000 (16:31 +0800)]
Merge branch 'wip_MDL-46711_m28_memcachesrvs' of https://github.com/skodak/moodle

7 years agoMerge branch 'MDL-46281-master' of git://github.com/lucisgit/moodle
Marina Glancy [Tue, 19 Aug 2014 08:26:35 +0000 (16:26 +0800)]
Merge branch 'MDL-46281-master' of git://github.com/lucisgit/moodle

7 years agoMDL-18014 Atto autosave: Atto requires $PAGE->url be set or debugging is triggered
Damyon Wiese [Tue, 19 Aug 2014 08:02:14 +0000 (16:02 +0800)]
MDL-18014 Atto autosave: Atto requires $PAGE->url be set or debugging is triggered

2 quiz tests are creating forms with text editors manually - they need to ensure a valid
$PAGE->url is set so they don't trigger debugging warnings from $PAGE->url magic method
called by Atto.

7 years agoMerge branch 'MDL-46772-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Tue, 19 Aug 2014 07:41:32 +0000 (15:41 +0800)]
Merge branch 'MDL-46772-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-46829_master' of git://github.com/lazydaisy/moodle
Marina Glancy [Tue, 19 Aug 2014 06:20:51 +0000 (14:20 +0800)]
Merge branch 'MDL-46829_master' of git://github.com/lazydaisy/moodle

7 years agoMerge branch 'MDL-46833-master' of git://github.com/lucisgit/moodle
Marina Glancy [Tue, 19 Aug 2014 06:20:41 +0000 (14:20 +0800)]
Merge branch 'MDL-46833-master' of git://github.com/lucisgit/moodle

7 years agoMerge branch 'MDL-46846-master' of git://github.com/damyon/moodle
Marina Glancy [Tue, 19 Aug 2014 06:20:31 +0000 (14:20 +0800)]
Merge branch 'MDL-46846-master' of git://github.com/damyon/moodle

7 years agoMerge branch 'MDL-41513_Scrollbar_not_working' of https://github.com/MorrisR2/moodle
Damyon Wiese [Tue, 19 Aug 2014 06:11:43 +0000 (14:11 +0800)]
Merge branch 'MDL-41513_Scrollbar_not_working' of https://github.com/MorrisR2/moodle

7 years agoMerge branch 'wip-mdl-46817' of git://github.com/rajeshtaneja/moodle
Marina Glancy [Tue, 19 Aug 2014 06:03:27 +0000 (14:03 +0800)]
Merge branch 'wip-mdl-46817' of git://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'MDL-46469-master' of git://github.com/ankitagarwal/moodle
Marina Glancy [Tue, 19 Aug 2014 06:01:48 +0000 (14:01 +0800)]
Merge branch 'MDL-46469-master' of git://github.com/ankitagarwal/moodle

7 years agoMerge branch 'MDL-46792-master' of https://github.com/lucisgit/moodle
Damyon Wiese [Tue, 19 Aug 2014 05:57:50 +0000 (13:57 +0800)]
Merge branch 'MDL-46792-master' of https://github.com/lucisgit/moodle