moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-11 11:56:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
65363 commits 37 branches 544 tags 1.3 GiB
Commit graph

65363 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Poltawski
3e2b1a15aa Merge branch 'MDL-42514-master' of git://github.com/FMCorz/moodle 2013-10-25 15:27:48 +08:00
Frederic Massart
862ca7dbc1 MDL-41041 portfolio: Temporary solution for event portfolio_send 
As we have deprecated events_trigger(), the portfolio cannot use it
any more. Though there is no easy solution to get rid of this event
as it is used to register a cron job. MDL-42541 has been raised to
refactor the portfolio code to solve this problem. In the meantime
events_trigger_legacy() will be used.
 2013-10-25 14:54:34 +08:00
Dan Poltawski
d62cddc569 Merge branch 'MDL-42535-master-int' of git://github.com/FMCorz/moodle 2013-10-25 13:47:00 +08:00
Andrew Nicols
6a2da367aa MDL-42471 JavaScript: Adding missing dependency to toolbox 2013-10-25 13:40:40 +08:00
Marina Glancy
10b44ec93d Merge branch 'w43_MDL-42207_m26_messageformat' of https://github.com/skodak/moodle 2013-10-25 16:16:31 +11:00
Petr Škoda
4048f5b39c MDL-42207 standardise message text formatting 2013-10-25 07:08:34 +02:00
Dan Poltawski
b2d08cad46 Merge branch 'MDL-42220-master' of git://github.com/ankitagarwal/moodle 2013-10-25 12:42:38 +08:00
Dan Poltawski
cf49c1b642 Merge branch 'MDL-42219-master' of git://github.com/ankitagarwal/moodle 2013-10-25 12:39:37 +08:00
Marina Glancy
a2f56679f9 Merge branch 'MDL-31938-master' of git://github.com/danpoltawski/moodle 2013-10-25 14:56:31 +11:00
Thijs Kinkhorst
9953966213 MDL-31938: fix syntax error in db upgrade & update plugin version 
Also correct language class name.
 2013-10-25 11:51:30 +08:00
