Commit graph

913 commits

Author SHA1 Message Date
Dan Poltawski
0ed8a933d6 Merge branch 'MDL-33212-master' of git://github.com/sammarshallou/moodle 2012-05-29 15:08:46 +08:00
sam marshall
540f89d7d4 MDL-33212 Course page: Eye icon should override other conditions 2012-05-28 16:17:39 +01:00
Dan Poltawski
6bea694b6c Revert "MDL-33212 Course page: Eye icon should override other conditions"
This reverts commit 5d0d373733.
2012-05-28 16:57:41 +08:00
Dan Poltawski
da5cd8cee8 Merge branch 'MDL-33212-master' of git://github.com/sammarshallou/moodle 2012-05-28 16:03:03 +08:00
Rajesh Taneja
33fcc04082 MDL-33347 course: section move is visible without ajax 2012-05-28 09:59:48 +08:00
Dan Poltawski
5744ea3682 Revert "MDL-33063 course: Reuse get_all_sections()"
This reverts commit 66b494771f.
2012-05-24 20:42:58 +08:00
Dan Poltawski
108526897d Merge branch 'MDL-33063' of git://github.com/srynot4sale/moodle 2012-05-24 20:32:31 +08:00
sam marshall
5d0d373733 MDL-33212 Course page: Eye icon should override other conditions 2012-05-23 13:46:51 +01:00
Marina Glancy
559276b153 MDL-32247,MDL-32831,MDL-32900 Use correct url building of file type icons
- function get_mimetypes_array() now contains also information about filetype groups and language strings
- use 'smart' human-readable mimetype description
- never determine filetype group based on filetype icon image! remove function mimeinfo_from_icon()
- get rid of class filetype_parser and file lib/filestorage/file_types.mm, replaced with functions file_get_typegroup(), file_extension_in_typegroup() and file_mimetype_in_typegroup()
- support multiple icon sizes, not only 16 and 32
- retrieve filetype icon only using proper functions file_..._icon() from lib/filelib.php throughout the code
- increase size of repository thumbnails to 90 and icons to 24 (will take effect when new icons exist)
2012-05-21 16:01:04 +08:00
Eloy Lafuente (stronk7)
754c2deab6 Merge branch 'MDL-32941' of git://github.com/mouneyrac/moodle
Conflicts:
	course/externallib.php
	lib/db/services.php
	version.php
2012-05-17 22:35:57 +02:00
Dan Poltawski
46e046b7b3 MDL-30617 modchoser: minor tweaks
* Change markup way from 'activity module style' to its own markup
* Remove 'a new' from the 'add an activity' string
* Remove the 'personalisation' from the nohelp lang string
2012-05-18 00:27:42 +08:00
Andrew Robert Nicols
01e0e7044a MDL-30617 Add a javascript interface for adding modules to a course
This interface allows for additional metadata, such as the module's help
and icon, to be displayed.
2012-05-18 00:27:16 +08:00
Dan Poltawski
6e0d176934 Merge branch 'MDL-24419-master' of git://github.com/sammarshallou/moodle 2012-05-17 20:45:37 +08:00
sam marshall
52f1406101 MDL-24419 Fix bug with section creation for new courses 2012-05-17 13:37:33 +01:00
Aaron Barnes
66b494771f MDL-33063 course: Reuse get_all_sections() 2012-05-17 15:40:03 +12:00
Dan Poltawski
12ba24a8f8 Merge branch 'MDL-24419' of git://github.com/stronk7/moodle 2012-05-17 11:19:02 +08:00
Fábio Souto
2f951d866a MDL-32941 Added service definition and implementation for core_course_delete_categories()
Included is a bug correction to categories_delete_move() which does not
respect showfeedback parameter, printing feedback even when not wanted
(this breaks the webservice output)

Conflicts:

	admin/webservice/testclient_forms.php
	lib/db/services.php
2012-05-17 10:34:03 +08:00
Sam Hemelryk
7b06151288 Merge branch 'MDL-22504_drag_and_drop_upload_final' of https://github.com/davosmith/moodle
Conflicts:
	course/lib.php
	theme/base/style/course.css
2012-05-17 10:55:35 +12:00
Sam Hemelryk
fbb4c959b5 MDL-32881 Prevent course/view.php from being cached
This should prevent browser caching which will ensure that changes made
using the course javascript (e.g. drag/drop, show/hide) will not be 'lost'
by using the browser back button.

This reverts commit 3aaa184399.
2012-05-17 10:12:29 +12:00
Eloy Lafuente (stronk7)
dd420abadf Merge branch 'MDL-24419-master' of git://github.com/sammarshallou/moodle
Conflicts:
	lib/db/upgrade.php
	lib/phpunit/lib.php
	version.php

