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

78854 commits

This branch
This branch
All branches
Author SHA1 Message Date
Damyon Wiese
4f54bdc733 MDL-54544 files: Better error handling in $fs->create_converted_document() 2016-05-18 13:44:13 +08:00
David Monllao
61e1d3d96c Merge branch 'MDL-53883_master' of git://github.com/markn86/moodle 2016-05-18 13:00:29 +08:00
David Monllao
f3ba5f4249 Merge branch 'MDL-53805-master' of git://github.com/cameron1729/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2016-05-18 12:24:45 +08:00
Andrew Nicols
03b5351f88 MDL-54620 rating: Add tests for get_aggregate_string 2016-05-18 12:13:52 +08:00
Andrew Nicols
134b6485e2 Merge branch 'MDL-54620_master' of git://github.com/dmonllao/moodle 2016-05-18 12:04:20 +08:00
Cameron Ball
cd6041b98f MDL-53896 core: Document Html2Text run-time overrides 2016-05-18 11:37:17 +08:00
Andrew Nicols
e0c901dc49 MDL-53896 core: WIP bc layer for Html2Text 2016-05-18 11:35:37 +08:00
David Monllao
d7256f3a49 Merge branch 'MDL-54119-master-with_progress_bar_template' of git://github.com/junpataleta/moodle 2016-05-18 11:33:04 +08:00
David Monllao
98c3f736bb Merge branch 'MDL-54595-master' of git://github.com/junpataleta/moodle 2016-05-18 11:30:25 +08:00
Adrian Greeve
41abbbbde5 MDL-45390 gradebook: sql tidy up and version alignment. 2016-05-18 10:41:30 +08:00
Rajesh Taneja
1ef6a5e30a MDL-53956 behat: Avoid before and after step and switch 
After pressing the button, if system is slow then
after step and before step might fail as the window
is closed by then. Execute steps one after other
 2016-05-18 10:41:01 +08:00
Andrew Nicols
63c492ece0 Merge branch 'MDL-54049-master' of git://github.com/jleyva/moodle 2016-05-18 10:34:34 +08:00
David Monllao
6b6847bc97 Merge branch 'MDL-54164-integration-cli-fix' of git://github.com/ryanwyllie/moodle 2016-05-18 10:30:30 +08:00
David Monllao
ece791dbd4 MDL-45390 grades: Courses letters using system bad boundaries 
Added unit tests to highlight the existing failures and adding
unset_config between each set of tests.
 2016-05-18 10:08:10 +08:00
Adrian Greeve
405b90bcd2 MDL-45390 gradebook: Grade boundary fix. 
Code to upgrade, fix, and freeze the gradebook for
courses with letter boundary problems.
 2016-05-18 09:56:00 +08:00
Adrian Greeve
2b98f0ea26 MDL-45390 gradebook: Behat tests for grade boundary issues. 2016-05-18 09:54:55 +08:00
Ryan Wyllie
073fcb5aa1 MDL-54164 notification: Add notification render to CLI renderer 2016-05-18 01:48:37 +00:00
Andrew Nicols
60e75de317 Merge branch 'MDL-54542-master' of git://github.com/FMCorz/moodle 2016-05-18 09:48:27 +08:00
Adrian Greeve
70dfd48f53 MDL-45390 gradebook: Unit tests for grade boundary issue. 2016-05-18 09:08:18 +08:00
Kevin Wiliarty
393890e168 MDL-54620 ratings: display '0' when aggregate = 0 2016-05-18 07:21:28 +08:00
David Monllao
ccf323d571 Merge branch 'MDL-54164-master' of git://github.com/ryanwyllie/moodle 2016-05-18 07:11:25 +08:00
David Mudrák
50d083f07a MDL-54549 lang: Fix changed strings in behat scenario files 2016-05-17 18:29:30 +02:00
Helen Foster
75a22eb9fb MDL-54549 lang: Merge English strings from the en_fix language pack 2016-05-17 18:26:15 +02:00
Michael Aherne
0c0f01aa4c MDL-54613 unit tests: Add iteminstance to test grade_item 2016-05-17 13:06:32 +01:00
Jake Dallimore
4741c3162e MDL-54025 mod_lti: Use activity name when creating tool from cartridge. 2016-05-17 17:54:12 +08:00
Mark Nelson
40d5651302 MDL-53883 core_form: updated the group elements ID 2016-05-17 17:53:17 +08:00
Dan Poltawski
33892edf18 Moodle release 3.1rc1 2016-05-17 10:49:40 +01:00
Dan Poltawski
461a5c667d Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-05-17 10:49:38 +01:00
David Monllao
fcf2064a62 NOBUG: Bumping versions after a rewrite 2016-05-17 17:16:32 +08:00
Andrew Nicols
b0e9bf8e90 Merge branch 'MDL-52599_master' of https://github.com/markn86/moodle 2016-05-17 17:16:14 +08:00
Andrew Nicols
44219e686f Merge branch 'MDL-53962-master-alt' of git://github.com/cameron1729/moodle 2016-05-17 17:16:13 +08:00
Mark Nelson
15d27733dc MDL-52599 block_rss_client: fixed various PHP errors 2016-05-17 17:16:13 +08:00
Adrian Greeve
897444d761 MDL-53923 mod_assign: Put messages into notifications. 
The unoconv test page was before just outputting text to
page. Now it is wrapped in a nice notification. One of the
warnings has been improved as well.
 2016-05-17 17:16:13 +08:00
