Eric Merrill
ec74b980c6
MDL-43794 Files API Set the mtime of files to extraction time.
...
The restore cleanup code expects the mtime to be the time of extraction
not the mtime before archiving. If set to the old mtime, the restore
files may be cleaned up before the restore is complete.
This behaviour also matches the behaviour of the zip unpacker.
2014-01-22 11:06:39 -05:00
Dan Marsden
f664a93878
MDL-43247 SCORM: convert some js to YUI
2014-01-22 21:53:26 +13:00
Tim Hunt
e5c86d0740
MDL-43670 fix quiz backup.
2014-01-22 08:32:10 +00:00
Marina Glancy
3ba635344f
MDL-43800 course: groupings are sorted alphabetically
2014-01-22 12:16:26 +08:00
Damyon Wiese
ff77d601d5
MDL-26680: Reset my moodle page - add sesskey check.
2014-01-22 10:00:43 +08:00
Damyon Wiese
ce3b8b0e71
Merge branch 'MDL-26680-master' of git://github.com/micaherne/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-01-22 09:52:38 +08:00
Dan Poltawski
259d41fcb9
Merge branch 'w03_MDL-43661_m27_edulevel' of https://github.com/skodak/moodle
2014-01-22 09:15:52 +08:00
Michael Aherne
41dcfbf1af
MDL-26680 my page My Moodle "reset to default" button
2014-01-21 22:36:24 +00:00
Dan Poltawski
73cb5874b6
Merge branch 'MDL-41506-master' of git://github.com/FMCorz/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-01-21 23:29:20 +08:00
Petr Škoda
32f906b677
MDL-43661 use new edulevel in all existing events
2014-01-21 16:12:35 +08:00
Petr Škoda
3345e24f4b
MDL-43661 change event property level to edulevel
...
Level is a reserved word in sql, sorry.
2014-01-21 15:54:56 +08:00
Dan Poltawski
0758665c0d
Merge branch 'mdl34020-master' of https://github.com/tlock/moodle
2014-01-21 15:21:17 +08:00
Dan Poltawski
0eea6f5d99
Merge branch '43714-27' of git://github.com/samhemelryk/moodle
2014-01-21 14:49:26 +08:00
Dan Poltawski
8a04a045b3
Merge branch 'MDL-43760-master' of git://github.com/damyon/moodle
2014-01-21 14:28:50 +08:00
Damyon Wiese
e677c1be7c
Merge branch 'MDL-43725-master' of git://github.com/ankitagarwal/moodle
2014-01-21 13:47:39 +08:00
Damyon Wiese
29f7aef8e9
Merge branch 'wip-MDL-43294-master' of git://github.com/abgreeve/moodle
2014-01-21 13:17:05 +08:00
Damyon Wiese
f329801959
Merge branch 'MDL-41810_master' of https://github.com/totara/openbadges
...
Conflicts:
badges/upgrade.txt
2014-01-21 13:06:30 +08:00
Damyon Wiese
c821f113cc
Merge branch 'master_MDL-43247' of git://github.com/danmarsden/moodle
2014-01-21 12:57:05 +08:00
Dan Poltawski
e8d79c2d4b
Merge branch 'wip-MDL-43700-master' of git://github.com/abgreeve/moodle
2014-01-21 12:24:38 +08:00
Dan Poltawski
d5b5f1a38b
Merge branch 'MDL-43717_master' of git://github.com/dmonllao/moodle
2014-01-21 12:19:34 +08:00
Dan Poltawski
e5c5f52e8b
MDL-43670 quiz: improve code comments a little
2014-01-21 11:59:07 +08:00
Dan Poltawski
1f931e2928
Merge branch 'MDL-43670' of git://github.com/timhunt/moodle
2014-01-21 11:25:38 +08:00
Dan Poltawski
d0a0768b7f
Merge branch 'MDL-43693-master' of https://github.com/lucisgit/moodle
2014-01-21 11:21:52 +08:00
Rajesh Taneja
ed44f0aa62
MDL-43765 reports: Fixed addtional name warning
...
Fix the alternate name warning which is generated when course participation report
is viewed
2014-01-21 10:59:26 +08:00
Damyon Wiese
5388c6665f
Merge branch 'wip-mdl-40917' of https://github.com/rajeshtaneja/moodle
2014-01-21 10:41:40 +08:00
Dan Poltawski
0296662a22
Merge branch 'MDL-42955_b' of git://github.com/rwijaya/moodle
2014-01-21 10:37:01 +08:00
Damyon Wiese
d3b5017940
Merge branch 'MDL-41688-master' of git://github.com/FMCorz/moodle
2014-01-21 09:35:21 +08:00
Damyon Wiese
7b6464bf9d
Merge branch 'MDL-43732' of github.com:merrill-oakland/moodle
2014-01-21 09:28:54 +08:00
Eloy Lafuente (stronk7)
bc6d39a561
Merge branch 'wip-MDL-43333-master' of git://github.com/marinaglancy/moodle
2014-01-21 01:59:50 +01:00
Eric Merrill
bed27b3024
MDL-43732 quiz Fix styles so that question div doesn't overlap controls.
2014-01-20 19:56:17 -05:00
Eloy Lafuente (stronk7)
ba766c4772
Merge branch 'wip-MDL-43211-master' of git://github.com/marinaglancy/moodle
2014-01-21 01:54:00 +01:00
Eloy Lafuente (stronk7)
2079744b84
Merge branch 'MDL-43401-master' of git://github.com/FMCorz/moodle
2014-01-21 01:46:16 +01:00
Eloy Lafuente (stronk7)
b7623bcb5d
Merge branch 'MDL-43480_master' of git://github.com/dmonllao/moodle
2014-01-21 01:43:13 +01:00
Eloy Lafuente (stronk7)
ad1ad9f5b4
Merge branch 'MDL-41693-master' of git://github.com/FMCorz/moodle
2014-01-21 01:13:04 +01:00
Eloy Lafuente (stronk7)
b0512f418b
Merge branch 'MDL-39684-master' of git://github.com/FMCorz/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-01-21 00:20:28 +01:00
Eloy Lafuente (stronk7)
1816a46d11
Merge branch 'MDL-40533-master' of git://github.com/FMCorz/moodle
2014-01-21 00:17:31 +01:00
Eloy Lafuente (stronk7)
9faed21cb9
Merge branch 'MDL-43743_master' of git://github.com/dmonllao/moodle
2014-01-21 00:05:03 +01:00
Eloy Lafuente (stronk7)
221e6adaa5
Merge branch 'MDL-41362-master' of git://github.com/FMCorz/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-01-20 23:59:27 +01:00
Frederic Massart
22c5c6e627
MDL-41767 themes: Support for parent-specific sheets in plugins
2014-01-20 13:29:20 +01:00
Frederic Massart
fb95da6f5b
MDL-41688 gradebook: Improved grading layout on bootstrapbase themes
2014-01-20 10:34:03 +01:00
Damyon Wiese
9a170849d7
MDL-39756 qtype_essay : Make defaults match upgrade (and php) for responserequired field
2014-01-20 17:24:04 +08:00
Damyon Wiese
4177d6a097
Merge branch 'MDL-43632-master' of https://github.com/lucisgit/moodle
2014-01-20 17:10:38 +08:00
Rajesh Taneja
f792225ced
MDL-43766 reports: Fixed wrong string variable
2014-01-20 16:43:37 +08:00
Damyon Wiese
ae69bab27f
Merge branch 'MDL-39756-essay' of https://github.com/ktemkin/moodle
2014-01-20 16:20:15 +08:00
Damyon Wiese
3a96e8b4c3
Merge branch 'MDL-32523' of git://github.com/timhunt/moodle
2014-01-20 16:02:54 +08:00
Dan Poltawski
1db62f7ff4
Merge branch 'wip-MDL-41062-master' of git://github.com/marinaglancy/moodle
2014-01-20 15:29:15 +08:00
Dan Poltawski
8e57617654
Merge branch '42682-27' of git://github.com/samhemelryk/moodle
2014-01-20 15:25:46 +08:00
Dan Poltawski
395333abe9
Merge branch 'MDL-43690' of git://github.com/timhunt/moodle
2014-01-20 14:24:38 +08:00
Rossiani Wijaya
e4a25e6ff1
MDL-42955: Removed scrollbar from block's action menu
2014-01-20 14:00:29 +08:00
Damyon Wiese
e0ebe681e0
MDL-43760 Potential fix for fletcher scott issues with fullname.
2014-01-20 13:37:51 +08:00