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,731 Commits 36 Branches 519 Tags
Commit Graph

67731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Petro
5f1b2e8821 MDL-45118 shibboleth: set context on index page 2014-04-15 23:11:32 -04:00
Eloy Lafuente (stronk7)
11310954ea on-demand release 2.7beta+ 2014-04-15 16:33:14 +02:00
Marina Glancy
4ba9490813 MDL-44826 atto: re-shifted js 2014-04-15 18:07:10 +08:00
Marina Glancy
2e68bf6136 Merge branch 'MDL-44826-master' of git://github.com/damyon/moodle 2014-04-15 17:55:30 +08:00
Rajesh Taneja
9ddb683a59 MDL-45073 report_log: Fixed behat 2014-04-15 17:16:43 +08:00
Rajesh Taneja
6636050115 MDL-41283 report_participation: Fixed behat 2014-04-15 17:15:51 +08:00
Marina Glancy
cf051cc46e Revert "MDL-41283 report_participation: Fixed legacy actions returned from api's" 
This reverts commit 7b7bb92d4206beac111fa0eed63a964fd9d20f4a.
 2014-04-15 17:14:57 +08:00
Damyon Wiese
7bbc64b88f MDL-44826 Atto: Set default image alignment to 'bottom' 2014-04-15 15:47:52 +08:00
Rajesh Taneja
7ca6a3fa4e MDL-45073 report_log: setup table if log reader enabled 2014-04-15 15:47:51 +08:00
Petr Škoda
875d1e30e9 MDL-45035 add missing @since to \core\event\unknown_logged class 2014-04-15 14:56:51 +08:00
Damyon Wiese
f2fb8b09c2 Merge branch 'w16_MDL-45070_m27_ubuntumaria' of https://github.com/skodak/moodle 2014-04-15 14:46:40 +08:00
Marina Glancy
c733401634 Merge branch 'MDL-45035-master' of git://github.com/ankitagarwal/moodle 2014-04-15 14:34:36 +08:00
Marina Glancy
fdb8bae241 Merge branch 'wip-mdl-41283' of git://github.com/rajeshtaneja/moodle 
Conflicts:
	mod/upgrade.txt
 2014-04-15 14:34:28 +08:00
Tony Levi
800e902813 MDL-44908: Fix upgrade_grade_item_fix_sortorder performance 2014-04-15 14:26:48 +08:00
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
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
Dan Poltawski
57506eb548 Merge branch 'wip-mdl-45073' of https://github.com/rajeshtaneja/moodle 2014-04-15 11:57:51 +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
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
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
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
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
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
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
Dan Poltawski
8f6b4739de Merge branch 'MDL-45048-master' of git://github.com/FMCorz/moodle 2014-04-14 10:01:11 +08:00