David Monllao
f0a2dbf188 Merge branch 'MDL-54121-master' of git://github.com/damyon/moodle 2016-05-17 17:16:12 +08:00
Rajesh Taneja
13708875d3 MDL-54573 testing: don't uppercase dbtype 2016-05-17 17:16:12 +08:00
Andrew Nicols
96fd37749e Merge branch 'MDL-52599-master' of git://github.com/danpoltawski/moodle 2016-05-17 17:16:11 +08:00
Andrew Nicols
7ae90fe03c Merge branch 'wip-mdl-54600' of https://github.com/rajeshtaneja/moodle 2016-05-17 17:16:11 +08:00
Michael Aherne
39257eb39c MDL-54600 phpunit: fixed classname to follow frankenstyle 2016-05-17 17:16:11 +08:00
David Monllao
2fb0f13a87 Merge branch 'MDL-54573-master' of git://github.com/danpoltawski/moodle 2016-05-17 17:16:10 +08:00
David Monllao
2a1cfd371f Merge branch 'MDL-54108-master' of git://github.com/marinaglancy/moodle 2016-05-17 17:16:10 +08:00
Andrew Nicols
c3d079c8a4 Merge branch 'MDL-54131_m31v4' of git://github.com/sbourget/moodle 2016-05-17 17:16:10 +08:00
Dan Poltawski
7b09be79d6 Merge branch 'MDL-54545-master' of git://github.com/junpataleta/moodle 2016-05-17 17:16:09 +08:00
Dan Poltawski
76943644d4 Merge branch 'MDL-54593_master' of git://github.com/markn86/moodle 2016-05-17 17:16:09 +08:00
Dan Poltawski
bdabf42d9a Merge branch 'wip-MDL-54129-master' of git://github.com/abgreeve/moodle 2016-05-17 17:16:09 +08:00
Dan Poltawski
5a2283cdc0 Merge branch 'wip-MDL-53923-master' of git://github.com/abgreeve/moodle 2016-05-17 17:16:08 +08:00
David Monllao
df88d9a72e Merge branch 'MDL-54584-master' of git://github.com/andrewnicols/moodle 2016-05-17 17:16:08 +08:00
David Monllao
52ccda9607 Merge branch 'MDL-54177_master' of git://github.com/markn86/moodle 2016-05-17 17:16:08 +08:00
David Monllao
a7bb1dda6e Merge branch 'MDL-53311-master-moregooderer' of git://github.com/cameron1729/moodle 2016-05-17 17:16:07 +08:00
Andrew Nicols
a8c2cb02ca Merge branch 'MDL-54566_master' of git://github.com/markn86/moodle 2016-05-17 17:16:07 +08:00
Jun Pataleta
9698f2dcce MDL-54119 tool_lp: Modifications for progress bars 
Changes made in this patch include:
* Reverting to the original look of having the percentage label of the
  progress bar inside it.
* Setting a minimum width for the progress bar so the percentage label
  will still be visible even at 0%.
* Replaced the blank space between the percent text and the percent
  sign with a non-breaking space.
* Added relevant aria attributes for the progress bars.
* I think that this is a good opportunity to use a single template for the
  progress bars so I created one that is basically based from the core
  template columns-1to2. Column 1 contains the progress text, while column2
  contains the progress bar itself.
 2016-05-17 16:01:30 +08:00