Damyon Wiese
|
9ced78bd3e
|
Merge branch 'wip-MDL-40648-master' of git://github.com/marinaglancy/moodle
Conflicts:
version.php
|
2013-07-23 10:37:20 +08:00 |
|
Sam Hemelryk
|
deeae9c155
|
Merge branch 'MDL-40680-master' of git://github.com/danpoltawski/moodle
|
2013-07-23 14:14:27 +12:00 |
|
Sam Hemelryk
|
18474f822b
|
Merge branch 'MDL-40666-master' of git://github.com/danpoltawski/moodle
|
2013-07-23 14:09:08 +12:00 |
|
Dan Poltawski
|
131580860b
|
Merge branch 'MDL-35674-form-dependencies' of https://github.com/andrewnicols/moodle
|
2013-07-23 10:01:59 +08:00 |
|
Sam Hemelryk
|
97ff2341b3
|
Merge branch 'master_MDL-40702' of git://github.com/danmarsden/moodle
|
2013-07-23 13:59:16 +12:00 |
|
Eloy Lafuente (stronk7)
|
4238060a9b
|
Merge branch 'wip-MDL-38707-master' of git://github.com/marinaglancy/moodle
|
2013-07-23 03:52:16 +02:00 |
|
Jason Fowler
|
0ebd16d2b2
|
MDL-37869 - Course - Removing the ALT text from activity and resource icons as it duplicated the accesshide text
|
2013-07-23 08:08:24 +08:00 |
|
Sam Hemelryk
|
07724a9cee
|
Merge branch 'MDL-39695_master' of git://github.com/kordan/moodle
|
2013-07-23 12:00:59 +12:00 |
|
Sam Hemelryk
|
031ef3f871
|
Merge branch 'MDL-40670-master' of git://github.com/barbararamiro/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
|
2013-07-23 11:57:50 +12:00 |
|
Sam Hemelryk
|
092a99ef08
|
Merge branch 'MDL-40799-m' of git://github.com/andrewnicols/moodle
|
2013-07-23 11:12:39 +12:00 |
|
Sam Hemelryk
|
d0ed9d6375
|
Merge branch 'MDL-40788-m' of git://github.com/andrewnicols/moodle
|
2013-07-23 11:12:34 +12:00 |
|
Eloy Lafuente (stronk7)
|
6d0085ef24
|
Merge branch 'MDL-40123_master' of git://github.com/dmonllao/moodle
|
2013-07-23 01:09:52 +02:00 |
|
Sam Hemelryk
|
374f7b1d28
|
Merge branch 'MDL-40787-m' of git://github.com/andrewnicols/moodle
|
2013-07-23 11:07:53 +12:00 |
|
Sam Hemelryk
|
0ad4bcd102
|
Merge branch 'MDL-39770_chat' of https://github.com/andyjdavis/moodle
|
2013-07-23 11:06:08 +12:00 |
|
Eloy Lafuente (stronk7)
|
63ff2c5c2f
|
Merge branch 'MDL-39635_master' of git://github.com/dmonllao/moodle
|
2013-07-23 00:45:13 +02:00 |
|
Eloy Lafuente (stronk7)
|
f2515968d2
|
Merge branch 'wip-MDL-33563-master' of git://github.com/marinaglancy/moodle
|
2013-07-22 22:36:23 +02:00 |
|
Eloy Lafuente (stronk7)
|
59af378baf
|
Merge branch 'w30_MDL-40795_m26_ajaxerrordisplay' of https://github.com/skodak/moodle
|
2013-07-22 18:56:40 +02:00 |
|
Eloy Lafuente (stronk7)
|
252e545e9f
|
Merge branch 'MDL-40626-master' of git://github.com/danpoltawski/moodle
|
2013-07-22 17:40:03 +02:00 |
|
Mark Nelson
|
888e317f2d
|
MDL-40816 backup: code cleanup on the manage backups form
|
2013-07-22 18:15:07 +08:00 |
|
Mark Nelson
|
8874895892
|
MDL-40816 backup: added missing setType calls to the manage backups form
|
2013-07-22 18:15:00 +08:00 |
|
Dan Poltawski
|
b3a570b56e
|
Merge branch 'w30_MDL-38867_m26_gspell' of https://github.com/skodak/moodle
|
2013-07-22 17:00:40 +08:00 |
|
Damyon Wiese
|
dc6b786446
|
MDL-40260 Course overview: code tidy for previous commit
Moving this check inside the following if makes it clear which code
branch it applies to.
|
2013-07-22 16:12:26 +08:00 |
|
Damyon Wiese
|
e3a96804ef
|
Merge branch 'master_MDL-40260' of git://github.com/danmarsden/moodle
|
2013-07-22 16:09:29 +08:00 |
|
Damyon Wiese
|
bbc8485708
|
Merge branch 'wip-MDL-40174-m26' of git://github.com/samhemelryk/moodle
|
2013-07-22 16:00:41 +08:00 |
|
Dan Poltawski
|
7a3f9421cb
|
Merge branch 'w30_MDL-40545_m26_localcachedir' of https://github.com/skodak/moodle
|
2013-07-22 15:47:48 +08:00 |
|
Damyon Wiese
|
c31909cb69
|
Merge branch 'w30_MDL-39846_m26_event2' of https://github.com/skodak/moodle
|
2013-07-22 15:05:53 +08:00 |
|
Dan Poltawski
|
27e2400782
|
Merge branch 'MDL-38837_dev' of https://github.com/totara/openbadges
|
2013-07-22 15:01:26 +08:00 |
|
Dan Poltawski
|
82d1dc3f17
|
Merge branch 'wip-MDL-40121-master' of git://github.com/marinaglancy/moodle
|
2013-07-22 14:36:29 +08:00 |
|
Jamie Pratt
|
09ff04bcfe
|
MDL-40778 clear cache for random questions between tests
|
2013-07-22 11:12:21 +07:00 |
|
Damyon Wiese
|
91313e43ca
|
Merge branch 'MDL-40649_master' of https://github.com/markn86/moodle
|
2013-07-22 12:11:43 +08:00 |
|
Damyon Wiese
|
c39423139d
|
Merge branch 'MDL-40468_master' of https://github.com/markn86/moodle
|
2013-07-22 11:47:21 +08:00 |
|
Dan Poltawski
|
51425cc045
|
Merge branch 'MDL-39441_master' of git://github.com/dmonllao/moodle
|
2013-07-22 10:45:42 +08:00 |
|
Dan Poltawski
|
7bdae0924f
|
Merge branch 'wip-MDL-37333_master' of git://github.com/gjb2048/moodle
|
2013-07-22 10:27:11 +08:00 |
|
Russell Smith
|
5f052b571f
|
MDL-40793 profiling: Allow multiple reference runs in display
|
2013-07-22 12:12:58 +10:00 |
|
Matt Petro
|
2f8edd067f
|
MDL-35674 formslib: Optimized disabledIf javascript for large forms
|
2013-07-22 00:08:18 +01:00 |
|
Sam Hemelryk
|
75eb202ebd
|
MDL-40174 navigation: don't remove active root nodes without children
|
2013-07-22 10:48:59 +12:00 |
|
Sam Hemelryk
|
83fa6ab6ee
|
MDL-40540 dock: the dock loader is now a proper sub module
|
2013-07-22 10:46:46 +12:00 |
|
Sam Hemelryk
|
67da59999a
|
MDL-40677 cache: fixed bug with maxsize when setting
|
2013-07-22 10:42:04 +12:00 |
|
Sam Hemelryk
|
6f6a8dd19e
|
MDL-40677: cachestore_static: implemented support for maxsize
|
2013-07-22 10:42:04 +12:00 |
|
Sam Hemelryk
|
cb3590091e
|
MDL-40677: cachestore_session: implemented support for maxsize
|
2013-07-22 10:42:04 +12:00 |
|
Sam Hemelryk
|
7dfa10b02e
|
MDL-40700 cache: memcache and memcached stores now allow alphanumext prefixes
|
2013-07-22 10:41:38 +12:00 |
|
Chris Wharton
|
a423acd95c
|
MDL-40700 cache: Validate memcache key prefix field
|
2013-07-22 10:41:37 +12:00 |
|
Sam Hemelryk
|
e9d412b3f8
|
MDL-40700 pagelib: cleaned up phpdocs
|
2013-07-22 10:41:17 +12:00 |
|
Sam Hemelryk
|
923f1c420c
|
MDL-40700 cache: fixed cache store unit tests
|
2013-07-22 10:40:45 +12:00 |
|
Petr Škoda
|
fb33dd9611
|
MDL-40809 remove after 10 years old default user images
|
2013-07-21 18:20:09 +02:00 |
|
Petr Škoda
|
dba745265f
|
MDL-40723 use will_have_course_capability() to verify future course creator capabilities when creating courses
|
2013-07-21 17:03:20 +02:00 |
|
Petr Škoda
|
a56ec91842
|
MDL-40723 add new will_have_course_capability()
|
2013-07-21 11:55:22 +02:00 |
|
Andrew Nicols
|
ce286101f0
|
MDL-40806 JavaScript: Add module metadata in JS dev modes
|
2013-07-21 10:41:49 +01:00 |
|
Petr Škoda
|
09bacfd7ae
|
MDL-40801 import latest jQuery and jQuery UI
|
2013-07-20 21:58:17 +02:00 |
|
Petr Škoda
|
bb42e608b0
|
MDL-40679 mark zlib extension as recommended
|
2013-07-20 21:18:20 +02:00 |
|