mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-25 18:12:29 +01:00
Code Issues Projects Releases Wiki Activity
71,403 Commits 36 Branches 527 Tags
Commit Graph

71403 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Daniel Thies
8bca3609ee MDL-48064 atto_editor: Expand event subscription for saving selection 2014-11-17 11:15:45 -06: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
Tim Hunt
1b49f31df2 MDL-48259 questionlib.php: remove functions deprecated in Moodle 2.6 2014-11-17 15:55:22 +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
Tim Hunt
4c3c1b5169 MDL-48259 questionlib.php: remove functions deprecated in Moodle 2.1 2014-11-17 15:19:56 +00:00
Dan Poltawski
8776094d6d Merge branch 'MDL-48042_wip' of git://github.com/ppichet/moodle 2014-11-17 15:12:56 +00:00
Mary Evans
82b5f58f57 MDL-48246 theme: Fixed typo in 'hidepanelicon' 2014-11-17 14:58:37 +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
Mark Nelson
425dc0ed96 MDL-47601 core_backup: ensure removal of automated backups 2014-11-16 23:56:59 -08: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
Frederic Massart
ab14ab741e MDL-48180 mod_assign: By default do not count 'new' submissions 2014-11-17 15:14:37 +08:00
Mark Nelson
17fd194c7c MDL-35494 core_backup: fixed activity restoration issue 2014-11-16 22:50:10 -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
Sam Hemelryk
0d23255b89 Merge branch 'MDL-48179-master' of https://github.com/sammarshallou/moodle 2014-11-17 12:48:04 +13:00
Sam Hemelryk
b83a0323da Merge branch 'MDL-48196-master' of git://github.com/andrewnicols/moodle 2014-11-17 12:34:02 +13:00
Sam Hemelryk
2928dfd8a0 Merge branch 'master_MDL-47993' of https://github.com/totara/moodle 2014-11-17 12:21:16 +13:00
Sam Hemelryk
57fa596e0f Merge branch 'MDL-43628' of https://github.com/scyrma/moodle 2014-11-17 11:44:57 +13:00
Sam Hemelryk
76555946a9 Merge branch 'MDL-35638-master' of git://github.com/ankitagarwal/moodle 2014-11-17 10:34:10 +13:00
Sam Hemelryk
fea4baf826 Merge branch 'MDL-47590' of git://github.com/timhunt/moodle 2014-11-17 10:34:09 +13:00
Sam Hemelryk
6d97620481 Merge branch 'MDL-44657-master' of git://github.com/FMCorz/moodle 2014-11-17 10:34:09 +13:00
Matteo Scaramuccia
bb8ed60a3c MDL-48023 Files API: Theme files must be cache-able by shared proxies. 
The profile image AKA user icon will be cache-able by shared proxies too,
under its specific accessibility constraints/conditions.
 2014-11-16 09:53:27 +01:00
Pierre Pichet
b8393a77c3 MDL-48042 Questions: Reset Calculated qtype comments on datasets 
Reset back the modifications of Calculated qtype comments on datasets
    done by MDL-47224

Signed-off-by: Pierre Pichet <pichet.pierre@uqam.ca>
 2014-11-15 16:17:15 -05:00
Mary Evans
31b569ab18 MDL-48199 theme_bootstrapbase: Page padding left is wrong when in RTL 2014-11-14 18:52:28 +00:00
sam marshall
94b084fb02 MDL-48179 Backup progress: Can time out when compressing large backup 2014-11-14 18:29:30 +00:00
Daniel Thies
9b9a3abf9b MDL-48064 atto_editor: Check if activeElement is child node in isActive 2014-11-14 11:49:15 -06:00
Tim Hunt
ba145a9e4e MDL-47590 question backup: include response file only with userdata 2014-11-14 16:21:18 +00:00
Ankit Agarwal
74b28381c6 MDL-48171 gradebook: Use proper apis to get item name 2014-11-14 13:25:04 +05:30
Sam Hemelryk
2ff98fb6e4 MDL-48206 block_comments: textarea width 100% 2014-11-14 11:40:33 +13:00