dce7ec41e9
MDL-45219 add course recent_activity_viewed event
2014-04-23 11:53:36 +08:00
cc662b0639
MDL-45218 events: New static methods for getting general event information.
...
New methods are get_static_info() and get_explanation().
2014-04-23 11:52:05 +08:00
7c084af93d
MDL-45216 events: Unit tests for core/event/manager.
...
This includes unit tests for the new method get_all_observers
and updates to other methods that have been updated.
2014-04-23 11:51:08 +08:00
1b9fb2e815
MDL-45216 events: Update to core/event/manager to return observer information.
2014-04-23 11:51:08 +08:00
b7ff518b17
Merge branch 'w17_MDL-45203_m27_loginlog' of https://github.com/skodak/moodle
2014-04-23 10:44:10 +08:00
cd25119e34
MDL-45203 implement new event user_password_updated
2014-04-23 09:51:57 +08:00
7c5ea4935a
MDL-45226 AJAX: Backport upstream bug fixes from YUI
...
This backports the following two patches:
* https://github.com/yui/yui3/issues/1757
* https://github.com/yui/yui3/issues/1778
2014-04-22 23:25:27 +08:00
2e04d25053
MDL-45158 mobile: Grades functions included in Mobile Service
2014-04-22 14:11:11 +02:00
f857b668f9
MDL-44855 AJAX: Arrays and Objects should be defined in the initializer
...
JavaScript is a prototypal language and complex types should be defined as
null in the prototype, and set up in the initializer instead.
2014-04-22 17:03:21 +08:00
6411513518
MDL-45008 atto_link: Standardise unlinking for non-selections
...
When placing the cursor within a link, but not making a selection, we
should unlink the whole link.
2014-04-22 12:37:27 +08:00
9ff40d83b5
Merge branch 'w17_MDL-41185_m27_courselog' of git://github.com/skodak/moodle
2014-04-22 12:26:24 +08:00
0cd189bdf3
MDL-41185 fix url in course_viewed event after course deleted
...
Includes a minor fix for course invalidation after deleting of course,
this improvement should not affect normal execution, that is why
it was not backported.
2014-04-22 11:52:37 +08:00
be39d92577
MDL-45210: Fix broken link when plagiarism plugins are disabled
2014-04-22 13:27:02 +12:00
23a9a5632c
Merge branch 'wip-MDL-45045_master' of git://github.com/gjb2048/moodle
...
Conflicts:
lib/yui/build/moodle-core-blocks/moodle-core-blocks-min.js
2014-04-22 10:46:51 +12:00
65ffd68179
Merge branch 'MDL-43145-master' of git://github.com/andrewnicols/moodle
2014-04-22 10:39:09 +12:00
24901691a1
Merge branch 'mdl45012-master' of https://github.com/tlock/moodle
2014-04-22 10:10:04 +12:00
e237b23ebf
Merge branch 'MDL-44270' of git://github.com/jonof/moodle
2014-04-22 09:18:20 +12:00
f49151c30b
MDL-41185 cleanup course viewed events
...
Thanks Marina for spotting some of the issues.
2014-04-21 18:12:53 +08:00
68a7235889
MDL-41185 events: Added events for different course view pages
2014-04-21 17:39:18 +08:00
b576d3fec0
Merge branch 'w16_MDL-45049_m27_debugging' of https://github.com/skodak/moodle
2014-04-21 14:41:23 +08:00
d2907f5cb9
Merge branch 'MDL-44778_atto_border' of https://github.com/andyjdavis/moodle
2014-04-18 14:07:53 +08:00
aee01173f7
Merge branch '45123-27' of git://github.com/samhemelryk/moodle
2014-04-18 11:54:48 +08:00
d2b8b67a9c
Merge branch 'MDL-44674-master' of git://github.com/andrewnicols/moodle
...
Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js
2014-04-18 11:49:39 +08:00
3ff2fae230
Merge branch 'MDL-44906-master' of git://github.com/andrewnicols/moodle
2014-04-18 11:42:36 +08:00
3bc5fbebc5
Merge branch 'MDL-39607-master' of git://github.com/FMCorz/moodle
2014-04-18 11:10:39 +08:00
2e6b251de2
Merge branch 'MDL-44990-master' of git://github.com/lameze/moodle
2014-04-18 10:26:38 +08:00
b8d2340bb7
Merge branch 'MDL-41975-master' of git://github.com/FMCorz/moodle
2014-04-18 10:05:26 +08:00
63476b0f6f
Merge branch 'MDL-44619_master' of git://github.com/dmonllao/moodle
2014-04-17 17:02:04 +08:00
186f092ee8
Merge branch 'MDL-45119-master' of git://github.com/andrewnicols/moodle
2014-04-17 16:17:12 +08:00
da223c11a5
MDL-44990 logging: Capabilites removed from legacy and standard log.
2014-04-17 15:50:59 +08:00
5bbc92e19c
Merge branch 'MDL-44658' of git://github.com/danielneis/moodle
2014-04-17 15:06:09 +08:00
970c44196c
MDL-39607 theme: Update Moodle logo
2014-04-17 14:33:39 +08:00
2f9c7f45dc
MDL-45148 unit testing: pass role id instead of user id
2014-04-16 20:46:00 -07:00
5344148b34
MDL-45119 ajax: Correct use of COUNT in exception dialogue
2014-04-17 11:43:51 +08:00
10d7d8f2b7
MDL-45119 ajax: AJAX exceptions need a String in the Link
2014-04-17 11:43:51 +08:00
2d6221b2ae
Merge branch 'MDL-44621_master' of git://github.com/dmonllao/moodle
2014-04-17 11:04:10 +08:00
fcc19a2ff4
MDL-44778 editor_atto: added a border around the equation preview
2014-04-17 08:45:10 +08:00
1011d70413
Merge branch 'MDL-45132-master' of git://github.com/FMCorz/moodle
2014-04-16 16:22:28 +02:00
218d751d07
MDL-45132 curl: Unit Tests for file uploads
2014-04-16 17:29:22 +08:00
287fc6ce68
Merge branch 'MDL-44798-master' of git://github.com/andrewnicols/moodle
2014-04-16 15:21:08 +08:00
4916184896
Merge branch 'MDL-44349-master' of https://github.com/lucisgit/moodle
2014-04-16 15:11:27 +08:00
2522b260e6
Merge branch 'MDL-44758-master' of git://github.com/jethac/moodle
2014-04-16 14:42:15 +08:00
c312e59e7d
Merge branch 'wip-mdl-44979' of https://github.com/rajeshtaneja/moodle
2014-04-16 13:56:37 +08:00
935448edb1
MDL-41975 repository_alfresco: Updating details about Alfresco URL and timestamps
2014-04-16 13:47:24 +08:00
e0c8ddba33
MDL-41975 repository_alfresco: Ensure Moodle sends GMT time to Alfresco
2014-04-16 13:46:50 +08:00
234ead3461
MDL-44798 editor_atto: Backport a fix for HTML5Shiv
...
This is a backport of the Rangy workaround for a bug in HTML5Shiv, which
breaks document.createElement by returning nodes which have parent nodes.
HTML5Shiv refuses to fix this bug so Rangy has had to work around it.
For more information see:
* https://code.google.com/p/rangy/issues/detail?id=104 ; and
* https://github.com/aFarkas/html5shiv/issues/64 .
2014-04-16 12:14:28 +08:00
8662cd767e
Merge branch 'MDL-45081-master' of git://github.com/FMCorz/moodle
2014-04-16 11:51:57 +08:00
0dda3b10ea
Merge branch 'MDL-44295' of https://github.com/scyrma/moodle
2014-04-16 11:33:14 +08:00
7747557d03
MDL-45123 atto_equation: improvements to ajax.php
2014-04-16 15:12:03 +12:00
37477af87a
Merge branch 'MDL-45062' of git://github.com/jleyva/moodle
2014-04-16 10:57:46 +08:00
Petr Skoda