mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
61,001 Commits 36 Branches 519 Tags
Commit Graph

3669 Commits

Author SHA1 Message Date
Sam Hemelryk
d25103c4ef Merge branch 'MDL-39422-master' of git://github.com/danpoltawski/moodle 
Conflicts:
	mod/wiki/mod_form.php
 2013-05-01 11:15:24 +12:00
Sam Hemelryk
eb426f2480 Merge branch 'wip-MDL-39099_master' of git://github.com/gjb2048/moodle 2013-05-01 11:05:05 +12:00
Eloy Lafuente (stronk7)
6a222aa127 Merge branch 'MDL-39232_master' of git://github.com/dmonllao/moodle 2013-05-01 00:47:32 +02:00
Dan Poltawski
4fb3df32ac MDL-39422 course: prevent module names longer 255 chars 
To prevent ugly DB errors.
 2013-04-30 17:21:15 +01:00
Gareth J Barnard
3f435f899d MDL-39099 course_format: Allow section_summary() to be overridden. 2013-04-30 16:56:55 +01:00
David Monllao
550d842e3c MDL-39232 behat Normalize feature tags according to component names 2013-04-30 11:54:47 +08:00
Damyon Wiese
50cc49ba04 Merge branch 'MDL-38440-master' of git://github.com/mouneyrac/moodle 2013-04-29 11:01:57 +08:00
Eloy Lafuente (stronk7)
e4a7816155 Merge branch 'MDL-38888-master' of git://github.com/mouneyrac/moodle 2013-04-26 10:48:38 +02:00
Jerome Mouneyrac
3fb83b41a5 MDL-38888 Publish forms display setType warning 2013-04-26 16:45:00 +08:00
Jerome Mouneyrac
487bc1b627 MDL-38440 WebService get_contents doesn't return the full text of labels 2013-04-26 15:13:03 +08:00
Dan Poltawski
75358cf3c5 Merge branch 'wip-MDL-39305-master' of git://github.com/marinaglancy/moodle 2013-04-25 14:53:18 +01:00
Dan Poltawski
0722742b63 Merge branch 'MDL-39329-master' of git://github.com/FMCorz/moodle 2013-04-25 10:09:52 +01:00
Dan Poltawski
088c2616ec Merge branch 'wip-MDL-39297-master' of git://github.com/marinaglancy/moodle 2013-04-24 11:47:08 +01:00
Frederic Massart
a96889ab51 MDL-39329 course: Strict standard warning during unpublishing 2013-04-24 11:47:08 +08:00
Marina Glancy
545b3930f8 MDL-39305 fixed display bugs in course listings 
- When category has a lot of subcategories and courses and user clicks 'view more' for categories, the courses are still displayed
- Course summary non-image files may appear above course summary image files, and they don't have an icon with the filetype
 2013-04-23 18:57:21 +10:00
Marina Glancy
28b93e2d5a MDL-39297 fixed mistype in tag name label 2013-04-23 12:45:22 +10:00
Frederic Massart
169a974df7 MDL-38415 course: Heavy redesign of the course settings form 2013-04-23 10:12:23 +08:00
Frederic Massart
aec15827b5 MDL-38415 course: Reformat edit form 
AMOS BEGIN
 MOV [availability_help,core],[visible_help,core]
 MOV [category_help,core],[coursecategory_help,core]
AMOS END
 2013-04-23 10:12:23 +08:00
Frederic Massart
1dcbdba62f MDL-38614 form: Reduce size of description field 2013-04-22 14:18:04 +08:00
Damyon Wiese
43d3124816 Merge branch 'MDL-31194-master' of git://github.com/mouneyrac/moodle 2013-04-19 15:15:10 +08:00
Sam Hemelryk
5ab262321c Merge branch 'MDL-39033-master' of git://github.com/sammarshallou/moodle 2013-04-19 14:02:35 +12:00
Jerome Mouneyrac
63c7be350b MDL-34434 Change the texts saying that we'll be removing web service deprecated functions from 2.5 2013-04-17 12:13:04 +08:00
Eloy Lafuente (stronk7)
9004d7a51c Merge branch 'wip-MDL-39145-m25' of git://github.com/marinaglancy/moodle 2013-04-17 01:27:39 +02:00
Dan Poltawski
bc02f33809 Merge branch 'wip-mdl-39116' of git://github.com/rajeshtaneja/moodle 2013-04-16 13:42:01 +01:00
Marina Glancy
0fd2635038 MDL-38592 Settings for courses lists on front page are made more user friendly 
- 'List of courses' is split into 'List of courses' (available) and 'Enrolled courses', CFG->disablemycourses is deprecated;
- CFG->frontpageloggedin by default shows list of available courses;
- There is separate item to display course search box
- CFG->maxcoursesincombo is deprecated
- CFG->maxcategorydepth changed default value to 2 since we have AJAX loading now
- FRONTPAGECOURSELIMIT is transformed to CFG->frontpagecourselimit

