Damyon Wiese
35f155519e
Merge branch 'w13_MDL-38654_m25_gdversion' of git://github.com/skodak/moodle
...
Conflicts:
lang/en/admin.php
2013-03-25 14:02:31 +08:00
Damyon Wiese
2e0b17051c
Merge branch 'w13_MDL-15727_m25_jquery' of git://github.com/skodak/moodle
2013-03-25 12:27:32 +08:00
Damyon Wiese
e909c7c390
Merge branch 'MDL-38044-master' of git://github.com/FMCorz/moodle
2013-03-25 11:30:36 +08:00
Damyon Wiese
716f35954e
Merge branch 'wip-MDL-34917_master' of git://github.com/gjb2048/moodle
2013-03-25 11:15:03 +08:00
Damyon Wiese
27a1d25f05
MDL-31681: Formatting changes to fix indentation
...
Also removed/refactored some confusing use of references.
2013-03-25 10:37:14 +08:00
Damyon Wiese
adfcc976f6
Merge branch 'MDL-31681' of https://github.com/Lightwork-Marking/moodle
2013-03-25 10:15:38 +08:00
Damyon Wiese
81409525b9
MDL-37033 Environment - Fix indenting in XML
2013-03-25 09:20:53 +08:00
Damyon Wiese
3bdb3e1605
Merge branch 'MDL-37033' of git://github.com/stronk7/moodle
2013-03-25 09:13:50 +08:00
Eloy Lafuente (stronk7)
5214f9ef96
Merge branch 'MDL-38658-m' of git://github.com/andrewnicols/moodle
2013-03-24 23:40:50 +01:00
Eloy Lafuente (stronk7)
943e317cb4
Merge branch 'MDL-36927-master' of git://github.com/ankitagarwal/moodle
2013-03-24 23:39:07 +01:00
Eloy Lafuente (stronk7)
22ddcdef89
Merge branch 'w13_MDL-38581_m25_forumtests' of git://github.com/skodak/moodle
2013-03-24 23:26:55 +01:00
Petr Škoda
c7289da7eb
MDL-38654 add full $CFG->gdversion backwards compatibility for now
2013-03-24 22:18:49 +01:00
Paul Charsley
3f0ea6d8a7
MDL-31681 added core_grade_get_definitions web service function
2013-03-25 08:38:05 +13:00
Gareth J Barnard
d46e26f682
MDL-34917 course: Jump to section navigation for 'One section per page'.
2013-03-23 17:01:32 +00:00
Andrew Robert Nicols
3f53437109
MDL-38658 JavaScript: Correct fullpath for dndupload definition
2013-03-22 17:29:56 +00:00
Petr Škoda
689096bc26
MDL-38654 do not test $CFG->gdversion
...
GD PHP extension is now required. Add-ons need to remove $CFG->gdversion tests. The worst case regression is that add-on will think GD is not available.
2013-03-22 16:57:55 +01:00
Eloy Lafuente (stronk7)
40b5cb2d71
MDL-37033 environment: add 2.5 brach details
2013-03-22 16:41:15 +01:00
Petr Škoda
c3f31a3ded
MDL-38581 move forum discussion and post generators to proper place
2013-03-22 13:21:35 +01:00
Petr Škoda
63c88397f5
MDL-15727 basic jQuery support
...
See http://docs.moodle.org/dev/jQuery for more details.
2013-03-22 13:09:50 +01:00
Frederic Massart
f2c0aba81d
MDL-38044 form: Added collapse/expand all buttons
2013-03-22 16:25:48 +08:00
Damyon Wiese
373a8e052c
weekly release 2.5dev
2013-03-22 13:38:50 +08:00
Damyon Wiese
39b041eca1
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
2013-03-22 13:35:24 +08:00
David Monllao
371b7fc397
MDL-38414_master behat: Changing expand fieldsets test to forum form
2013-03-21 10:42:24 +08:00
AMOS bot
ba6e8f02f0
Automatically generated installer lang files
2013-03-21 00:37:26 +00:00
Eloy Lafuente (stronk7)
fedcc83016
Merge branch 'MDL-38035-master' of git://github.com/sammarshallou/moodle
2013-03-20 17:06:22 +01:00
sam marshall
acfee0d4ba
MDL-38035 Conditional availability: Support multilang custom user fields
2013-03-20 15:57:53 +00:00
David Monllao
25919739fd
MDL-38364 phpunit: PHPUnit autoload uses capital A
2013-03-20 16:02:40 +08:00
Ankit Agarwal
909b8671e8
MDL-36927 Reports: Page layout is not defined in course/recent.php
2013-03-20 14:11:09 +08:00
Damyon Wiese
c2eb74df47
Merge branch 'MDL-34401-muc-pluginlib' of git://github.com/mudrd8mz/moodle
...
Conflicts:
lib/db/caches.php
version.php
2013-03-20 14:08:55 +08:00
Damyon Wiese
f50867c424
Merge branch 'wip-MDL-38387-m25' of https://github.com/samhemelryk/moodle
2013-03-20 13:24:18 +08:00
Damyon Wiese
d7cea24b55
MDL-38373 Auth - Additional strict warning fix for radius authentication
2013-03-20 12:32:29 +08:00
Sam Hemelryk
7b9cb736ba
MDL-38387 cache: removed call to plugins API from cache API
2013-03-20 16:07:25 +13:00
Sam Hemelryk
a3b63be703
MDL-38350 cache: fixed issue with siteidentifier === false
2013-03-20 16:07:25 +13:00
Sam Hemelryk
fe86ebfa4d
MDL-38387 cache: fixed inifinite initialisation loop with site id
2013-03-20 16:07:25 +13:00
Damyon Wiese
80d852fa23
Merge branch 'MDL-38373' of git://github.com/stronk7/moodle
2013-03-20 11:05:38 +08:00
Eloy Lafuente (stronk7)
cfe6a96f0a
Merge branch 'MDL-38470-m' of https://github.com/andrewnicols/moodle
2013-03-20 01:47:52 +01:00
Andrew Robert Nicols
c5952e06f1
MDL-38470 JavaScript: Rebuild moodle-core-tooltip with Shifter
2013-03-20 00:46:33 +00:00
Eloy Lafuente (stronk7)
99b3e4e7bd
Merge branch 'MDL-38414-master' of git://github.com/FMCorz/moodle
2013-03-20 01:21:05 +01:00
Eloy Lafuente (stronk7)
dc1abf2bc4
Merge branch 'MDL-38330-master' of git://github.com/FMCorz/moodle
2013-03-20 01:19:17 +01:00
Eloy Lafuente (stronk7)
e6f94aaa11
MDL-38515 JavaScript: Partially revert 4f65d03b08
...
It was going to cause some continuous logging in the console
annoying developers on 2.5 all the time. It may be reintroduced
once filepickers are converted to proper YUI modules.
2013-03-20 01:02:45 +01:00
Eloy Lafuente (stronk7)
b2b54ad7fe
Revert "MDL-38515 JavaScript: Correct module dependencies for core_filepicker"
...
This reverts commit babf34d5cf
2013-03-20 00:55:32 +01:00
Eloy Lafuente (stronk7)
8b994ec0b9
Merge branch 'MDL-38490' of git://github.com/timhunt/moodle
2013-03-20 00:43:09 +01:00
Eloy Lafuente (stronk7)
e233dc58ed
Merge branch 'MDL-38416-master' of git://github.com/FMCorz/moodle
2013-03-20 00:34:52 +01:00
Eloy Lafuente (stronk7)
b35dd05521
Merge branch 'MDL-38370-master' of git://github.com/ankitagarwal/moodle
2013-03-20 00:30:49 +01:00
Eloy Lafuente (stronk7)
6a32219c84
Merge branch 'w12_MDL-38364_m25_phpunitloading' of git://github.com/skodak/moodle
2013-03-20 00:17:35 +01:00
Eloy Lafuente (stronk7)
044566f001
Merge branch 'MDL-38166-m' of git://github.com/andrewnicols/moodle
2013-03-20 00:13:51 +01:00
Eloy Lafuente (stronk7)
87b6981e25
MDL-38035 api: doc get_condition_user_fields() new param.
2013-03-20 00:09:43 +01:00
Eloy Lafuente (stronk7)
1d962a1984
Merge branch 'MDL-38035-master' of git://github.com/sammarshallou/moodle
2013-03-19 23:54:27 +01:00
Eloy Lafuente (stronk7)
354ec0691b
Merge branch 'MDL-37664-master' of https://github.com/lucisgit/moodle
2013-03-19 23:31:21 +01:00
Eloy Lafuente (stronk7)
e73ac7692e
Merge branch 'MDL-38433_master' of git://github.com/dmonllao/moodle
2013-03-19 23:27:50 +01:00
