moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 18:06:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67532 commits 37 branches 540 tags 1.3 GiB
Commit graph

67532 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Poltawski
9a59ebaa6c Merge branch 'MDL-44810-master' of git://github.com/jethac/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js
 2014-04-08 12:04:41 +08:00
Dan Poltawski
a0c2ac6b86 MDL-43682 report_loglive: commit built yui files 2014-04-08 12:03:37 +08:00
Sam Hemelryk
2891559fd5 MDL-43682 report_loglive: fixed lint warning in fetchlogs JS 2014-04-08 15:41:54 +12:00
Dan Poltawski
23cc5bbdc0 Merge branch 'MDL-44868-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
	lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js
 2014-04-08 11:37:25 +08:00
Dan Poltawski
95ce54f060 Merge branch 'MDL-44869-master' of git://github.com/FMCorz/moodle 2014-04-08 11:27:59 +08:00
Marina Glancy
39b70b23b7 Merge branch 'MDL-44677_scorm_commit' of git://github.com/davosmith/moodle 2014-04-08 11:14:52 +08:00
Marina Glancy
593fc9d8d6 Merge branch 'MDL-44948' of git://github.com/timhunt/moodle 2014-04-08 11:13:43 +08:00
Marina Glancy
aaba0d56e2 Merge branch 'MDL-44891-master' of git://github.com/sammarshallou/moodle 2014-04-08 11:13:17 +08:00
Damyon Wiese
1786388680 MDL-44342 message_airnotifier: Fix for unit tests. 2014-04-08 10:55:33 +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
Sam Hemelryk
e2a486837f Merge branch 'MDL-43975-master' of https://github.com/sammarshallou/moodle 2014-04-08 13:46:28 +12:00
Dan Poltawski
36e051dab4 Merge branch 'wip-MDL-18598-master' of git://github.com/marinaglancy/moodle 2014-04-08 09:45:07 +08:00
Damyon Wiese
9f7e101fc7 Merge branch 'MDL-44342' of git://github.com/jleyva/moodle 2014-04-08 09:27:48 +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
Marina Glancy
72c0f16889 Merge branch 'master_MDL-44938' of git://github.com/danmarsden/moodle 2014-04-08 08:53:58 +08:00
Marina Glancy
08cf1d787e Merge branch 'master_MDL-43011' of git://github.com/danmarsden/moodle 2014-04-08 08:53:49 +08:00
Marina Glancy
0f4fc5a878 Merge branch 'MDL-42195-master' of git://github.com/damyon/moodle 2014-04-08 08:53:35 +08:00
Marina Glancy
efa6ee356b Merge branch 'MDL-44954' of git://github.com/jleyva/moodle 2014-04-08 08:34:24 +08:00
Sam Hemelryk
17c37406b5 Merge branch 'MDL-44408' of git://github.com/jleyva/moodle 2014-04-08 11:44:21 +12:00
Sam Hemelryk
3fb4d8fa88 Merge branch 'MDL-44912-master-core' of git://github.com/FMCorz/moodle 2014-04-08 11:42:29 +12:00
Sam Hemelryk
2e718bc4bd Merge branch 'MDL-44933-master' of git://github.com/FMCorz/moodle 2014-04-08 11:38:13 +12:00
Sam Hemelryk
c1229656db Merge branch 'MDL-44454_old_code' of https://github.com/andyjdavis/moodle 2014-04-08 11:35:34 +12:00
Sam Hemelryk
652f9a5ef8 Merge branch 'MDL-36141' of https://github.com/merrill-oakland/moodle 2014-04-08 11:22:23 +12:00
Sam Hemelryk
87f2c808f7 Merge branch 'MDL-44760-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js
	lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js
	lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js
	lib/editor/atto/plugins/table/yui/src/button/js/button.js
	lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js
 2014-04-08 08:59:54 +12:00
Sam Hemelryk
06d94411de MDL-43682 report_loglive: fixed whitespace issue 2014-04-08 08:51:17 +12:00
Sam Hemelryk
78add102b9 Merge branch 'MDL-43682-master' of git://github.com/ankitagarwal/moodle 2014-04-08 08:50:38 +12:00
Justin Filip
4400033004 MDL-22999 code_grades: Added Behat tests for configurable grade point maximum. 2014-04-07 16:02:37 -04: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
Andrew Nicols
ee616cff45 MDL-44760 editor_atto: Make menus consistent with Clean theme 2014-04-07 20:43:57 +08:00
Juan Leyva
5e12b369af MDL-44954 messages: Fixed save notifications with the notification flag 2014-04-07 12:19:52 +02:00
Juan Leyva
d62c3c6ea8 MDL-44342 airnotifier: Add support for shifter in the YUI Module 
This commit includes also some integrator review related fixes
 2014-04-07 12:14:09 +02:00
