mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 20:53:53 +01:00
Code Issues Projects Releases Wiki Activity
68,030 Commits 36 Branches 519 Tags
Commit Graph

4186 Commits

Author SHA1 Message Date
Marina Glancy
c6b4a7f4a2 Merge branch 'MDL-44627-master' of git://github.com/lameze/moodle 2014-04-28 12:43:37 +08:00
Simey Lameze
9e533215bd MDL-44627 events: Triggering event course module updated actions. 2014-04-28 12:11:24 +08:00
Sam Hemelryk
a5f4213939 MDL-45248 course: fixed assumptions when logging a course view 2014-04-28 08:12:35 +12:00
Sam Hemelryk
8ddcb3ff8c Merge branch 'MDL-45124-master' of git://github.com/andrewnicols/moodle 2014-04-24 11:03:15 +12:00
Petr Skoda
dce7ec41e9 MDL-45219 add course recent_activity_viewed event 2014-04-23 11:53:36 +08:00
Andrew Nicols
d2782804cb MDL-45124 dndupload: Lowercase types when comparing 
IE helpfull uses a mixed-case version of 'Text' which fails the string
comparison. All other browsers use lowercase for their mime-types.
 2014-04-22 16:08:26 +08:00
Petr Skoda
f49151c30b MDL-41185 cleanup course viewed events 
Thanks Marina for spotting some of the issues.
 2014-04-21 18:12:53 +08:00
Adrian Greeve
68a7235889 MDL-41185 events: Added events for different course view pages 2014-04-21 17:39:18 +08:00
Sam Hemelryk
e97b942223 Merge branch 'MDL-40908_master' of https://github.com/markn86/moodle 2014-04-09 11:26:33 +12:00
Sam Hemelryk
0a293483e8 MDL-39833 format: tidied up API improvement to allow for future backport 2014-04-09 10:09:44 +12:00
Sam Hemelryk
da98185a58 Merge branch 'MDL-39833' of https://github.com/shashirepo/moodle 2014-04-09 10:09:02 +12:00
Marina Glancy
158379e173 MDL-40907 events: additional legacy logging for module update/add events" 2014-04-08 13:45:13 +08:00
Marina Glancy
957944dca8 MDL-40907 events: view list of resources in course 2014-04-08 13:45:09 +08:00
Damyon Wiese
515fe565f6 Merge branch 'MDL-44070-master' of https://github.com/sammarshallou/moodle 
Conflicts:
	theme/bootstrapbase/less/moodle/forms.less
	theme/bootstrapbase/style/moodle.css
	version.php
 2014-04-08 13:30:41 +08:00
Damyon Wiese
1e16a58525 Merge branch 'wip-MDL-22999-m27' of https://github.com/jamesmcq/moodle 2014-04-08 10:09:21 +08:00
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 840c1c554d12d9214928da6f10989fc5546dbb43.
 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