Commit graph

79277 commits

Author SHA1 Message Date
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
Cameron Ball
5d4dafcfa0 MDL-53805 theme: Give search icon more space 2016-05-17 13:38:52 +08:00
Ryan Wyllie
2059d6edb5 MDL-54164 upgradelib: Remove close button on success notification 2016-05-17 03:55:46 +00:00
Jun Pataleta
2664105c87 MDL-54595 mod_assign: Remove btn-group class 2016-05-17 11:53:10 +08:00
Jun Pataleta
912a183033 MDL-54595 tool_lp: Remove btn-group classes 2016-05-17 11:52:11 +08:00
Cameron Ball
ad1bfe6a9c MDL-53962 webservices: Make XML-RPC backwards compatible 2016-05-17 11:39:15 +08:00
Damyon Wiese
5620177efd MDL-54544 file: Use shared tmp storage for unoconv document conversions 2016-05-17 10:58:25 +08:00
Marina Glancy
ea4176c24f MDL-54108 mod_feedback: separate upgrade sql for mysql 2016-05-17 09:27:59 +08:00
Marina Glancy
8e70465aa8 MDL-54108 mod_feedback: add unique index on values for completed items 2016-05-17 09:27:58 +08:00
Stephen Bourget
18d157fe97 MDL-54131 Behat: Fix hide all courses test 2016-05-16 18:39:42 -04:00
Vadim Dvorovenko
7025aeed03 MDL-54599 Navigation: Sorting plugins by visible name
Sorting plugins name in admin settings tree by visible (localized) name.
2016-05-16 23:08:05 +07:00
Dan Poltawski
0be8dbd9b2 MDL-52599 rss block: clarifty sql and make style more moodley 2016-05-16 11:05:45 +01:00
Clement Smith
af8cab9b69 MDL-52599 blocks/rss_client: Fix RSS block config page
This fixes an error where the RSS block config page would display
'Array' where the multiselect list of feeds should be when
accessed by a user who has not saved any RSS feed urls and yet the
block has been previously configured by another user.
2016-05-16 11:04:36 +01:00
Dan Poltawski
fc3d70d798 MDL-54573 testing: don't uppercase dbtype 2016-05-16 08:25:10 +01:00
Mark Nelson
beb3441b68 MDL-54593 tool_lp: added missing 'alert' CSS class 2016-05-16 14:49:27 +08:00
Adrian Greeve
692b53480d MDL-54129 mod_lti: Show in course checkbox works properly.
The show in course setting for LTI would always be set to true
regardless of what was set.
2016-05-16 14:38:13 +08:00
Adrian Greeve
0eecf87687 MDL-53923 mod_assign: Movement of functions to file_storage. 2016-05-16 14:32:54 +08:00
Simey Lameze
c4d692285f MDL-53923 mod_assign: test unoconv path 2016-05-16 14:08:09 +08:00
Mark Nelson
c7e4417533 MDL-54566 tool_lp: added message when no competencies present 2016-05-16 13:59:30 +08:00
Mark Nelson
3f3e7daae1 MDL-54177 enrol_lti: improved lang strings
Also removed unused strings.
2016-05-16 13:49:28 +08:00
Andrew Nicols
98c2893cdd Merge branch 'MDL-53221_master-information' of https://github.com/dmonllao/moodle 2016-05-16 13:06:05 +08:00
David Monllao
c827acae2d MDL-53221 search: Renaming search areas
AMOS BEGIN
 CPY [modulename,mod_folder],[search:activity,mod_folder]
 CPY [modulename,mod_label],[search:activity,mod_label]
 CPY [modulename,mod_page],[search:activity,mod_page]
 CPY [modulename,mod_resource],[search:activity,mod_resource]
 CPY [modulename,mod_url],[search:activity,mod_url]
AMOS END
2016-05-16 13:02:02 +08:00
David Monllao
b9103241e6 Merge branch 'MDL-54117-master' of https://github.com/barbararamiro/moodle 2016-05-16 12:50:13 +08:00
Andrew Nicols
eb2a003dd3 Merge branch 'MDL-54550_master' of git://github.com/markn86/moodle 2016-05-16 12:21:20 +08:00
Mark Nelson
17fa366ab3 MDL-54550 enrol_lti: show plugin description and warning
- Updated and added plugin description to the settings page.
- Added warning when the auth_lti plugin is not enabled.
- Moved existing 'Allow frame embedding' warning above the
  'User default values' heading.
2016-05-16 12:18:09 +08:00
Andrew Nicols
d45047f628 Merge branch 'MDL-54560_master' of git://github.com/dmonllao/moodle 2016-05-16 12:11:19 +08:00
Andrew Nicols
dcd3dea137 Merge branch 'wip-mdl-54588' of https://github.com/rajeshtaneja/moodle 2016-05-16 12:05:34 +08:00
David Monllao
bb51d20bac Merge branch 'MDL-54133_m31v1' of https://github.com/sbourget/moodle 2016-05-16 12:03:07 +08:00
David Monllao
e68d274f45 Merge branch 'MDL-54131_m31v3' of https://github.com/sbourget/moodle 2016-05-16 12:01:37 +08:00
Andrew Nicols
dc30770656 Merge branch 'MDL-54128_masterv2' of https://github.com/snake/moodle 2016-05-16 11:56:16 +08:00
David Monllao
2d5032db89 Merge branch 'MDL-54026-master' of git://github.com/andrewnicols/moodle 2016-05-16 11:52:02 +08:00
David Monllao
261560921d Merge branch 'MDL-54130_m31v2' of https://github.com/sbourget/moodle 2016-05-16 11:31:41 +08:00
Andrew Nicols
388a8dbc4f MDL-54584 repository: Set a default filename in prepare_file 2016-05-16 11:07:38 +08:00
vpisabeywardana
0a33c8ca94 MDL-52815 theme: group select overlapping issue
Gave minimum width for select tags which are under 'groups' and 'members' classes
2016-05-16 02:42:54 +00:00
David Monllao
e716da5d13 MDL-54560 search: Search box aligned with .usermenu on .navbar 2016-05-16 10:38:14 +08:00