Iñaki Arenaza
02a9e4a7f3 MDL-31938, MDL-36138 auth_cas: upgrade phpCAS library 
Proxy mode changes testing still pending (we don't have such a setup).
 2013-10-25 11:51:23 +08:00
Frederic Massart
268bd2fe77 MDL-42534 mod_forum: Fix issue because cm_info is read only 2013-10-25 11:34:10 +08:00
Dan Poltawski
6356be73d0 Merge branch 'wip-mdl-42261' of git://github.com/rajeshtaneja/moodle 2013-10-25 11:33:19 +08:00
Rajesh Taneja
ca85839fd3 MDl-42261 My Home: Fixed string key to show all courses 2013-10-25 11:26:58 +08:00
David Monllao
a068887e3d MDL-42538 behat: Fixing wrong number of users 2013-10-25 11:22:34 +08:00
Rajesh Taneja
735c3a7b4f MDL-42536 enrol_self: Added groups/lib.php required file 2013-10-25 11:09:43 +08:00
Frederic Massart
c58d1e0c24 MDL-42535 report_outline: Notice set_url() was not called 2013-10-25 10:20:11 +08:00
Dan Poltawski
eb04bc4a86 Merge branch 'w43_MDL-42381_m26_ole' of https://github.com/skodak/moodle 2013-10-25 10:05:55 +08:00
Frederic Massart
127816472e MDL-42533 conditionlib: Field name is translated for students 2013-10-25 09:46:36 +08:00
Michael de Raadt
a6989aa6e9 MDL-42491 libraries: add exception for IE11 (and hopefully later versions) 2013-10-25 09:24:47 +08:00
Frederic Massart
40bbce2499 MDL-42514 groups: Importing groups created unnamed groupings 2013-10-25 08:14:33 +08:00
Eloy Lafuente (stronk7)
27ee4c13a5 Merge branch 'MDL-42377_master' of https://github.com/markn86/moodle 2013-10-25 01:14:04 +02:00
Eloy Lafuente (stronk7)
7419751a4c Merge branch 'MDL-41966-master' of git://github.com/ankitagarwal/moodle 2013-10-25 01:09:25 +02:00
Eric Merrill
ac1a29755e MDL-42528 Activity Completion: DnD upload should obey default setting 
Make activities created by drad and drop obey Default completion
tracking setting.
 2013-10-24 17:50:08 -04:00
Eloy Lafuente (stronk7)
20ddc0c9cf Merge branch 'MDL-42410-master' of git://github.com/danpoltawski/moodle 2013-10-24 23:35:24 +02:00
Eloy Lafuente (stronk7)
c783a415dc Merge branch 'w43_MDL-42442_m26_standardwhite' of https://github.com/skodak/moodle 2013-10-24 23:33:42 +02:00
Eloy Lafuente (stronk7)
d0285a0d91 Merge branch 'w43_MDL-42206_m26_metaedit' of https://github.com/skodak/moodle 2013-10-24 23:27:11 +02:00
Dan Poltawski
e36f72414d Merge branch 'wip-mdl-42261' of git://github.com/rajeshtaneja/moodle 2013-10-24 16:57:47 +08:00
Rajesh Taneja
bcf725398a MDL-42261 My Home: Fixed strings to match moodle standards 2013-10-24 16:55:27 +08:00
Rajesh Taneja
6fb0760827 MDL-42261 My Home: Added link to show all courses on my home page 
If not forced by admin, user can see all courses by clicking on link
 2013-10-24 16:55:26 +08:00
Dan Poltawski
3f9a9e86b3 Merge branch 'MDL-42338' of git://github.com/rwijaya/moodle 2013-10-24 16:28:46 +08:00
Dan Poltawski
5ab04db356 Merge branch 'MDL-42388-master' of git://github.com/sammarshallou/moodle 2013-10-24 16:15:24 +08:00
Dan Poltawski
76dcc0ee21 Merge branch 'MDL-42389-master' of git://github.com/sammarshallou/moodle 2013-10-24 16:07:17 +08:00
Dan Poltawski
680d9052ad Merge branch 'MDL-42477-master' of git://github.com/FMCorz/moodle 2013-10-24 15:55:52 +08:00
Dan Poltawski
012b0472c5 Merge branch '42299-26' of git://github.com/samhemelryk/moodle 
Conflicts:
	version.php
 2013-10-24 15:47:48 +08:00
Dan Poltawski
c6dd6d2eb7 Merge branch 'wip-MDL-42486-master' of git://github.com/marinaglancy/moodle 2013-10-24 15:15:07 +08:00
Damyon Wiese
6d87dcebe2 MDL-42401 EditPDF: Allow dragging the edit pdf window. 
Also move the location of the call the centerDialogue so it fires after the drawing region is
added to the window.
 2013-10-24 13:50:58 +08:00
Damyon Wiese
298a7ee386 MDL-42402 EditPDF: CSS Improvements for editing toolbar. 
The main change here is to prevent the default rendering of a select list for the page
selector, so that it looks more consistent with the rest of the toolbar on different
browsers/os combinations.

This is done with some vendor specific css rules targeting webkit, mozilla and ie.

There are also some minor tweaks to vertically align the images in the buttons and reduce the padding
above and below the toolbar.
 2013-10-24 13:22:39 +08:00
Dan Poltawski
2d2c5f36c4 Merge branch 'MDL-42272-master' of git://github.com/ankitagarwal/moodle 2013-10-24 12:43:52 +08:00
Dan Poltawski
205d507f87 Merge branch 'MDL-42362_master' of git://github.com/dmonllao/moodle 2013-10-24 12:39:38 +08:00
Jason Fowler
7db052a8f2 MDL-42285 Behat: Automate MDLQA-93 - A teacher can delete questions from the question bank 2013-10-24 12:35:23 +08:00
Dan Poltawski
f76c87151f Merge branch 'wip-MDL-42323-master' of git://github.com/marinaglancy/moodle 2013-10-24 12:33:15 +08:00
Marina Glancy
c7944a72b3 Merge branch 'MDL-35402_editor_rules' of git://github.com/davosmith/moodle 2013-10-24 15:29:15 +11:00
Marina Glancy
33c4c3a363 Merge branch 'MDL-41252-master' of git://github.com/mouneyrac/moodle 2013-10-24 14:15:05 +11:00
Andrew Nicols
1607ead74d MDL-42481 Editor: Temporarily unhide the editor to calculate its size 2013-10-24 11:11:11 +08:00
rwijaya
45535d95b3 MDL-42338 lti_mod: convert hardcoded string. 2013-10-24 10:30:02 +08:00
Damyon Wiese
76f8eb9be9 Merge branch 'MDL-40976-behat-fix' of git://github.com/dmonllao/moodle 2013-10-24 10:29:05 +08:00
Dan Poltawski
93488d8bb0 Merge branch 'MDL-42293-master' of git://github.com/ankitagarwal/moodle 2013-10-24 10:27:23 +08:00
Dan Poltawski
459dbd4362 Merge branch 'MDL-42030-master' of git://github.com/mouneyrac/moodle 
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
 2013-10-24 10:19:47 +08:00
Andrew Nicols
0f965ca901 MDL-42507 JavaScript: Fix alignment of tooltips 2013-10-24 09:58:04 +08:00