mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-15 13:10:08 +01:00
Code Issues Projects Releases Wiki Activity
67,754 Commits 36 Branches 523 Tags
Commit Graph

67754 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marina Glancy
8662cd767e Merge branch 'MDL-45081-master' of git://github.com/FMCorz/moodle 2014-04-16 11:51:57 +08:00
Dan Poltawski
0dda3b10ea Merge branch 'MDL-44295' of https://github.com/scyrma/moodle 2014-04-16 11:33:14 +08:00
Damyon Wiese
cc29e5d4dd Merge branch 'MDL-43277-master' of git://github.com/andrewnicols/moodle 2014-04-16 11:12:36 +08:00
Damyon Wiese
37477af87a Merge branch 'MDL-45062' of git://github.com/jleyva/moodle 2014-04-16 10:57:46 +08:00
Damyon Wiese
63c61733f0 MDL-45062 webservices: fix unit test for update_grades 
This fixes the broken unit test (which exposes a fail) and
the next patch from Juan fixes the fail.
 2014-04-16 10:55:58 +08:00
Damyon Wiese
0cbd1f913d Merge branch 'MDL-45055-master' of git://github.com/ankitagarwal/moodle 2014-04-16 10:41:17 +08:00
Dan Poltawski
21f2bad26c Merge branch 'MDL-44941-master' of git://github.com/FMCorz/moodle 2014-04-16 10:30:47 +08:00
Dan Poltawski
30a3b12f88 Merge branch 'MDL-45076-master' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-04-16 09:10:28 +08:00
Sam Hemelryk
c87a54102e Merge branch 'w16_MDL-45100_m27_coursecontext' of https://github.com/skodak/moodle 2014-04-16 11:43:48 +12:00
Sam Hemelryk
37358ac5c0 Merge branch 'wip-MDL-45083-master' of git://github.com/marinaglancy/moodle 2014-04-16 09:52:05 +12:00
Sam Hemelryk
d4449f2f17 Merge branch 'wip-MDL-44998-master' of git://github.com/marinaglancy/moodle 2014-04-16 09:46:54 +12:00
Sam Hemelryk
d668060fdc Merge branch 'MDL-45034-master' of git://github.com/damyon/moodle 
Conflicts:
	lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
 2014-04-16 09:23:30 +12: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
Juan Leyva
ccc165fd8e MDL-45062 web services: Description of method result value for update_grades_return is invalid 2014-04-15 11:59:44 +02:00
Marina Glancy
2e68bf6136 Merge branch 'MDL-44826-master' of git://github.com/damyon/moodle 2014-04-15 17:55:30 +08:00
Frederic Massart
f0031a7c15 MDL-44941 core: Removing irrelevant assertion causing failures 
The timemodified property is not called when the user logs in, and
so we should not be checking if its value matches the current time.
 2014-04-15 17:25:47 +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
d3931a7d4d MDL-45034 Atto: Image dialogue improvements. 
1. Fix Nan bugs in auto width / height
2. Allow percentages in auto width / height
3. Change dialogue title
4. Prevent preview image resizing from changing the height of the dialogue.
5. Change wording to "Auto size"
6. Auto adjust size when the "Auto size" checkbox is toggled.
7. Add img-responsive to images with the original aspect ratio.
8. If the width and height fields are left blank, revert them to the image size.
 2014-04-15 16:43:27 +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
aa386d2929 MDL-45100 fix course_context classname PHPDdos typo in context API 2014-04-15 15:46:19 +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
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
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
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
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