667 Commits

Author SHA1 Message Date
Dan Poltawski
a56dc90320 Merge branch 'MDL-33766-master' of git://github.com/FMCorz/moodle
Conflicts:
	version.php
2012-11-08 18:10:26 +08:00
Dan Poltawski
8f3020558d Merge branch 'wip-MDL-33017-m24-r2' of git://github.com/samhemelryk/moodle 2012-11-07 14:17:11 +08:00
Dan Poltawski
918085d048 Revert "MDL-35260 Course formats may have settings, be enabled, disabled and uninstalled"
This reverts commit 45f93db912a17b778aca4b9ced16de79ff18abaa.
This reverts commit 3f798d4a3d11416c4c71df2038c1ec9422898e5e.
2012-11-05 15:20:22 +08:00
Marina Glancy
45f93db912 MDL-35260 Course formats may have settings, be enabled, disabled and uninstalled 2012-11-05 11:46:34 +08:00
Andrew Robert Nicols
6caf3f5c74 MDL-33017 Show Currently viewed course in new node 2012-11-02 16:34:46 +13:00
Marina Glancy
fc79ede5a1 MDL-35768 Added format-specific options to edit course and section forms
- Course format may define additional fields (format options) to store for course and each section
- Edit course form allows to edit format-specific options and refreshes their list on format change
- Course format may provide it's own form for editing a section
- Default form for editing section allows to edit all format-specific fields
- Class section_info refactored, it defines magic methods such as __get() to access basic section
  information and format-specific options (retrieved only on the first request)
- format_base::update_course_format_options() allows to watch pre-update state of the course,
  format_legacy automatically copies the options with the same names between formats
2012-11-02 10:55:23 +08:00
Frederic Massart
21e3ea77a3 MDL-33766 files: Support for userquota/size limit in draft areas 2012-11-01 16:46:42 +08:00
Petr Škoda
8e941204b2 MDL-35843 prepare fox expiry refactoring to core enrol feature
AMOS BEGIN
  MOV [errorthresholdlow,enrol_manual],[errorthresholdlow,core_enrol]
  MOV [expirynotify,enrol_manual],[expirynotify,core_enrol]
  MOV [expirynotify_help,enrol_manual],[expirynotify_help,core_enrol]
  MOV [expirynotifyall,enrol_manual],[expirynotifyall,core_enrol]
  MOV [expirynotifyteacher,enrol_manual],[expirynotifyenroller,core_enrol]
  MOV [notifyhour,enrol_manual],[expirynotifyhour,core_enrol]
  MOV [expirythreshold,enrol_manual],[expirythreshold,core_enrol]
  MOV [expirythreshold_help,enrol_manual],[expirythreshold_help,core_enrol]
AMOS END
2012-10-19 16:03:40 +08:00
Frederic Massart
4c897a815c MDL-32294 course: Add resource/activity dropdown have labels 2012-10-15 09:46:02 +08:00
David Monllao
d11f12f646 MDL-30901 user Removing user->screenreader setting 2012-09-21 09:23:32 +08:00
Sam Hemelryk
35cd9f1f83 Merge branch 'MDL-10259_master' of git://github.com/dmonllao/moodle 2012-09-11 15:19:16 +12:00
David Monllao
98795fd1a6 MDL-10259 core Adding a search courses box if there are too many courses 2012-09-07 11:28:29 +08:00
Ankit Agarwal
607fdfc344 MDL-33374 profile: Use correct text for buttons when creating a new user 2012-09-07 10:19:48 +08:00
Frederic Massart
05e521c9bc MDL-28346 Backup: Added new status 'warning' for backup result 2012-09-03 14:13:11 +08:00
Petr Škoda
38257347ed MDL-34853 add new admin setting for duration (time in seconds) 2012-08-22 03:00:11 +02:00
Tim Hunt
157583b862 MDL-34704 couse, accesslib: improve $CFG->courselistshortnames
1. get_context_name should respect the $CFG->courselistshortnames
setting.

2. When $CFG->courselistshortnames is on, what to display should use a
language string, rather than string concatenation. This makes it
possible for people to configure the display. For example, they might
want 'My first course [M101]' instead of 'M101 My first course'.
2012-08-03 13:01:05 +01:00
Aparup Banerjee
e462de973f MDL-34650 added MDLs to todo comment and deprecation comment.
(also triggering an amos script here for the other MDL-34650 commit)

AMOS BEGIN
  CPY [minute,form],[minute,core]
  CPY [month,form],[month,core]
  CPY [options,editor],[options,core]
  CPY [selectacourse,backup],[selectacourse,core]
