mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-03 23:42:39 +02:00
Code Issues Projects Releases Wiki Activity
64,095 Commits 36 Branches 528 Tags
Commit Graph

64095 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Hemelryk
6af9ab573b Revert "MDL-41466 theme_formal_white: moved courses action icons once again on the right" 
This reverts commit c724e009960a399170bbddc58ca2f26737504287.
 2013-09-20 08:39:57 +12:00
Michael Aherne
f817c41cbf MDL-41900 events Log handler failures 2013-09-19 15:50:44 +01:00
Eric Merrill
e3a65c9eab MDL-37973 gradebook Return a maxgrade of '-' if grade type is TEXT 
Including tests for correct return from
grade_edit_tree_column_range->get_item_cell()
 2013-09-19 10:21:35 -04:00
David Monllao
6e09cf98fa MDL-41342 admin: Adding warning when upgrading a test site 2013-09-19 14:57:53 +08:00
Andrew Davis
dc1bb8d067 MDL-41591 removed some unnecessary z-indexes from css 2013-09-19 10:19:39 +07:00
AMOS bot
f0a617ed82 Automatically generated installer lang files 2013-09-19 00:44:10 +00:00
Sam Hemelryk
669755a423 Merge branch 'master_MDL-38489' of git://github.com/danmarsden/moodle 2013-09-19 09:49:31 +12:00
Dan Marsden
d6d0c4e00b MDL-38489 SCORM: obtain correct section number when getting course_url 2013-09-19 09:36:52 +12:00
Eloy Lafuente (stronk7)
9ea4eedf22 Merge branch 'MDL-38661-m-i' of git://github.com/andrewnicols/moodle 2013-09-18 17:09:25 +02:00
Eloy Lafuente (stronk7)
cae8956648 Merge branch 'MDL-41188-master-fix1' of git://github.com/damyon/moodle 2013-09-18 15:44:31 +02:00
sam marshall
88372410f5 MDL-38192 Backup and restore: Allow selection by activity type 
Add to the existing 'select all/none' JavaScript so that users can choose
to select or deselect everything of a certain module (e.g. deselect all
forums).
 2013-09-18 14:27:54 +01:00
Damyon Wiese
ce5867a178 MDL-41188 javascript: Prevent scrolling to top 
This fix is for dialogues that are not created until some time after the page
has loaded.
 2013-09-18 20:21:34 +08:00
Andrew Nicols
dd834cba33 MDL-38661 JavaScript: Add missing lazy loading on collapseall 2013-09-18 11:04:31 +01:00
AMOS bot
09fd6d9114 Automatically generated installer lang files 2013-09-18 00:45:28 +00:00
Eloy Lafuente (stronk7)
abef633c33 Merge branch 'MDL-41570-master-v2' of git://github.com/jamiepratt/moodle 2013-09-17 21:57:07 +02:00
Eloy Lafuente (stronk7)
5c34952b82 Merge branch 'wip-mdl-41717' of git://github.com/rajeshtaneja/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-09-17 21:22:30 +02:00
Eloy Lafuente (stronk7)
cfcd93dd11 Merge branch 'MDL-41728-master' of git://github.com/sammarshallou/moodle 2013-09-17 21:17:05 +02:00
Eloy Lafuente (stronk7)
e79ca991fb Merge branch 'master_MDL-32506' of git://github.com/danmarsden/moodle 2013-09-17 21:11:26 +02:00
Eloy Lafuente (stronk7)
e60756632a Merge branch 'wip-mdl-41711' of git://github.com/rajeshtaneja/moodle 2013-09-17 20:22:32 +02:00
Eloy Lafuente (stronk7)
1ee2fb5a11 Merge branch 'MDL-41188-master' of git://github.com/damyon/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-09-17 20:04:08 +02:00
Eloy Lafuente (stronk7)
58c9faeaca Merge branch 'MDL-38661-m-wip' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/base/style/core.css
	theme/bootstrapbase/style/moodle.css
 2013-09-17 19:59:55 +02:00
sam marshall
8d137307bf MDL-41840 Restore: Page title, breadcrumbs show incorrect stage 
Unfortunately it isn't possible to display the current stage before
printing header any more, because we need to be able to show a
progress bar while doing the code that considers whether or not
priunt stage. So this change removes stage information from page
title. It is still present (in bold) in the strip that shows where
you are within the restore/import.

This display was inconsistent anyway; change makes it consistent
between Restore and Import.
 2013-09-17 16:33:39 +01:00
sam marshall
771e3f7cab MDL-41839 Files: Zip packer progress minor bugs 
The progress variable wasn't always passed to recursive calls. This
caused a lack of progress() calls between files in subfolders. I
added a unit test for this situation.
 2013-09-17 14:19:07 +01:00
