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

78999 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Eric Merrill
d636043aff MDL-54560 search: Fix menu item to be correct height 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2016-05-16 10:28:12 +08:00
Jake Dallimore
f418d89957 MDL-54128 mod_lti: Add help for custom LTI tools in activity picker 2016-05-16 10:07:29 +08:00
Rajesh Taneja
528278f78f MDL-54588 behat: Button has been replaced with link 
Adding a scale has been modified to use link
on outcome page
 2016-05-16 09:13:29 +08:00
AMOS bot
abb9ea1a3f Automatically generated installer lang files 2016-05-15 00:04:36 +08:00
Stephen Bourget
a7ea4fd62f MDL-54131 Behat: tests for the course list block 2016-05-13 22:05:33 -04:00
Stephen Bourget
412bde6fad MDL-54133 Behat: tests for the course overview block 2016-05-13 21:40:34 -04:00
Tim Hunt
795efd9c1b MDL-54582 accesslib: improve performance of load_course_context 
The new query is logically equivalen, but much, much faster, at
least on Postgred. (15ms, instead of 700ms, in one example I tried
on the database for the OU's main Moodle site.)
 2016-05-13 20:36:33 +01:00
jogarcia
8dabb7200d MDL-54576 theme: Redirect to show confirmation 
After selecting a new theme, save the new configs
then redirect to show the confirmation and the new
theme's read me.  This prevents any odd behavior
from the old theme bleeding into the display of
the confirmation.
 2016-05-13 08:57:12 -07:00
Dan Poltawski
f6cbdf788a MDL-54573 testing: use dbtype rather dbvendor for diagnostics 
So that we can differentiate between drivers
 2016-05-13 14:49:42 +01:00
David Monllao
65cbefc403 on-demand release 3.1beta+ 2016-05-13 18:33:23 +08:00
David Monllao
60152a2828 NOBUG: Fixed SVG browser compatibility 2016-05-13 18:33:22 +08:00
David Monllao
6f8adf29fd NOBUG: ensure build number doesn't go backwards 
(Due to reverts happening in MDL-45390 and MDL-52815)
 2016-05-13 18:21:24 +08:00
Andrew Nicols
832ffeb204 Merge branch 'MDL-54073-master-2' of git://github.com/junpataleta/moodle 2016-05-13 18:12:33 +08:00
Andrew Nicols
d58854d3bf Merge branch 'wip-mdl-54561' of https://github.com/rajeshtaneja/moodle 2016-05-13 18:12:32 +08:00
Jun Pataleta
c89ba86342 MDL-54073 tool_lp: Unescape additional properties 
* LP Blocks (Competency name)
* User evidence competency picker (User learning plan name)
* Template competencies (Course full name)
 2016-05-13 18:12:32 +08:00
Andrew Nicols
e53d7e7c04 Merge branch 'MDL-50063' of git://github.com/stronk7/moodle 2016-05-13 18:12:32 +08:00
Andrew Nicols
a1057084e1 MDL-52253 scales: Correct doc 2016-05-13 18:12:31 +08:00
Damyon Wiese
d03602c86b MDL-52253 scales: Prevent deletion of the last global scale 2016-05-13 18:12:31 +08:00
Damyon Wiese
8de0b1ab7d MDL-52253 scales: Add new competence scale 2016-05-13 18:12:28 +08:00
Damyon Wiese
81967b54b6 MDL-52253 scales: Install the separate and connected scale 2016-05-13 18:11:30 +08:00
Dan Poltawski
35f11c55fb Merge branch 'MDL-54101_master' of git://github.com/markn86/moodle 2016-05-13 18:11:29 +08:00
Dan Poltawski
6967b71a34 Merge branch 'MDL-54546-master' of git://github.com/junpataleta/moodle 2016-05-13 18:11:29 +08:00
Dan Poltawski
7fdd86247b Merge branch 'wip-mdl-54543' of https://github.com/rajeshtaneja/moodle 2016-05-13 18:11:28 +08:00
Andrew Nicols
07d4b49760 Merge branch 'MDL-54073-master' of git://github.com/junpataleta/moodle 2016-05-13 18:11:28 +08:00
Barbara Ramiro
378733a4c3 MDL-53822 editpdf: Much nicer icons for new drag-to-scroll feature 2016-05-13 18:11:28 +08:00
David Monllao
8ae171ed1c Merge branch 'MDL-53822-master' of git://github.com/damyon/moodle 2016-05-13 18:11:27 +08:00