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

71074 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mark Nelson
475635f52d MDL-47900 tool_monitor: created list of rules MUC 2014-11-06 18:46:44 -08:00
Damyon Wiese
419d1abdad MDL-48091 users: Revert "MDL-42875 users: Show only profile visible..." 
This reverts commit a09a837f20.
 2014-11-07 09:30:42 +08:00
Simey Lameze
274962a1e7 MDL-46986 mod_assign: Remove duplicate column identifier 2014-11-07 09:19:18 +08:00
Eloy Lafuente (stronk7)
415fc3d2f9 Merge branch 'MDL-47943-master' of https://github.com/dthies/moodle 2014-11-06 18:44:38 +01:00
Eloy Lafuente (stronk7)
ed34ab47e1 Merge branch 'MDL-48035-master-enfix' of git://github.com/mudrd8mz/moodle 2014-11-06 17:40:50 +01:00
David Mudrák
f7dd19f01d MDL-48035 Fix more Behat tests regressions after merging en_fix strings 2014-11-06 16:19:11 +01:00
Andrew Nicols
a211c54388 MDL-48090 mod_forum: Optimise subquery out of discussion subs list 2014-11-06 13:39:44 +00:00
Eloy Lafuente (stronk7)
6fdd4633a7 Merge branch 'MDL-48035-master-enfix' of git://github.com/mudrd8mz/moodle 2014-11-06 11:14:52 +01:00
David Mudrák
6887e2e53e MDL-48035 Fix Behat tests regressions after merging en_fix strings 2014-11-06 10:54:27 +01:00
Dan Poltawski
e323635e1b Merge branch 'MDL-47390-master-fixes' of git://github.com/andrewnicols/moodle 2014-11-06 09:14:48 +00:00
Dan Poltawski
4c37593dcd Merge branch 'MDL-47980-master-fixup' of https://github.com/jethac/moodle 2014-11-06 08:58:27 +00:00
Dan Poltawski
4aeebe34b4 Merge branch 'MDL-47922-master' of git://github.com/ankitagarwal/moodle 2014-11-06 08:53:55 +00:00
Andrew Nicols
2b0a7419c6 MDL-47390 mod_forum: Provide ID and Discussion ID for discussion unsub 2014-11-06 16:50:36 +08:00
Jetha Chan
b7ee86966b MDL-47980 gradebook: fixed label for bulk insert select box 2014-11-06 16:37:23 +08:00
Marina Glancy
f2db391f59 Merge branch 'MDL-47980-master' of git://github.com/jethac/moodle 2014-11-06 15:14:05 +08:00
Simey Lameze
7c2a2e1a93 MDL-47869 tool_monitor: Add sorting on event monitor pages 2014-11-06 14:53:10 +08:00
Damyon Wiese
527464a618 MDL-43430 ldap: whitespace fix 2014-11-06 12:05:32 +08:00
Damyon Wiese
bd6ee5c58a Merge branch 'wip_master_mdl-43430' of https://github.com/iarenaza/moodle 2014-11-06 12:00:12 +08:00
Marina Glancy
253b93f720 Merge branch 'wip_MDL-48083_m28_rollback' of git://github.com/skodak/moodle 2014-11-06 11:42:10 +08:00
Damyon Wiese
ce1b8779df Merge branch 'MDL-48061-master-fixes' of https://github.com/andrewnicols/moodle 2014-11-06 11:30:42 +08:00
Andrew Nicols
4ee412613b MDL-48061 mod_forum: posttext should concat 2014-11-06 11:29:25 +08:00
Damyon Wiese
b0637c57ad Merge branch 'MDL-48061-master-fixes' of https://github.com/andrewnicols/moodle 2014-11-06 11:22:42 +08:00
Andrew Nicols
a41cff4e23 MDL-48061 mod_forum: Correct variable name in HTML warning message 2014-11-06 11:05:44 +08:00
Petr Skoda
5cf50f96e7 MDL-48083 dml: Empty buffers on forced rollback 2014-11-06 15:52:37 +13:00
Andrew Nicols
ddb4a31d54 MDL-48029 mod_forum: Check for subscription before enrolling 2014-11-06 10:42:09 +08:00
Jetha Chan
dd01789b4f MDL-47980 gradebook: add labels and legends missing from single view 2014-11-06 10:40:36 +08:00
Ankit Agarwal
e53a4b88d6 MDL-47922 tool_monitor: Update strings 2014-11-06 07:42:24 +05:30
Eloy Lafuente (stronk7)
dc3fab74ae Merge branch 'wip-MDL-47174-master' of git://github.com/marinaglancy/moodle 2014-11-06 02:15:44 +01:00
Marina Glancy
8f94164df3 MDL-47174 events: new calendar event may have 0 timestart 2014-11-06 08:57:29 +08:00
Eloy Lafuente (stronk7)
a376c72a05 Merge branch 'wip-mdl-45416' of https://github.com/rajeshtaneja/moodle 2014-11-06 00:57:45 +01:00
Eloy Lafuente (stronk7)
ec070d2cf7 Merge branch '48026-28' of git://github.com/samhemelryk/moodle 2014-11-06 00:33:46 +01:00
John Okely
9aa9a1c70a MDL-47862 tool_monitor: Fix tool monitor navigation tree 
Added event monitor rules link to the frontpage navigation tree, when
editing the frontpage rules. Added hack so that when viewing the site
context subscriptions, the link in navigation is correct, allowing the
breadcrumbs to appear
 2014-11-06 12:27:51 +13:00
