mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-03 15:32:43 +02:00
Code Issues Projects Releases Wiki Activity
71,161 Commits 36 Branches 528 Tags
Commit Graph

71161 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
494cf9b81c MDL-23839 navigation: Check for assignable course category roles 2014-11-19 08:54:53 +08:00
Sam Hemelryk
a74d4743e1 MDL-33606 event: moved upgrade notice 2014-11-19 09:38:55 +13:00
Sam Hemelryk
469c32955a Merge branch 'MDL-33606_master' of git://github.com/dmonllao/moodle 2014-11-19 09:37:19 +13:00
Sam Hemelryk
756350b82d Merge branch 'MDL-47587' of git://github.com/jmvedrine/moodle 2014-11-19 09:18:36 +13:00
Mary Evans
a263396486 MDL-47915 theme: use id='page-content' rather than 'content'. 
Also added JS fallback for themes using copied layouts in scorm
 2014-11-18 17:49:57 +00:00
Gilles-Philippe Leblanc
af14ef657a MDL-47501 gradebook: Add an indication that the grade letters was overridden 2014-11-18 17:13:40 +00:00
Helen Foster
ee7a1a546c MDL-47800 admin: improved strings 2014-11-18 16:35:38 +00:00
Dan Poltawski
eb0acfa311 Merge branch 'wip_MDL-47800_m28_pwchange2' of git://github.com/skodak/moodle 2014-11-18 16:32:57 +00:00
Dan Poltawski
c8b01e0c7d Merge branch 'MDL36874_Text_navigation_for_Books' of git://github.com/Dave-B/moodle 
Conflicts:
	mod/book/version.php
	mod/book/db/upgrade.php
 2014-11-18 13:54:05 +00:00
Dan Poltawski
0bd55a3322 Merge branch '47434-29-1' of git://github.com/samhemelryk/moodle 2014-11-18 13:22:41 +00:00
Dan Poltawski
8d3fba4ce4 Merge branch 'm28_MDL-48041' of https://github.com/totara/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-11-18 13:10:57 +00:00
Dan Poltawski
de134194b9 Merge branch 'MDL-48146' of git://github.com/timhunt/moodle 2014-11-18 12:04:48 +00:00
Dan Poltawski
39da77774a Merge branch 'wip_MDL-47803_m28_usersessions2' of https://github.com/skodak/moodle 2014-11-18 10:15:06 +00:00
Dan Poltawski
7baf2d1634 Merge branch 'MDL-47700-master' of git://github.com/xow/moodle 2014-11-18 10:04:33 +00:00
Jean-Michel Vedrine
31f386732b MDL-47587 Lesson: Display progress bar on the end of lesson page 2014-11-18 08:49:22 +01:00
Sam Hemelryk
1b4af6f371 Merge branch 'wip-mdl-48250' of https://github.com/rajeshtaneja/moodle 2014-11-18 17:37:57 +13:00
Sam Hemelryk
2f365ee4aa Merge branch 'wip-MDL-43205-master' of git://github.com/abgreeve/moodle 2014-11-18 16:48:27 +13:00
Sam Hemelryk
7b604fd9f1 Merge branch 'MDL-29585-master' of git://github.com/FMCorz/moodle 2014-11-18 16:47:24 +13:00
Eloy Lafuente (stronk7)
ea1720be99 Merge branch '48070-29' of git://github.com/samhemelryk/moodle 2014-11-18 03:41:28 +01:00
Petr Skoda
8064168e3c MDL-47803 Add report that lists user sessions 2014-11-18 13:55:11 +13:00
Sam Hemelryk
5b9a75e1fe Merge branch 'MDL-47527_master' of https://github.com/StudiUM/moodle 2014-11-18 13:34:29 +13:00
Sam Hemelryk
817e9010c1 Merge branch 'MDL-47618' of git://github.com/timhunt/moodle 2014-11-18 11:12:28 +13:00
Sam Hemelryk
6067a4c87c Merge branch 'MDL-47777_master' of https://github.com/Syxton/moodle 2014-11-18 10:57:29 +13:00
Sam Hemelryk
06404b0118 Merge branch 'MDL-46531-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-11-18 10:48:31 +13:00
Sam Hemelryk
699f60c6f7 MDL-48070 navbar: ensure navigation initialised 2014-11-18 09:55:36 +13:00
Petr Skoda
866f03de46 MDL-47800 auth: Add option to logout on pw change 2014-11-18 09:51:52 +13:00
Dan Poltawski
0f87473fed Merge branch 'MDL-30619_master' of https://github.com/markn86/moodle 2014-11-17 16:48:27 +00:00
Dan Poltawski
34a0b00d4a Merge branch 'MDL-48199-master' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-11-17 16:42:34 +00:00
Dan Poltawski
b4dd8e28cd Merge branch '48070-29' of git://github.com/samhemelryk/moodle 2014-11-17 16:22:26 +00:00
Dan Poltawski
122cabb41e Merge branch 'MDL-47648' of git://github.com/timhunt/moodle 2014-11-17 15:39:48 +00:00
Dan Poltawski
d012fad7d9 Merge branch 'wip-mdl-46865' of https://github.com/rajeshtaneja/moodle 2014-11-17 15:33:45 +00:00
Dan Poltawski
296e292413 Merge branch 'm29_MDL-48023_Theme_Setting_Files_Cacheable_By_Both_Browsers_And_Proxies' of https://github.com/scara/moodle 2014-11-17 15:20:17 +00:00
Dan Poltawski
8776094d6d Merge branch 'MDL-48042_wip' of git://github.com/ppichet/moodle 2014-11-17 15:12:56 +00:00
Dan Poltawski
96ac6cb964 Merge branch 'MDL-42756' of git://github.com/aolley/moodle 2014-11-17 13:52:39 +00:00
Dan Poltawski
604090397a Merge branch 'wip-MDL-36240-master' of git://github.com/abgreeve/moodle 2014-11-17 13:30:57 +00:00
Dan Poltawski
bb4013f5c7 Merge branch 'MDL-43987-master' of git://github.com/xow/moodle 2014-11-17 13:17:40 +00:00
Dan Poltawski
a020ddecf0 Merge branch 'MDL-46640-master' of git://github.com/FMCorz/moodle 2014-11-17 12:52:35 +00:00
Dan Poltawski
42b8a6cccd Merge branch 'wip-mdl-48032-m' of git://github.com/rajeshtaneja/moodle 2014-11-17 11:32:04 +00:00
Andrew Nicols
e7f0b4d3dd MDL-48150 mod_forum: Generate message inbound keys for all posts 
This code was previously misplaced so that only posts in discussion which
had not yet been processed in the current cron run would have keys
generated. If two posts were generated in the same discussion and sent out
on the same cron cycle, only the first post to be processed would have a
key generated.
 2014-11-17 15:47:47 +08:00