Fixed:
    lib/db/upgrade.php - duplicate course->sectioncache add code
    lib/db/install.xml - cleanup needed because xmldb editor was not used
    lib/phpunit/classes/util.php - cleanup $GROUPLIB_CACHE on test reset
2012-05-16 23:53:47 +02:00
Davo Smith
33b24bdd99 MDL-22504 Course drag and drop upload - moved file locations 2012-05-16 08:25:22 +01:00
Sam Hemelryk
ba94f1d503 Merge branch 'MDL-32889-master' of https://github.com/mackensen/moodle 2012-05-16 13:09:32 +12:00
Sam Hemelryk
a5bf3c520f Merge branch 'MDL-31215-master-11' of git://git.luns.net.uk/moodle
Conflicts:
	course/lib.php
2012-05-16 09:59:45 +12:00
Andrew Robert Nicols
7a9a07d24a MDL-31215 Add the ability to change activity titles using AJAX calls 2012-05-14 14:22:02 +01:00
sam marshall
ce4dfd2703 MDL-24419 (4): Add conditional availability support to sections; section cache
Credit: original version done by Kirill Astashov of NetSpot (netspot.com.au),
finished and tweaked by sam.

This change adds conditional availability support for sections analagous to
that already available for activities. (Backend, UI, backup/restore.)

In order that this feature does not reduce performance, section cacheing has
also been added using a new course 'sectioncache' field analagous to modinfo.

The new feature integrates with activity availability so that activities
inside sections which are not available are automatically not available
themselves (meaning it works to restrict access).
2012-05-14 11:19:25 +01:00
sam marshall
ae3fbf7b06 MDL-24419 (2): Moved groupings cache to get_all_groupings function
There was a static cache inside course/lib.php. I need to access this
information in other places, so to avoid making two queries, I am
moving the cache into the groups_get_all_groupings function instead.
2012-05-14 11:15:15 +01:00
Davo Smith
5103b5e667 MDL-22504 Course drag and drop upload - now correctly ignores disabled modules and allows upload to orphaned sections 2012-05-14 09:48:04 +01:00
Dan Poltawski
950632673b Merge branch 'MDL-32875-master-1' of git://git.luns.net.uk/moodle 2012-05-14 13:08:40 +08:00
Sam Hemelryk
924c34df8c MDL-32873 course: Fixed up unused global + phpdocs 2012-05-14 13:41:15 +12:00
Sam Hemelryk
1c0441bd6a Merge branch 'MDL-32873-master-1' of git://git.luns.net.uk/moodle
Conflicts:
	course/lib.php
2012-05-14 13:39:55 +12:00
Sam Hemelryk
8ec7c2cfd9 Merge branch 'MDL-32881-master-2' of git://git.luns.net.uk/moodle 2012-05-14 13:30:16 +12:00
Andrew Robert Nicols
3aaa184399 MDL-32881 Prevent course/view.php from being cached
This should prevent browser caching which will ensure that changes made
using the course javascript (e.g. drag/drop, show/hide) will not be 'lost'
by using the browser back button.
2012-05-10 11:38:42 +01:00
Andrew Robert Nicols
314eae407f MDL-32873 Separate out course ajax enabled detection into new function 2012-05-10 09:34:27 +01:00
Charles Fulton
66969d5004 MDL-32889 lib: escape filename in Content-Disposition header 2012-05-09 16:03:33 -04:00
Andrew Robert Nicols
5720019d91 MDL-32873 Separate out course ajax enabled detection into new function 2012-05-09 16:19:01 +01:00
Ruslan Kabalin
e7b6e6b9f7 MDL-32875: Fix highlighted section drag-drop issue 2012-05-09 11:25:08 +01:00
Dan Poltawski
143d743743 MDL-32508 course: make_editting_buttons now takes optionally returns to section 2012-05-04 10:53:00 +08:00
Dan Poltawski
5218b9bb7d MDL-32508 course: Introduce course_get_url() 2012-05-04 10:52:58 +08:00
Dan Poltawski
b9bcdb54da MDL-32505 course: drop course_display table and settings 2012-05-04 10:52:56 +08:00
Dan Poltawski
1156d38d94 MDL-32504 course: Add coursedisplay setting to course table
This will replace the course_display database table
2012-05-04 10:49:52 +08:00
Dan Poltawski
7aaed66901 MDL-32509 course: remove enablecourseajax setting
We just have the single enableajax setting
2012-05-05 10:56:06 +08:00
Sam Hemelryk
398e6932b0 Merge branch 'MDL-32657-master-1' of git://git.luns.net.uk/moodle 2012-05-02 14:41:11 +12: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
Sam Hemelryk
6caa86747f Merge branch 'MDL-29044-master-3' of git://git.luns.net.uk/moodle 2012-04-30 12:50:38 +12: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
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
Andrew Robert Nicols
6a14c4ffdd MDL-31215 Add the ability to change activity titles using AJAX calls 2012-04-24 13:25:49 +08:00