mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
67,906 Commits 36 Branches 519 Tags
Commit Graph

67906 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rajesh Taneja
58cc51cd66 MDL-41283 report_participation: moved code to locallib 2014-04-15 13:31:04 +08:00
Rajesh Taneja
7b7bb92d42 MDL-41283 report_participation: Fixed legacy actions returned from api's 2014-04-15 13:31:03 +08:00
Rajesh Taneja
b2b4ec308e MDL-41283 report_participation: Added phpdoc about function not used 
In new logging api, xxx_get_view_actions() and xxx_get_post_actions()
will not be used to identify the paticipation of user. Event's crud
and edulevel status will define user's participation.
 2014-04-15 13:31:03 +08:00
Rajesh Taneja
ff6a853aad MDL-41283 report_participation: Updated report to use logging api 2014-04-15 13:31:03 +08:00
Damyon Wiese
12f8adbd25 Merge branch 'wip-mdl-44910' of https://github.com/rajeshtaneja/moodle 2014-04-15 13:16:15 +08:00
Sam Hemelryk
19dfbe3001 Merge branch 'MDL-40674_master' of https://github.com/nadavkav/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-04-15 16:47:38 +12:00
Sam Hemelryk
00719eefd7 Merge branch 'MDL-44826-master' of git://github.com/damyon/moodle 2014-04-15 16:42:12 +12:00
Marina Glancy
72aeb83a74 MDL-44998 log_standard: review indexes 2014-04-15 12:25:48 +08:00
Damyon Wiese
d28af3d4aa MDL-44826 Atto: Image alignment options 
If an image has custom alignment or margins - don't overwrite
them unless a new alignment option is chosen.
 2014-04-15 12:23:31 +08:00
Frederic Massart
f82bc6be01 MDL-45076 theme_bootstrapbase: Clean up participants controls LESS 2014-04-15 12:19:53 +08:00
Jonathon Fowler
6b2b72d6f9 MDL-44270 files: handle drag-drop js error when event has null types 
This can happen when the 'dragover' event fires as has been observed
in Safari. When the dataTransfer.types property of the event is null,
accessing types.length throws a JavaScript error.
 2014-04-15 14:18:55 +10:00
Frederic Massart
a71b1f131e MDL-45076 theme_bootstrapbase: Select placement in participants page 
Usually the group selector is aligned with the label, but as we want
it to be consistent with the rest of the selects in the participants
page we need an override.
 2014-04-15 12:18:44 +08:00
Dan Poltawski
57506eb548 Merge branch 'wip-mdl-45073' of https://github.com/rajeshtaneja/moodle 2014-04-15 11:57:51 +08:00
Jetha Chan
f0ddce4df1 MDL-44758 editor-atto: prevent table-in-table creation 
Prevent new table creation, displaying table context menu instead when cursor is within caption, when multiple cells are selected, when selection contains both nodes within and outside of the table, and when selection contains nodes from multiple tables.
 2014-04-15 11:39:57 +08:00
Dan Poltawski
42a9073423 Merge branch 'MDL-45074-master' of git://github.com/ankitagarwal/moodle 2014-04-15 11:38:01 +08:00
Dan Poltawski
81ff1c7570 Merge branch 'MDL-45084-master' of git://github.com/FMCorz/moodle 2014-04-15 11:05:37 +08:00
Rajesh Taneja
cf247acf10 MDL-44910 behat: Fixed log and livelog behat 
As default log store is changed to standard, test should
now take care of it
 2014-04-15 10:56:41 +08:00
Dan Poltawski
72de455146 Merge branch 'MDL-45003-master' of git://github.com/jamiepratt/moodle 2014-04-15 10:33:30 +08:00
Dan Poltawski
ca4554402d Merge branch '44354-27' of git://github.com/samhemelryk/moodle 2014-04-15 10:26:06 +08:00
Andrew Nicols
b359900cd7 MDL-43277 block_navigation: Trim from the left for long names 2014-04-15 10:24:32 +08:00
Andrew Davis
a2505cfdaa MDL-45089 mod_chat: changed the page type on the accessible popup 2014-04-15 09:04:33 +08:00
Sam Hemelryk
564a413367 Merge branch 'MDL-45040-master' of git://github.com/jethac/moodle 2014-04-15 12:31:44 +12:00
Sam Hemelryk
e8bb3c3fa6 Merge branch 'MDL-41891_master' of https://github.com/nadavkav/moodle 2014-04-15 11:25:20 +12:00
Sam Hemelryk
92f4d00e5d Merge branch 'MDL-45086-master' of git://github.com/danpoltawski/moodle 2014-04-15 09:50:38 +12:00
Frederic Massart
5b98627ae6 MDL-45081 curl: Prefer usage of CURLFile over @file arguments 2014-04-14 17:39:30 +08:00
Marina Glancy
72f5bfc22b Merge branch 'MDL-45047-module-notation-deprecated' of git://github.com/mudrd8mz/moodle 2014-04-14 17:10:31 +08:00
Marina Glancy
dd5e6ad03a Merge branch 'MDL-45057_master' of git://github.com/markn86/moodle 2014-04-14 17:10:02 +08:00
Marina Glancy
300735e95e Merge branch 'w16_MDL-44911_m27_unknownevent' of git://github.com/skodak/moodle 2014-04-14 17:09:49 +08:00
Dan Poltawski
78b00793e8 MDL-45086 lib: force upgrade 
The availability changes change the course query for front page.
 2014-04-14 16:36:02 +08:00
