Dan Poltawski
3a047312b6
Merge branch '42317-27' of git://github.com/samhemelryk/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-04-08 09:22:38 +08:00
James McQuillan
597662335d
MDL-22999 core_grades: Added ability to configure maximum grade value both globally and for each graded-activity.
2014-04-07 16:02:37 -04:00
sam marshall
00c832d7a1
MDL-44070 Conditional availability enhancements (8): display
...
Includes theme and renderer changes required for the new feature.
There are two parts: style required for the display as part of the
course page (when showing the list of conditions for an activity),
and style required for the settings form.
This change supports both the bootstrapbase theme (which was the
main theme used during development) and the old base theme.
2014-04-07 20:11:56 +01:00
sam marshall
400c0fd229
MDL-44070 Conditional availability enhancements (7): forms
...
Changes to the module and section editing forms to use the new
fields and JavaScript.
2014-04-07 20:11:52 +01:00
sam marshall
8d1f33e122
MDL-44070 Conditional availability enhancements (6): core changes
...
Changes core code to use new API instead of the old one when
checking user access to activities and sections.
Includes changes to other libraries that are necessary after
adding the availability system and removing old conditional tables
etc.
2014-04-07 20:11:48 +01:00
Damyon Wiese
e017c50bcf
Merge branch 'wip-MDL-40843-master' of git://github.com/marinaglancy/moodle
2014-04-07 16:57:06 +08:00
Damyon Wiese
2aa476bbc8
Merge branch 'wip-MDL-43021-master' of git://github.com/marinaglancy/moodle
2014-04-07 15:19:11 +08:00
Sam Hemelryk
566889aaa8
MDL-42317 output: reviewed standard/base layouts and converted where a better option was available
2014-04-06 15:57:32 +12:00
shashirepo
600be271c6
MDL-39833 course: require token change
...
MDL-39833 course: require token change
2014-04-05 12:29:47 +05:30
Marina Glancy
e19c086c36
MDL-40843 recent_activity: corrections to grouping and user fields
2014-04-04 16:52:01 +08:00
Mark Nelson
d999407125
MDL-40908 core_tag: created an 'item_untagged' event
2014-04-03 20:26:22 -07:00
Marina Glancy
e13016850c
MDL-43021 course: corrections to the shortname and idnumber uniqueness validation
2014-04-03 11:07:01 +08:00
Dan Poltawski
00f74dfd0d
MDL-44590 course: fix deprecated behat step use
2014-04-02 15:58:29 +08:00
Eloy Lafuente (stronk7)
c790670d77
Merge branch 'MDL-30085_grade_ws' of git://github.com/jleyva/moodle
2014-04-02 04:05:19 +02:00
Ankit Agarwal
b63f773296
MDL-44717 events: Fix multiple issues in events
...
Fix various incorrect urls
Fix incorrect phpdocs and other minor code style issues
Fix missing/incorrect strings
AMOS BEGIN
MOV [eventblogassociationcreated, core_blog],[eventblogassociationadded, core_blog]
AMOS END
2014-04-01 15:08:34 +08:00
Marina Glancy
31374d59d0
Merge branch 'MDL-44590-master' of git://github.com/danpoltawski/moodle
2014-04-01 11:04:52 +08:00
Andrew Davis
d35499312d
MDL-30085 core_grade: added a grade web service
2014-03-31 15:15:17 +02:00
Andrew Nicols
1f777e5c6c
MDL-41987 Javascript: Tidy up YUI documentation
2014-03-25 17:01:37 +08:00
Dan Poltawski
32145fb028
MDL-44590 behat: Add test for course category idnumber duplication
2014-03-24 16:43:42 +08:00
Dan Poltawski
bd3c9587b7
MDL-44590 category: correct get_string component
2014-03-24 16:43:42 +08:00
Mark Nelson
cc033d48b5
MDL-44316 core_tag: changed the API to accept a contextid and component
2014-03-22 13:50:08 -07:00
Ankit Agarwal
536c0865ef
MDL-42892 logging: Remove usage of logtable from can_delete_course
2014-03-18 17:35:59 +08:00
David Monllao
6a0f3c4869
MDL-43236 behat: Fixing missing changes
...
All "" "" should exists and "" "" should not exists
must be converted to the ones using exist rather than exists.
2014-03-11 10:07:25 +08:00
Dan Poltawski
4e1aad54b8
Merge branch 'wip-mdl-44017' of https://github.com/rajeshtaneja/moodle
2014-03-10 15:13:43 +08:00
David Monllao
75ddb69563
MDL-43236 behat: Step arguments normalization
...
Updating step definitions arguments according to the
documentation page.
2014-03-07 16:05:21 +08:00
David Monllao
759b323e0e
MDL-43236 behat: Updating references to deprecated methods
2014-03-07 16:05:21 +08:00
Rajesh Taneja
2cd29dd6f1
MDL-44017 Events: Added unit test for report_viewed events
2014-03-07 15:16:10 +08:00
Dan Poltawski
dc88f6699d
Revert "MDL-43852 Filters Fixed naked-OR conditions."
...
While the patch worked as intended, we discovered some other concerns
about use of this setting in testing.
This reverts commit 840c1c554d
2014-03-06 09:03:19 +08:00
Dan Poltawski
ac8d049b47
Merge branch 'wip-MDL-44287-master' of git://github.com/marinaglancy/moodle
2014-03-05 14:18:21 +08:00
Damyon Wiese
0cc30f6fcf
Merge branch 'MDL-44370-master' of git://github.com/ankitagarwal/moodle
2014-03-05 13:44:56 +08:00
Dan Poltawski
673a96bd4e
Merge branch 'MDL-44065-master' of https://github.com/sammarshallou/moodle
2014-03-05 10:52:46 +08:00
Dan Poltawski
f1284d3cfe
Merge branch 'MDL-44272-master' of git://github.com/ankitagarwal/moodle
2014-03-04 15:59:55 +08:00
Ankit Agarwal
e662454a35
MDL-44370 calendar: Fix calendar url in reports
2014-03-04 15:06:20 +08:00
Dan Poltawski
cf77b7c932
Merge branch 'wip-MDL-44321-master-fix' of git://github.com/marinaglancy/moodle
2014-03-04 15:03:02 +08:00
Marina Glancy
ae29096b5b
MDL-44321 unittest correction since snapshot is not a reference to object any more.
2014-03-04 14:56:20 +08:00
Damyon Wiese
267c4b4292
Merge branch 'MDL-43738_master' of git://github.com/dmonllao/moodle
2014-03-04 13:29:03 +08:00
Gordon Bateson
840c1c554d
MDL-43852 Filters Fixed naked-OR conditions.
2014-02-28 23:55:17 +01:00
Marina Glancy
6f9354beb0
MDL-44287 glossary: use course mod api to create new module when importing as new
2014-02-28 16:38:33 +08:00
David Monllao
f083d6145e
MDL-43738 behat: Updating features files
...
The following used steps were replaced by the ones
added in this issue:
- I fill the moodle form with
- I fill in with
- I select from
- I select radio button
- I check
- I uncheck
- the field should match
Also removing test for deprecated steps:
- the ASD checkbox should be checked
- the ASD checkbox should not be checked
2014-02-27 18:22:05 +08:00
Ankit Agarwal
df9a6c0114
MDL-44272 events: Fix incorrect urls in course module events
2014-02-24 15:08:22 +08:00
Sam Hemelryk
9bcde27f66
MDL-44185 course: fixed @package typo in report/lib.php
2014-02-24 09:26:59 +13:00
David Monllao
fbd904ef41
MDL-43802 behat: Testing deleted activity with JS enabled
2014-02-18 13:55:08 +08:00
David Monllao
0807908f17
MDL-44085 course: Replace JS confirm() by YUI confirm
2014-02-18 09:44:05 +13:00
sam marshall
5c3a54c478
MDL-44065 Course: _add_instance exception leads to inconsistent db
...
If an exception occurs during a module's _add_instance function, this
results in a course_modules entry with instance=0. The system already
handled returning false to this function, but did not handle
exceptions.
2014-02-17 10:51:09 +00:00
Dan Poltawski
a24ef7d7cd
Merge branch 'MDL-33099-master' of git://github.com/andrewnicols/moodle
2014-02-17 14:40:36 +08:00
Andrew Nicols
af64bc6179
MDL-33099 Javascript: Deprecate the ajaxenabled function
2014-02-17 14:11:21 +08:00
Andrew Nicols
2ae7e4ddd6
MDL-43504 Course: Include the course/category collapse JS correctly
...
This was previously only included when there were hidden categories to show
which were not yet visible. As a result, if all categories were visible,
then the JS was not included.
2014-02-17 11:33:52 +08:00
Andrew Nicols
b44b0fdab4
MDL-43504 Javascript: Frontpage collapsing should not depend on enableajax
...
This is an oversight, but we should not depend on the enableajax setting
which we're trying to deprecate.
2014-02-17 11:25:16 +08:00
Sam Hemelryk
b73fd8608a
Merge branch 'MDL-43941-master' of git://github.com/andrewnicols/moodle
...
Conflicts:
course/yui/build/moodle-course-toolboxes/moodle-course-toolboxes-min.js
2014-02-11 14:10:52 +13:00
Sam Hemelryk
52b7e8aa58
Merge branch 'MDL-43267-master-3' of git://github.com/andrewnicols/moodle
2014-02-10 14:53:51 +13:00