David Monllao
d931574ff9 MDL-33606 course: Adding section info to course_viewed log 
Also changing references to section id to
section number, that it is what it really is.
 2014-11-17 15:18:18 +08:00
Rajesh Taneja
b4fa03606f MDL-48250 enrol_ldap: set default category 
As in other enrol plugins (database), set default
category to 1 (pointing to Miscellaneous)
 2014-11-17 14:41:56 +08:00
Mark Nelson
4e4572963a MDL-30619 mod_data: fixed deletion of files on reset 2014-11-16 21:42:59 -08:00
Frederic Massart
0209a85704 MDL-46640 navigation: Handle block contexts within a category 2014-11-17 12:41:41 +08:00
Frederic Massart
c159e2aa0a MDL-29585 mod_wiki: Handle special characters in headings/sections 2014-11-17 10:38:36 +08:00
Sam Hemelryk
2611dd99d3 MDL-48196 phpunit: fixed the fail after this change 2014-11-17 15:07:15 +13:00
John Okely
c2a9bb3a9d MDL-43987 core: Remove port numbers in cleanremoteaddr 2014-11-17 09:48:26 +08:00
Sam Hemelryk
1f4039d84f Merge branch 'MDL-48115_master' of https://github.com/totara/openbadges 2014-11-17 14:37:49 +13:00
Adrian Greeve
d983ac6394 MDL-36240 backup: Activity calendar events backed up. 
Activity calendar events can now be backed up and restored
when no user data is selected.
 2014-11-17 09:18:00 +08:00
Sam Hemelryk
d6abe6f744 Merge branch 'MDL-48194-master' of git://github.com/andrewnicols/moodle 2014-11-17 13:39:03 +13:00
Sam Hemelryk
993e61d970 Merge branch 'MDL-48171-master' of git://github.com/ankitagarwal/moodle 2014-11-17 13:21:02 +13:00