Commit graph

3131 commits

Author SHA1 Message Date
Sam Hemelryk
398e6932b0 Merge branch 'MDL-32657-master-1' of git://git.luns.net.uk/moodle 2012-05-02 14:41:11 +12:00
Andrew Robert Nicols
19d041bf2b MDL-32681 Only add drag/drop icons if moveup/movedown icons are present 2012-05-01 09:52:46 +01:00
Juan Leyva
63a85dc7a3 MDL-13130 webservices: Implementation of core_course_delete_courses 2012-05-01 15:23:50 +08:00
Dan Poltawski
3869858d3e Merge branch 'MDL-30986-attempt2' of git://github.com/mouneyrac/moodle 2012-05-01 10:59:06 +08:00
Davo Smith
32528f94e4 MDL-22504 Drag and drop upload course - enables upload of files, text and urls to a course page 2012-04-30 09:53:25 +01:00
Jerome Mouneyrac
4615817d1c MDL-30986 external API, check and update DocBlock
Conflicts:

	group/externallib.php
2012-04-30 15:11:56 +08:00
Sam Hemelryk
6caa86747f Merge branch 'MDL-29044-master-3' of git://git.luns.net.uk/moodle 2012-04-30 12:50:38 +12:00
Sam Hemelryk
b5aa51419a Merge branch 'MDL-32238-master' of git://github.com/ankitagarwal/moodle 2012-04-30 12:03:01 +12:00
Dan Poltawski
1f43065d95 MDL-32673 ajax: remove legacy debugging info 2012-04-28 15:00:37 +08:00
Ruslan Kabalin
c77582fe42 MDL-32657: course dragdrop: define elements changes within the format
It allows to define M.course.format.swap_sections and
M.course.format.get_section_selector in the course format javascript file, so
that course dragdrop is aware about perculiar layout and changes that need to
be done when sections are swapped.
2012-04-27 15:01:02 +01:00
Andrew Robert Nicols
95ef704d7d MDL-31096 Handle addition/removal of mod-indent-huge to match non-ajax display 2012-04-26 11:02:39 +01:00
Andrew Robert Nicols
eac3ed52c7 MDL-31096 Add hiding of activity descriptions 2012-04-26 10:40:32 +01:00
Andrew Robert Nicols
9d40f585da Revert MDL-31215 Add the ability to change activity titles using AJAX calls
This *partially* reverts commit 6a14c4ffdd.

Note however parts of that commit were unrelated and haven't been
reverted.
2012-04-26 17:25:06 +08:00
Eloy Lafuente (stronk7)
ee5855687e Merge branch 'MDL-31052-js-rewrite' of git://github.com/danpoltawski/moodle 2012-04-26 03:32:08 +02:00
Andrew Robert Nicols
ede323e2b3 MDL-31914 Ensure that completion criteria are deleted when removing a course module
Conflicts:

	lib/db/upgrade.php
	version.php
2012-04-24 12:25:53 +02:00
Andrew Robert Nicols
b1a8aa73b5 MDL-29044: Move course category creation to a separate function 2012-04-24 10:57:12 +01:00
Ruslan Kabalin
ff92b71140 MDL-31720 Refactor course/rest.php
This removes duplicates and block actions remains. It also makes it
possible to include course/rest.php in such a way that it could be extended
by non-core modules wishing to overide parts of its functionality (e.g.
mod_subpage)
2012-04-24 13:25:49 +08:00
Andrew Robert Nicols
6a14c4ffdd MDL-31215 Add the ability to change activity titles using AJAX calls 2012-04-24 13:25:49 +08:00
Ruslan Kabalin
5683815612 MDL-31263 Rewrite block drag/drop using YUI3 2012-04-24 13:25:43 +08:00
Ankit Agarwal
7ca52615d1 MDL-32238 course: Timemodifed should be updated when a course's visible status is toggled from the category page 2012-04-24 10:08:23 +08:00
Ruslan Kabalin
15e2552f00 MDL-31216 Create dragdrop course module 2012-04-23 21:28:39 +01:00
Andrew Robert Nicols
ebaa29d107 MDL-31096 Convert course resource/section javascript to YUI3 Module
AMOS BEGIN
  MOV [hideweekfromothers,moodle],[hidefromothers,format_week]
  MOV [showweekfromothers,moodle],[showfromothers,format_week]
  MOV [hidetopicfromothers,moodle],[hidefromothers,format_topics]
  MOV [showtopicfromothers,moodle],[showfromothers,format_topics]
AMOS END
2012-04-23 21:28:39 +01:00
Andrew Robert Nicols
cd6081f558 MDL-31096 Create generic coursemodule javascript library
This library handles registration and invocation of calls for other
libraries. It allows us to register javascript modules containing functions
which may called dynamically later on, for example when adding a resource
or section dynamically
2012-04-23 21:18:17 +01:00
Dan Poltawski
e7e0f8d27f Merge branch 'MDL-32215-master' of git://github.com/sammarshallou/moodle
Conflicts:
	course/simpletest/testcourselib.php
    lib/db/upgrade.php
	version.php
