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

17477 commits

Author SHA1 Message Date
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
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
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
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
Dan Poltawski
205d507f87 Merge branch 'MDL-42362_master' of git://github.com/dmonllao/moodle 2013-10-24 12:39:38 +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
Andrew Nicols
1607ead74d MDL-42481 Editor: Temporarily unhide the editor to calculate its size 2013-10-24 11:11:11 +08:00
Andrew Nicols
0f965ca901 MDL-42507 JavaScript: Fix alignment of tooltips 2013-10-24 09:58:04 +08:00
Dan Poltawski
d0041fb110 Merge branch 'w43_MDL-38743_m26_private' of https://github.com/skodak/moodle 2013-10-23 13:15:48 +08:00
Marina Glancy
ab864f2c36 Merge branch 'MDL-42426-master' of git://github.com/damyon/moodle 2013-10-23 13:59:50 +11:00
Marina Glancy
63e77f410d Merge branch 'w43_MDL-42414_m26_rev' of https://github.com/skodak/moodle 2013-10-23 13:11:13 +11:00
Marina Glancy
0d7b312247 MDL-42486 enrol: fixed bug in URL on manage enrol plugins page 2013-10-23 10:44:22 +11:00
Marina Glancy
295825feb6 Merge branch 'w43_MDL-37813_m26_filterall' of https://github.com/skodak/moodle 2013-10-23 10:17:00 +11:00
Dan Poltawski
8c3ebb1a9f Merge branch 'w43_MDL-42440_m26_authenable' of https://github.com/skodak/moodle 2013-10-22 12:16:53 +02:00
Dan Poltawski
2d79065013 Merge branch 'MDL-42112-master' of git://github.com/damyon/moodle 2013-10-22 12:16:53 +02:00
Dan Poltawski
6f4747d7b4 Merge branch 'MDL-42340-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
	theme/bootstrapbase/style/moodle.css
 2013-10-22 12:16:50 +02:00
Dan Poltawski
d4256630e7 Merge branch '40976-26' of git://github.com/samhemelryk/moodle 2013-10-22 12:14:41 +02:00
Dan Poltawski
3481222e57 MDL-42459 upgrade: fix upgrade step ordering 
Also incremented version to be safe
 2013-10-22 12:14:40 +02:00
Eloy Lafuente (stronk7)
bf928b2933 Merge branch 'MDL-42459-master' of git://github.com/damyon/moodle 
Conflicts:
	version.php
 2013-10-22 12:14:29 +02:00
Dan Poltawski
a8261e2830 Merge branch 'MDL-29441-master' of git://github.com/andrewnicols/moodle 2013-10-22 12:11:48 +02:00
Dan Poltawski
616e57d926 Merge branch 'MDL-40045_master' of https://github.com/markn86/moodle 2013-10-22 12:11:45 +02:00
Damyon Wiese
775a32c9b8 MDL-42459 Atto: Bye bye - see you in the plugins db! 2013-10-22 12:01:56 +08:00
Dan Poltawski
b750557ba0 Merge branch 'MDL-42201_master' of https://github.com/markn86/moodle 2013-10-22 10:25:44 +08:00
Petr Škoda
d5814f4e22 MDL-41811 simplify the admin tree detection logic and fix navigation in multiple areas 2013-10-21 14:17:55 +08:00
David Monllao
4338c6fc53 MDL-42408 behat: Setting the site summary 2013-10-21 14:17:54 +08:00
Rajesh Taneja
b92adf24a4 MDL-41811 navigation: Fixed navigation issues on pages 
Few admin pages don't add navigation node and hence they should
not show site admin
 2013-10-21 14:17:54 +08:00
Rajesh Taneja
8141ba8044 MDL-41811 navigation: Avoid loading site admin navigation is not required 
If settings node is added for frontpage, category, course, module, block or user
then don't load site admin navigation.
 2013-10-21 14:17:54 +08:00
Petr Škoda
61bb8c933f MDL-41811 find out if admin tree needed in navigation 2013-10-21 14:17:53 +08:00
Rajesh Taneja
5ab32c11b7 MDL-41811 navigation: Site admin will be loaded by ajax on non admin pages 2013-10-21 14:17:52 +08:00
Dan Poltawski
9c5ab08e5a Merge branch 'MDL-34209-master' of git://github.com/andrewnicols/moodle 2013-10-21 13:58:14 +08:00
Marina Glancy
e4ffd3dc7b Merge branch 'w43_MDL-42386_m26_etag' of https://github.com/skodak/moodle 2013-10-21 15:58:51 +11:00
Mark Nelson
f2f694f399 MDL-40045 user: replaced add_to_log call when the user list is viewed with an event 2013-10-21 11:53:31 +08:00
Mark Nelson
c76318d338 MDL-40045 user: replaced add_to_log call when a user profile is viewed with an event 2013-10-21 11:53:31 +08:00
Mark Nelson
5991cabfd7 MDL-40045 auth: removed unnecessary add_to_log calls 
Both LDAP and Shibboleth call complete_user_login which triggers
a user_loggedin event that handles the legacy call to add_to_log.
 2013-10-21 11:53:30 +08:00
Mark Nelson
70f210c04f MDL-42201 backup: introduced new automatic backup state 2013-10-21 11:51:12 +08:00
Dan Poltawski
2d0316d60d Merge branch 'MDL-26244_url' of https://github.com/andyjdavis/moodle 2013-10-21 11:24:51 +08:00
Dan Poltawski
f381eede51 Merge branch 'MDL-42408_master' of https://github.com/dmonllao/moodle 2013-10-21 11:15:21 +08:00
David Monllao
041cf62b1d MDL-42362 behat: Passing options to modules generators 2013-10-21 11:11:39 +08:00
David Monllao
a0e89a8fe3 MDL-42408 behat: Setting the site summary 2013-10-21 11:09:39 +08:00
Dan Poltawski
fb032ccb3f Merge branch 'wip-mdl-31405-new' of git://github.com/rajeshtaneja/moodle 
Conflicts:
	lib/upgrade.txt
    mod/upgrade.txt
 2013-10-21 10:57:44 +08:00
Andrew Davis
fa4fb78642 MDL-26244 mod_date:added some logic show or hide the file picker button based on repository availability 2013-10-21 08:49:38 +07:00
Petr Škoda
1302f765a7 MDL-42442 eliminate references to removed standardwhite theme 2013-10-20 18:01:44 +02:00
Petr Škoda
e34fb2ef65 MDL-42440 fix auth enabling regression 2013-10-20 10:50:19 +02:00
Petr Škoda
7d26038d47 MDL-42438 load missing CSS for our simple YUI rollup 2013-10-19 21:04:26 +02:00
Petr Škoda
a67ea663b1 MDL-37813 remove missing filters when configuring string filters and fix filter uninstall 2013-10-18 15:57:27 +02:00
Petr Škoda
29c43343a2 MDL-38743 add private cache headers 2013-10-18 15:54:43 +02:00