Ankit Agarwal
521d9d74e5 MDL-45074 report_loglive Fix parameter typo 2014-04-14 16:31:54 +08:00
Frederic Massart
034dbd7588 MDL-45084 theme: File was not chunked on IE 
This only applied when themedesignermode was disabled, because the
first chunk is 0, but 0 is resolved to false. We needed to compare
$chunk with null in order to know if it was set.
 2014-04-14 16:25:20 +08:00
Dan Poltawski
2c6401e3a9 Merge branch 'wip-MDL-43719-master' of git://github.com/abgreeve/moodle 2014-04-14 15:22:59 +08:00
Marina Glancy
3c4b2f0b4c MDL-45083 recent_activity: fixed debugging message on removed module type 2014-04-14 15:20:24 +08:00
Dan Poltawski
c675899425 Merge branch 'w16_MDL-44366_m27_filtergloss' of https://github.com/skodak/moodle 2014-04-14 15:19:58 +08:00
Petr Škoda
1bfb41f45a MDL-44366 fix use of cm->uservisible in glossary concept cache 2014-04-14 15:16:28 +08:00
David Mudrák
09027084a7 MDL-45047 Put the deprecation warning into mod/upgrade.txt, too 
It is already in the main lib/upgrade.txt but it should be mentioned here as
well.
 2014-04-14 08:58:50 +02:00
Mark Nelson
92089e0ecc MDL-45057 mod_quiz: restored the user/group override deleted events 2014-04-13 22:32:06 -07:00
Petr Škoda
169ccfa442 MDL-45049 improve debugging output in error log for NO_DEBUG_DISPLAY scripts 2014-04-14 13:16:41 +08:00
Rajesh Taneja
cfb804d8cd MDL-45073 report_log: Fixed activity report 
1. Wrong reader class check and api
2. Passing logreader parameter for graph
3. Using proper time from for all log and today's log
 2014-04-14 12:40:40 +08:00
Dan Poltawski
28770140ed Merge branch 'MDL-45009-master' of git://github.com/damyon/moodle 2014-04-14 12:23:57 +08:00
Petr Škoda
d409944a95 MDL-44911 use unknown_logged class when viewing unknown events in reports 2014-04-14 11:59:00 +08:00
Ankit Agarwal
9634712a37 MDL-45055 events: Add debugging notice to events_trigger() 2014-04-14 11:51:37 +08:00
Damyon Wiese
390365e696 Merge branch 'MDL-44936-master' of git://github.com/FMCorz/moodle 2014-04-14 11:38:46 +08:00
Dan Poltawski
e3c18e1e62 Merge branch 'w16_MDL-44366_m27_filtergloss' of https://github.com/skodak/moodle 2014-04-14 10:53:56 +08:00
Adrian Greeve
1283bad691 MDL-45037 gradebook: Allow dashes in xml grade values to be ignored. 
This was delivering an error message when trying to import an exported
xml file (from Moodle).
 2014-04-14 10:46:29 +08:00
Damyon Wiese
313ae82ec0 Merge branch 'MDL-44844-master' of git://github.com/andrewnicols/moodle 2014-04-14 10:32:00 +08:00
Damyon Wiese
a4b2e65c7d Merge branch 'w16_MDL-44910_m27_logupgrade' of https://github.com/skodak/moodle 2014-04-14 10:14:47 +08:00
Andrew Nicols
e41b0e7543 MDL-44674 editor_atto: Remove the ability to prevent callback wrapping 
The callback wrapping handles various important ARIA options and should not
be so easily preventable.
 2014-04-14 10:09:14 +08:00
Dan Poltawski
8f6b4739de Merge branch 'MDL-45048-master' of git://github.com/FMCorz/moodle 2014-04-14 10:01:11 +08:00
Damyon Wiese
f8a8610be4 MDL-45009 Tex filter: Add \( \) delimiters for 1:1 compatibility with MathJax 2014-04-14 09:57:19 +08:00