Marina Glancy
b73d8a35c2 MDL-41594 Bug fix for orphaned invisible categories 
thanks to L.Sanocki
 2013-09-17 20:58:03 +10:00
Barbara Ramiro
e9c56bce02 MDL-41713 usability - new icons for Atto editor from TinyMCE Theme 2013-09-17 15:19:48 +08:00
Ankit Agarwal
0f142ea0a8 MDL-41833 feedback: Fix setType() warning when deleting a response in feedback 2013-09-17 15:14:19 +08:00
Jason Fowler
ae5af113d0 MDL-40770 TinyMCE - Final Icon implementation 2013-09-17 15:06:32 +08:00
Marina Glancy
2b7a557c28 Merge branch 'MDL-41622_b' of git://github.com/rwijaya/moodle 2013-09-17 16:43:12 +10:00
Rossiani Wijaya
764d7ba9b4 MDL-41622 workshop mod: fix page heading levels. 
Also, changing couple of the sub header to use notification, which is more appropriate.
 2013-09-17 12:44:25 +08:00
Sam Hemelryk
d4d97627d2 Merge branch 'MDL-41817-master' of git://github.com/sammarshallou/moodle 2013-09-17 15:26:06 +12:00
Sam Hemelryk
26c9c586c9 Merge branch 'MDL-41572-master' of git://github.com/jamiepratt/moodle 2013-09-17 14:30:16 +12:00
Sam Hemelryk
23eed08e1a Merge branch 'MDL-41540-master-v2' of git://github.com/jamiepratt/moodle 2013-09-17 14:02:47 +12:00
Sam Hemelryk
81ece3f7aa Merge branch 'MDL-41571-master' of git://github.com/jamiepratt/moodle 2013-09-17 14:00:15 +12:00
Barbara Ramiro
845ae64913 MDL-41385 usability: new non-default icons for TinyMCE in svg and png formats 
Conflicts:

	lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/delete.png
	lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/delete.svg
	lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/spellcheck.png
	lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/table.png
	lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/table.svg
 2013-09-17 09:36:06 +08:00
Jason Fowler
d76a36dd05 MDL-40770 TinyMCE - Implementing new icons 2013-09-17 09:31:14 +08:00
Barbara Ramiro
bb18d12d38 MDL-40769 usability: last bit of icons for TinyMCE in svg and png formats 2013-09-17 09:30:26 +08:00
Jason Fowler
d461eb2296 MDL-40770 TinyMCE - Further changes to implement new icons 2013-09-17 09:30:26 +08:00
Barbara Ramiro
9d6c1849c6 MDL-40769 usability: additional icons for TinyMCE in svg and png formats 2013-09-17 09:30:25 +08:00
Jason Fowler
efba9f9c0c MDL-40770 TinyMCE - Implement new icons 2013-09-17 09:30:25 +08:00
Barbara Ramiro
f0b7b95522 MDL-40769 usability: new icons for TinyMCE in svg and png formats 2013-09-17 09:30:25 +08:00
Marina Glancy
9f21d24895 Merge branch 'MDL-41612_b' of git://github.com/rwijaya/moodle 2013-09-17 11:10:44 +10:00
Marina Glancy
4a91055f7c Merge branch 'MDL-39959-master' of git://github.com/ankitagarwal/moodle 2013-09-17 11:08:27 +10:00
Eloy Lafuente (stronk7)
ba57caa349 Merge branch 'MDL-41595_M26' of git://github.com/lazydaisy/moodle 2013-09-17 02:15:06 +02:00
Sam Hemelryk
c8f052dbdd Merge branch 'wip-MDL-41715-master' of git://github.com/marinaglancy/moodle 2013-09-17 11:44:39 +12:00
Andrew Robert Nicols
97f4bad867 MDL-38286 JavaScript: Include a YUIDoc configuration for Moodle 
To build documentation run:
  yuidoc
 2013-09-16 23:56:33 +01:00
Sam Hemelryk
29b56cfd09 MDL-38489 mod_scorm: added require to be explicit 2013-09-17 09:12:02 +12:00
Sam Hemelryk
77365f7ff6 Merge branch 'master_MDL-38489' of git://github.com/danmarsden/moodle 2013-09-17 09:02:32 +12:00
Sam Hemelryk
f34af1167a Merge branch 'MDL-41667' of git://github.com/timhunt/moodle 2013-09-17 08:59:08 +12:00
Sam Hemelryk
82b2bb5eca Merge branch 'MDL-37148-master' of git://github.com/damyon/moodle 2013-09-17 08:50:38 +12:00
Sam Hemelryk
c2e7f90427 Merge branch 'MDL-41466_master' of git://github.com/kordan/moodle 2013-09-17 08:48:59 +12:00