AMOS END
2012-07-31 15:30:38 +08:00
Rossiani Wijaya
ecc5cc31ae MDL-34650 - accessibility compliance: Add <label> for form input text and select tag 2012-07-31 12:07:16 +08:00
Sam Hemelryk
c6c16fd9ea Merge branch 'MDL-32286' of git://github.com/danpoltawski/moodle 2012-07-03 10:41:17 +12:00
Dan Poltawski
b4284d4895 MDL-34022 lang - the html editor supports all browsers we support
So remove misleading 'some browers only'
2012-06-26 11:03:54 +08:00
Sam Hemelryk
a9efc8ddb8 Merge branch 'MDL-32908' of git://github.com/danpoltawski/moodle 2012-06-20 10:31:52 +12:00
Dan Poltawski
a80b5a0cf0 MDL-32908 - drop $USER->ajax
Its not been respected for some time and is just confusing
2012-06-19 15:07:18 +08:00
Dan Poltawski
6855fec7fd Merge branch 'MDL-33136_dndfilemanager_replace_file' of git://github.com/davosmith/moodle 2012-06-18 17:36:03 +08:00
Davo Smith
d0b2d44528 MDL-33136 Dndupload filemanager - user asked to rename/overwrite file when droping file with existing name 2012-06-18 08:55:41 +01:00
Dan Poltawski
c851b734a8 MDL-32286 - fix ambigious english string 2012-06-16 23:23:16 +08:00
Frederic Massart
76055f5de4 MDL-33442 Course: actions bring you back where you came from 2012-06-14 17:07:57 +08:00
Frederic Massart
322945e9ca MDL-33184 Filepicker: rephrased drag and drop sentence 2012-05-30 10:05:10 +08:00
Dan Poltawski
2b4f1cbc32 Merge branch 'wip-files23' of git://github.com/marinaglancy/moodle 2012-05-21 18:19:32 +08:00
Dan Poltawski
5c50d45b79 Merge branch 'MDL-22504_drag_and_drop_upload_integration' of git://github.com/davosmith/moodle 2012-05-21 17:22:13 +08:00
Davo Smith
f684250bda MDL-22504 Course drag and drop upload - removed browser specific content hacks, made 'text and link' dragging an experimental feature 2012-05-21 08:34:50 +01:00
Marina Glancy
e709ddd29c MDL-31901: Allow FileManager to re-use FilePicker JS code for view modes:
- when loading core_filepicker we extend the Node element with functions necessary to display files list in different view modes;
- repository/filepicker.js is changed to use those functions;
- FileManager now has three different view modes (icon view, tree view and table view), JS code is re-used from FilePicker;
- files in FileManager no longer have context menu, they have one popup Widget with different actions instead;
- Added more templates for JS code to FileManager, use similar CSS class names as FilePicker;
- lib/filelib.php : fixed double slashes in path, return more data about files;
- lib/form/filemanager.php : pass information to FileManager about available licenses and default author;
- repository/draftfiles_ajax.php : return information about directory tree for file moving UI in FileManager, return formatted information;
- repository/lib.php : function repository::prepare_listing() now can work also with draftarea files listing;
2012-05-21 11:57:52 +08:00
Andrew Robert Nicols
af75421c54 MDL-30617 Adjustments to styling of module chooser
These changes fix several points and suggested changes:
* increase the size of the help popup to 800x600
* fix issues with centering of the dialogue
* swap next/cancel buttons
* convert next button to use string for 'Add'
* convert add text to 'Add an activity or resource'
2012-05-18 10:10:20 +01:00
Dan Poltawski
1edff8c7ed MDL-30617 lang: improve mod chooser strings 2012-05-18 12:46:13 +08: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
Davo Smith
b64300fc42 MDL-22504 Improved drag and drop status message, fixed text dragged from firefox, fix icon 2012-05-17 13:59:54 +01: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
Davo Smith
33b24bdd99 MDL-22504 Course drag and drop upload - moved file locations 2012-05-16 08:25:22 +01:00
Aparup Banerjee
e7ebfb8058 Merge branch 'MDL-32005-master-10' of git://git.luns.net.uk/moodle
- fixed up comments (was phpdoc blocks)
2012-05-16 10:39:48 +08: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
Aparup Banerjee
154128a50f Merge branch 'wip-mdl-32770' of git://github.com/rajeshtaneja/moodle 2012-05-15 16:41:54 +08:00
Andrew Robert Nicols
74b714df7e MDL-32005 Add idnumber field to groups and groupings 2012-05-15 09:38:51 +01: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
Rajesh Taneja
36be7e1453 MDL-32770 course: fixed section title and footer 2012-05-10 16:23:17 +08:00
Dan Poltawski
1abf12532d MDL-32508 course: Add basic 'add a section' button at the bottom of the course page
With thanks to LUNS who provided this code from when I did it working
there.
2012-05-04 10:53:01 +08:00
Dan Poltawski
3fe600aacf MDL-32505 course formats: zooming feature be gone! 2012-05-04 10:52:57 +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
3a35a9ff8b MDL-32771 - course: add ability to increase/reduce number of sections
* addsection.php is renamed to changenumsections.php to reflect new purpose
* The add button is changed to a +- toggle rahter than big 'add section'
2012-05-08 15:00:46 +08:00
Andrew Robert Nicols
9d40f585da Revert MDL-31215 Add the ability to change activity titles using AJAX calls
This *partially* reverts commit 6a14c4ffdd01d6b2069e8c27bb2b7df26dcdbd6a.

Note however parts of that commit were unrelated and haven't been
reverted.
2012-04-26 17:25:06 +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