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

63921 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Sam Hemelryk
0dd46bb851 Merge branch 'MDL-38317-master' of git://github.com/StudiUM/moodle 2013-09-17 08:39:14 +12:00
Andrew Nicols
9bda17ee6f MDL-40811 JavaScript: Use the new moodle-course-util functions 2013-09-16 21:05:02 +01:00
Andrew Nicols
36c1ac9b7a MDL-40811 JavaScript: Create a course-util module to reduce code duplication 2013-09-16 20:44:19 +01:00
sam marshall
4fb31ae6cd MDL-41669 Restore: Progress bar needs to include more tasks 
1. Changes progress bar code to allow headings for progress bar (so users have
   some clue what's going on if a page has more than one progress bar).
2. Changes restore code so that a progress bar can display during pre-checks if
   they take longer than 5 seconds.
3. Changes pre-check and restore code so that, in various points where the system
   can take a long time within an individual step, intederminate progress is
   indicated and it won't time out.
 2013-09-16 17:18:12 +01:00
sam marshall
6a0189eb3f MDL-41817 Backup/restore without blocks gives error 
Also applies to various other situations where backup includes 0 of
something. This was caused by a problem in the progress-tracking code.
 2013-09-16 17:11:40 +01:00
Gilles-Philippe Leblanc
adbf94c957 MDL-41733 auth_cas: Allow direct authentication with CAS to a course when multiple authentication is activated 2013-09-16 09:22:13 -04:00
Simon Coggins
f6ebcd34f2 MDL-40848 badges: Validate backpack connection via Persona 
Instead of trusting that the user owns the email address they
supply, we now require them to login via Persona before
connecting them to the backpack
 2013-09-16 20:15:32 +12:00
David Monllao
8520de1ee4 MDL-41421 tool_generator: Import .jmx template 
Ideally we should generate all the XML based on
modular components so we can also switch templates
between different sizes, this is a first step and
more work should be done in future in this direction.
 2013-09-16 16:09:25 +08:00
David Monllao
217a5f97ad MDL-41421 tool_generator: Refactoring make_form to make_course_form 
Also:
- Added a soft password for the
newly generated users so we can use
them to log in the site when running
performance tests.
- Added a method to see the courses-users
relation from outside course_backend class.
 2013-09-16 16:09:25 +08:00
Marina Glancy
a8fd33b02c MDL-41715 Increase size of char fiels in user table 2013-09-16 17:51:05 +10:00
Rossiani Wijaya
b2970f963a MDL-41612 scorm: fix heading levels 2013-09-16 15:40:01 +08:00
Ankit Agarwal
63deb5c379 MDL-39959 events: Replace add_to_log() calls with events for course module actions (create, delete and update) 2013-09-16 15:29:56 +08:00
Marina Glancy
4ead355143 Merge branch 'MDL-41621' of git://github.com/rwijaya/moodle 2013-09-16 17:14:18 +10:00
Ankit Agarwal
b9b994c7d2 MDL-39959 events: Add unit tests for course module events 
test_course_module_created_event()
test_course_module_created_event_exceptions()
test_course_module_updated_event()
test_course_module_updated_event_exceptions()
test_course_module_deleted_event()
test_course_module_deleted_event_exceptions()
 2013-09-16 13:42:37 +08:00
Ankit Agarwal
0158650f59 MDL-39959 events: Add course module events 
Added event course_module_created
Added event course_module_updated
Added event course_module_deleted
 2013-09-16 13:42:37 +08:00
Marina Glancy
81673647a9 Merge branch 'MDL-41315-master' of git://github.com/damyon/moodle 2013-09-16 15:31:20 +10:00
Jason Fowler
9cc23e2692 MDL-41716 atto - Fix resizing inconsistencies between editor modes 2013-09-16 12:52:04 +08:00
Simon Coggins
d06ffbdf2d MDL-41806 Add assessors to moodle_url class 
New assessors for scheme, host and port.
 2013-09-16 16:14:29 +12:00
Yuliya Bozhko
4d7d17ddcc MDL-40550 badges: Change wording of badge activation message 
Add confirmation check when activating badge from management page
 2013-09-16 15:37:00 +12:00
Sam Hemelryk
31dea4fea4 Merge branch 'master_MDL-41434' of https://github.com/danmarsden/moodle 2013-09-16 15:07:57 +12:00
Sam Hemelryk
da8cd86f17 Merge branch 'MDL-38194-master' of git://github.com/sammarshallou/moodle 
Conflicts:
	lib/upgrade.txt
 2013-09-16 13:56:05 +12:00
Sam Hemelryk
efc2c51712 Merge branch 'MDL-41637_master' of https://github.com/totara/openbadges 2013-09-16 13:51:12 +12:00
Sam Hemelryk
db220c2972 Merge branch 'MDL-41748_master' of https://github.com/markn86/moodle 2013-09-16 13:48:48 +12:00