Juan Leyva
438c7020c2 MDL-44342 airnotifier: Include missing defined and required lib in externallib.php 2014-04-07 12:14:01 +02:00
Juan Leyva
b310aeecd4 MDL-44342 airnotifier: Add information about the message in the payload. 
In order to check if is a notification or just a private message
 2014-04-07 12:13:53 +02:00
Juan Leyva
1bcb18e7f9 MDL-44342 airnotifier: Unit tests for external functions (web services) 2014-04-07 12:13:53 +02:00
Juan Leyva
324facf457 MDL-44342 airnotifier: Use system context instead user. 
Added missing capabilities and language strings
 2014-04-07 12:13:43 +02:00
Juan Leyva
98fb4d413b MDL-44342 airnotifier: Add support for Android notifications 2014-04-07 12:13:43 +02:00
Juan Leyva
a8f111aaf2 MDL-44342 airnotifier: rest.php should return success information 
Javascript should handle properly errors, also, the eye and spinner
should be synchronized with the remote operation
 2014-04-07 12:13:35 +02:00
Juan Leyva
3570f5e287 MDL-44342 airnotifier: Added support for the new workflow of registering devices 
And also for request access keys to Airnotifier
 2014-04-07 12:13:24 +02:00
mouneyrac
08ca1a5bfd MDL-44342 airnotifier: Initial work, first version of the plugin 2014-04-07 12:13:07 +02:00
Dan Poltawski
b48eaedeb9 Merge branch 'MDL-43856-master' of git://github.com/damyon/moodle 2014-04-07 17:28:34 +08:00
Damyon Wiese
22cee6a7ea MDL-43856 MathJax: Remove unused build folder. 
This is left over from when I renamed the module.
 2014-04-07 17:21:43 +08:00
Dan Poltawski
4834cfdf59 Merge branch 'MDL-43856-master' of git://github.com/damyon/moodle 2014-04-07 16:58:46 +08:00
Ankit Agarwal
1722da6a7b MDL-43682 Some imporvements to loglive report 2014-04-07 16:58:45 +08:00
Ankit Agarwal
1ac341e23f MDL-43682 log: Fix issues with log report 
Following fixes have been made:-
Porfile links where generating errors when there was no courseid present. Fixed the same.
get_readers() method was accessing an undefined property.
popups were used for action and ip address before the whole rewrite, we should maintain the same behaviour.
Fixed string issues.
Pass context to format_string method
 2014-04-07 16:58:44 +08:00
Ankit Agarwal
5991eb80cd MDL-43682 loglive: Rewrite loglive to use new logging stores 
AMOS BEGIN
 CPY [eventcomponent,report_log],[eventcomponent,report_loglive]
 CPY [eventcontext,report_log],[eventcontext,report_loglive]
 CPY [eventloggedas,report_log],[eventloggedas,report_loglive]
 CPY [eventorigin,report_log],[eventorigin,report_loglive]
 CPY [eventrelatedfullnameuser,report_log],[eventrelatedfullnameuser,report_loglive]
 CPY [nologreaderenabled,report_log],[nologreaderenabled,report_loglive]
 CPY [selectlogreader,report_log],[selectlogreader,report_loglive]
AMOS END
 2014-04-07 16:58:44 +08:00
Damyon Wiese
e017c50bcf Merge branch 'wip-MDL-40843-master' of git://github.com/marinaglancy/moodle 2014-04-07 16:57:06 +08:00
Marina Glancy
a8e4b006ce Merge branch 'MDL-44761-master' of git://github.com/andrewnicols/moodle 2014-04-07 16:16:32 +08:00
Marina Glancy
502ff062a0 Merge branch 'wip-mdl-44873' of git://github.com/rajeshtaneja/moodle 2014-04-07 16:16:25 +08:00
Dan Poltawski
e2e1622946 Merge branch 'MDL-44927-master' of git://github.com/damyon/moodle 2014-04-07 16:10:14 +08:00
Dan Poltawski
5e8be14cb9 Merge branch 'MDL-41569-master' of git://github.com/damyon/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-04-07 16:01:56 +08:00