2012-04-23 12:20:57 +08:00
Dan Poltawski
bebf083159 Merge branch 'w17_MDL-31607_m23_login' of git://github.com/skodak/moodle 2012-04-23 11:47:11 +08:00
Petr Skoda
cdbea7eed1 MDL-31607 use full course object for require_login() if already available
This eliminates 1 db query.
2012-04-22 17:41:47 +02:00
Petr Skoda
f59f03ad2d MDL-32569 drop more core simpletests that were already migrated 2012-04-21 16:27:30 +02:00
sam marshall
cf76b3353c MDL-32215 Course: Ensure section entries are unique on course, section 2012-04-19 15:16:56 +01:00
Sam Hemelryk
3211569a6a Revert "MDL-30843 and MDL-30842 - accessibility compliance: Add <label> for form input text and select tag"
This reverts commit f9f281b8fe.
2012-04-11 17:18:58 +12:00
Sam Hemelryk
5bfeb5ffd3 Merge branch 'MDL-30843_b' of git://github.com/rwijaya/moodle 2012-04-10 12:34:37 +12:00
Petr Skoda
354b214c9f MDL-32149 courselib tests and support for generation of course sections 2012-04-03 22:30:57 +02:00
Petr Skoda
c9c2027332 MDL-32251 E_STRICT fix 2012-04-01 15:22:42 +02:00
Petr Skoda
54352ac979 MDL-32251 more E_STRICT fixes 2012-03-30 19:02:58 +02:00
Rossiani Wijaya
f9f281b8fe MDL-30843 and MDL-30842 - accessibility compliance: Add <label> for form input text and select tag 2012-03-30 16:26:58 +08:00
Dan Poltawski
a4051353d1 Revert "Merge branch 'MDL-31914-master-4' of git://git.luns.net.uk/moodle"
This reverts commit 296c0247c6, reversing
changes made to 2511b0742a.

Conflicts:

	lib/db/upgrade.php
	version.php
2012-03-29 16:07:30 +08:00
Eloy Lafuente (stronk7)
296c0247c6 Merge branch 'MDL-31914-master-4' of git://git.luns.net.uk/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2012-03-27 10:10:17 +02:00
Sam Hemelryk
7a3a0a301b MDL-31528 categories: Fixed up typo 2012-03-22 09:45:56 +13:00
Sam Hemelryk
f520dcd9ba MDL-31640 course search: Coding style clean up 2012-03-21 09:49:38 +13:00
Sam Hemelryk
1a381535e6 Merge branch 'wip-mdl-31640-new' of git://github.com/rajeshtaneja/moodle 2012-03-21 09:41:32 +13:00
Sam Hemelryk
ef844d0a15 Merge branch 'w12_MDL-32094_m23_phpstrict' of git://github.com/skodak/moodle 2012-03-20 16:47:17 +13:00
Aparup Banerjee
b36135b66a Merge branch 'wip-MDL-31528-m23' of git://github.com/samhemelryk/moodle 2012-03-20 10:09:43 +08:00
Sam Hemelryk
f40400b91e Merge branch 'w12_MDL-32045_m23_resetnorole' of git://github.com/skodak/moodle 2012-03-20 12:06:07 +13:00
Rajesh Taneja
fdfe706489 MDL-31640 course: removed extra error message, perpage is set properly, modulelink hidden field, and new context call is used. 2012-03-19 15:15:06 +08:00
Sam Hemelryk
96e7855298 MDL-31528 navigation: Fixed up missing break and optimised category.php 2012-03-19 19:32:15 +13:00
Rajesh Taneja
506cbfd749 MDL-31640 course: Move to, edit and search functionality in search.php is fixed with proper permission check 2012-03-19 12:02:02 +08:00
Sam Hemelryk
1a8ea682ef Merge branch 'MDL-32004-master-2' of git://git.luns.net.uk/moodle 2012-03-19 14:37:49 +13:00
Petr Skoda
f20edd5208 MDL-32094 fix various E_STRICT compatibility problems 2012-03-18 18:37:24 +01:00
Andrew Robert Nicols
cac06a034d MDL-31914 Ensure that completion criteria are deleted when removing a course module 2012-03-16 16:07:05 +00:00
Petr Skoda
2e15b12b81 MDL-32045 allow unenrolment of users without role via course reset 2012-03-16 10:55:30 +01:00
Sam Hemelryk
e141bc8109 MDL-31528 navigation: Replaced calls to deprecated context_instance_preload 2012-03-16 10:36:00 +13:00