Marina Glancy
c59a65b273
MDL-40766 Smarter positioning of tinymce button
2013-07-24 10:58:32 +10:00
Sam Hemelryk
d853f819dc
Merge branch 'MDL-40315_master' of git://github.com/dmonllao/moodle
2013-07-24 11:14:14 +12:00
Eloy Lafuente (stronk7)
154bc6b240
Merge branch 'w30_MDL-40642_m26_umask' of https://github.com/skodak/moodle
2013-07-23 23:42:11 +02:00
Eloy Lafuente (stronk7)
e5ae5c1247
MDL-40801 Update versions in thirdpartylibs.xml
2013-07-23 23:11:24 +02:00
Eloy Lafuente (stronk7)
7613bc7c3a
Merge branch 'w30_MDL-40801_m26_jquery' of https://github.com/skodak/moodle
2013-07-23 23:06:35 +02:00
Eloy Lafuente (stronk7)
ae2605ec8d
Merge branch 'wip-MDL-40540-m26' of git://github.com/samhemelryk/moodle
2013-07-23 22:56:34 +02:00
Eloy Lafuente (stronk7)
18c4d7e68c
Merge branch 'w30_MDL-40723_m26_creators' of https://github.com/skodak/moodle
2013-07-23 20:32:40 +02:00
Eloy Lafuente (stronk7)
97c51dfb22
Merge branch 'MDL-40672_master' of git://github.com/dmonllao/moodle
2013-07-23 17:45:22 +02:00
Petr Škoda
c6f5e84f9d
MDL-40723 fix docs typo
2013-07-23 15:59:02 +02:00
Petr Škoda
54d5308ef0
MDL-40723 use guess_if_creator_will_have_course_capability() for the new weird function
2013-07-23 15:55:07 +02:00
Eloy Lafuente (stronk7)
aa837b2fe6
Merge branch 'wip-MDL-40762-m26' of git://github.com/samhemelryk/moodle
2013-07-23 13:50:06 +02:00
Dan Poltawski
80a1b08d40
Merge branch 'MDL-40480' of git://github.com/timhunt/moodle
2013-07-23 16:41:45 +08:00
Damyon Wiese
0b92270b19
Merge branch 'MDL-38863_master' of git://github.com/dmonllao/moodle
2013-07-23 16:04:50 +08:00
David Monllao
a090296740
MDL-40672 behat: New activities data generator
2013-07-23 09:47:36 +02:00
David Monllao
72ddc05f67
MDL-38863 behat: Role assign generator
2013-07-23 09:46:39 +02:00
Damyon Wiese
6064e5cc00
Merge branch 'MDL-32746-master' of git://github.com/FMCorz/moodle
2013-07-23 14:49:42 +08:00
Damyon Wiese
683bd5b15e
MDL-28019 tinymce managefiles: change tabs to spaces
2013-07-23 14:14:08 +08:00
Marina Glancy
9e88661e58
MDL-28019 Added plugin tinymce_managefiles
2013-07-23 14:12:55 +08:00
Marina Glancy
1d94557373
MDL-28019 Added plugin repository_areafiles
2013-07-23 14:12:45 +08:00
Frederic Massart
3b086e3094
MDL-32746 core: Implement new user_loggedin event
2013-07-23 11:36:35 +08:00
Dan Poltawski
35c1179047
Merge branch 'MDL-40793_profile_compare' of https://github.com/mr-russ/moodle
2013-07-23 10:42:02 +08:00
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
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
092a99ef08
Merge branch 'MDL-40799-m' of git://github.com/andrewnicols/moodle
2013-07-23 11:12:39 +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
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)
59af378baf
Merge branch 'w30_MDL-40795_m26_ajaxerrordisplay' of https://github.com/skodak/moodle
2013-07-22 18:56:40 +02: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
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
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
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
e9d412b3f8
MDL-40700 pagelib: cleaned up phpdocs
2013-07-22 10:41:17 +12: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
Andrew Nicols
7868699535
MDL-40678 JavaScript: Split out moodle-core-notification into submodules
2013-07-20 20:21:31 +01:00
Andrew Nicols
fbd3143412
MDL-40799 JavaScript: Correct tooltip dependency on cache-base
2013-07-20 16:20:44 +01:00
Petr Škoda
cb9ee2a953
MDL-40795 enable NO_DEBUG_DISPLAY in AJAX_SCRIPT by default
...
This should prevent some ajax problems in incorrectly configured production sites.
Note that developers need to learn to watch error logs all the time during development!
2013-07-20 14:23:03 +02:00
Petr Škoda
cb8108dd22
MDL-40545 convert js and theme resources to localcachedir
2013-07-20 14:10:25 +02:00
Petr Škoda
85b3806114
MDL-40545 add $CFG->localcachedir intended for local caching on cluster nodes
2013-07-20 14:10:25 +02:00