John Okely
8f6b6982fa MDL-47862 event_monitor: Fix context for capability check on subscription page 2014-11-06 12:27:51 +13:00
Eloy Lafuente (stronk7)
4723da1bff Merge branch 'MDL-47990' of git://github.com/timhunt/moodle 2014-11-06 00:22:32 +01:00
Eloy Lafuente (stronk7)
862b76f39b Merge branch 'MDL-48050-master' of git://github.com/damyon/moodle 2014-11-06 00:01:26 +01:00
Sam Hemelryk
12a312ac6a Merge branch 'MDL-48044-master' of git://github.com/andrewnicols/moodle 2014-11-06 11:55:46 +13:00
Eloy Lafuente (stronk7)
97100bea54 Merge branch 'MDL-48054-master' of git://github.com/andrewnicols/moodle 2014-11-05 21:34:37 +01:00
Dan Poltawski
62e965c9b8 Merge branch 'MDL-47466-master' of https://github.com/tehanuyor/moodle 2014-11-05 16:24:14 +00:00
Daniel Thies
8160d004ce MDL-47943 editor_atto: Save selection on mouseleave for Chrome 2014-11-05 09:34:20 -06:00
Dan Poltawski
c293eb004b Merge branch 'MDL-47874' of git://github.com/stronk7/moodle 2014-11-05 14:27:12 +00:00
Dan Poltawski
5a6c9f1cfb Merge branch 'MDL-48021' of git://github.com/stronk7/moodle 
Conflicts:
	admin/tool/monitor/version.php
	mod/lesson/version.php
 2014-11-05 12:11:16 +00:00
Dan Poltawski
35d236c1ea Merge branch 'MDL-48047-master' of git://github.com/lameze/moodle 2014-11-05 12:05:58 +00:00
Dan Poltawski
90de57db26 Merge branch 'MDL-48068-master' of git://github.com/FMCorz/moodle 2014-11-05 12:03:48 +00:00
Dan Poltawski
f3fd919187 Merge branch 'MDL-47981-master' of git://github.com/damyon/moodle 2014-11-05 12:00:19 +00:00
Dan Poltawski
7aedf52716 MDL-47922 tool_monitor: bump version 2014-11-05 11:42:37 +00:00
Dan Poltawski
7ea14bb819 Merge branch 'MDL-47922-master' of git://github.com/ankitagarwal/moodle 2014-11-05 11:18:22 +00:00
Dan Poltawski
a0cba367bd Merge branch 'MDL-47982-master' of git://github.com/gurgus/moodle 2014-11-05 11:03:57 +00:00
Andrew Nicols
7a311adbba MDL-48019 mod_forum: Add sesskey checks when setting tracking prefs 
This also removes set_url() and changes require_course_login to
require_login as guests cannot set tracking.
 2014-11-05 10:35:12 +00:00
Dan Poltawski
fb3e9ea25d Merge branch 'MDL-48067-master' of git://github.com/jethac/moodle 2014-11-05 10:15:41 +00:00
Damyon Wiese
a75cc21442 Merge branch 'MDL-48061-master' of git://github.com/andrewnicols/moodle 2014-11-05 16:54:32 +08:00