c
 2013-04-16 15:00:55 +10:00
Marina Glancy
b1c2fc65e4 MDL-39145 add text in upgrade.txt about functions deprecated in MDL-37085 2013-04-16 11:50:19 +10:00
Rajesh Taneja
0434840004 MDL-39116 Course: Pluginname strings will be set in M.str for all modules supporting Dnd 
Currently, if new activity/resource is created by DnD and M.str doesn't have pluginname string
it show wrong string, so loading pluginnames for all modules which support DnD
 2013-04-15 17:42:24 +08:00
sam marshall
4bab91bc53 MDL-39033 Conditional availability: Available items dimmed to students 2013-04-12 13:33:23 +01:00
Petr Škoda
0ddd65d9e0 MDL-38989 add missing test timeout reset 2013-04-10 09:49:19 +02:00
Dan Poltawski
33815b4b7e Merge branch 'wip-MDL-38682-master' of git://github.com/marinaglancy/moodle 2013-04-09 14:49:07 +08:00
Marina Glancy
5f79b34b5e MDL-38682 removed auto page type, created issue MDL-39045 to address this 2013-04-09 16:16:21 +10:00
Dan Poltawski
69203ea923 Merge branch 'wip-MDL-38682-master' of git://github.com/marinaglancy/moodle 2013-04-09 11:49:55 +08:00
Dan Poltawski
e26b02ddad Merge branch 'wip-MDL-38593-master' of git://github.com/marinaglancy/moodle 2013-04-09 11:46:27 +08:00
Marina Glancy
9dd85edf02 MDL-38682 Allow configuring blocks for courses lists pages 
Also fixed block configuration form error when pagetype string does not exist (for course- pages)
 2013-04-09 13:24:31 +10:00
Marina Glancy
cb52eeab28 MDL-38593 Argument 'id' renamed to 'categoryid' in course/manage.php 2013-04-09 12:55:50 +10:00
Marina Glancy
30142c1905 MDL-38593 Merge code from /course/category.php into /course/index.php 2013-04-09 12:21:05 +10:00
Damyon Wiese
c2bb7f6007 MDL-38907 Course: Remove unused CSS causing jump menu to be center aligned. 2013-04-08 16:45:44 +08:00
Damyon Wiese
6aa38ef89a Merge branch 'wip-MDL-38708-master' of git://github.com/marinaglancy/moodle 2013-04-05 09:19:09 +08:00
Eloy Lafuente (stronk7)
8f3885f23d Merge branch 'MDL-38886-master' of git://github.com/danpoltawski/moodle 2013-04-05 02:46:15 +02:00
Marina Glancy
97d5e39c49 MDL-38708 Changed test to be more accurate 2013-04-05 10:52:09 +11:00
Dan Poltawski
83e353fae9 MDL-38886 course: missing setType calls when adding a new category 2013-04-04 17:22:28 +08:00
Aparup Banerjee
37240ce5c6 Merge branch 'wip-MDL-38708-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	version.php
 2013-04-04 15:07:01 +08:00
David Monllao
b0f0995b09 MDL-38590 behat: Fixing broken behat test 2013-04-04 13:54:40 +08:00
Damyon Wiese
57bc1beb1b MDL-37009 Course - Fix typo in new lang string. 2013-04-04 11:24:13 +08:00
Damyon Wiese
200571507f Merge branch 'wip-MDL-37009-master' of git://github.com/marinaglancy/moodle 2013-04-04 11:22:20 +08:00
Eloy Lafuente (stronk7)
6b117438b9 Merge branch 'MDL-38482_master' of git://github.com/dmonllao/moodle 2013-04-03 16:48:42 +02:00
Damyon Wiese
7bf602d9d3 Merge branch 'MDL-26644-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
 2013-04-03 14:32:11 +08:00
David Monllao
1045bfecd1 MDL-38482 behat: New test 
According to MDLQA-1756 the maximum
number of weeks/topics for course can be
configured and not restricted to 52.
 2013-04-03 10:08:03 +08:00
David Monllao
df1ff55d7a MDL-38482 behat: Steps definitions for course management 
- To access the course management page
- To create a course based in a table
 2013-04-03 09:44:31 +08:00
Eloy Lafuente (stronk7)
d3f422bdc1 Merge branch 'MDL-38687_master' of git://github.com/dmonllao/moodle 2013-04-02 20:46:05 +02:00