Commit graph

67589 commits

Author SHA1 Message Date
Marina Glancy
0cbc523621 Merge branch 'w14_MDL-44733_m27_taskdisabled' of git://github.com/skodak/moodle 2014-03-31 16:36:27 +08:00
Marina Glancy
de19c44c82 Merge branch 'MDL-44808-master' of git://github.com/FMCorz/moodle 2014-03-31 16:36:12 +08:00
Damyon Wiese
ffb8aff65c MDL-44000 Atto: Add option to constrain image size
(Keep aspect ratio)

Also some small improvements to the edit image dialogue.
2014-03-31 16:28:57 +08:00
Marina Glancy
b13f4e8e7c Merge branch 'MDL-44764-master' of git://github.com/FMCorz/moodle 2014-03-31 15:55:29 +08:00
Petr Škoda
246230715e MDL-44733 add disabled class rows with disabled scheduled tasks 2014-03-31 15:48:19 +08:00
Damyon Wiese
5081de00d7 MDL-44748 Atto: Make it the default on upgrade. 2014-03-31 15:47:32 +08:00
Damyon Wiese
c70de965aa MDL-44583 Assign: performance fixes 2014-03-31 12:53:02 +08:00
Marina Glancy
7e1288f847 Merge branch 'MDL-44822' of git://github.com/aolley/moodle 2014-03-31 12:46:21 +08:00
Frederic Massart
8e608fff83 MDL-44784 atto: Show settings link on plugins list 2014-03-31 12:44:16 +08:00
Frederic Massart
36beb828de MDL-44757 atto_equation: Use Moodle Docs URL for TeX doc 2014-03-31 12:07:34 +08:00
Frederic Massart
73afb59759 MDL-44747 editor_atto: Renamed subplugin setting class 2014-03-31 11:28:43 +08:00
Frederic Massart
356ec27f08 MDL-44747 editor_atto: Improved validation of toolbar config
This ensures that:
- Plugins are only used once,
- Group names are unique,
- Lines match: group = plugin[, plugin[, plugin ...]],
- There are some groups and plugins defined,
- The plugins used are installed.
2014-03-31 11:28:43 +08:00
Frederic Massart
a3fa796118 MDL-44755 atto_editor: Remove hardcoded icons from settings
Previously, we hardcoded a list of icons for Atto plugins. This is not
a good idea as it would be very quickly outdated, or incomplete. Now,
we proceed as we often do: if the image pix/icon exists in the plugin
it is displayed, else nothing is displayed.
2014-03-31 11:26:53 +08:00
Frederic Massart
89331bc217 MDL-44764 atto_image: Reword the alt related labels 2014-03-31 11:25:46 +08:00
Frederic Massart
7887b47524 MDL-44767 atto_editor: Browser hangs when making a selection 2014-03-31 11:13:15 +08:00
Marina Glancy
c531e2e632 Merge branch 'MDL-44804-master' of git://github.com/FMCorz/moodle 2014-03-31 11:03:31 +08:00
Jetha Chan
f8c3af1321 MDL-44770 editor-atto: table context menu opens from button
Context menu now opens from button, rather than table cell. Modified wording of table strings.
2014-03-31 10:56:36 +08:00
Frederic Massart
adb2473a2b MDL-44759 atto_undo: Buttons are only enabled when needed
Before the patch it was happening that the undo or redo buttons
were enabled even though clicking on them didn't produce anything.
This is partly because we were not storing the initial value, we
allowed for the stack to be empty, and we were using not clean
HTML.
2014-03-31 10:49:59 +08:00
Andrew Davis
13f432976a MDL-44756 editor_atto: changed a string 2014-03-31 10:25:39 +08:00
Jason Fowler
38528fa40a MDL-44806 Atto: Prevent Accessibility Checker dialog from being needlessly large 2014-03-31 09:55:29 +08:00
Eloy Lafuente (stronk7)
6576413e48 MDL-44862 postgres: tests to support socket & port
Both the database auth and enrol plugins use ADOdb
to perform connections. Socket and port are allowed
there if passed as "socket:port", so, when both are
configured in CFG, we pass them that way. Else
ADOdb defaults to standard port (5432).
2014-03-31 09:28:57 +08:00
Jean-Michel Vedrine
f88d75e51a MDL-41063 Lesson qformat_default class is missing an error function 2014-03-30 09:03:38 +02:00
Petr Škoda
96255f472c MDL-44862 always add dbport to dbsocket in pg driver
This should hopefully resolve problems when using sockets connection
to pg servers running on non-standard ports.
2014-03-30 10:06:39 +08:00
Mark Nelson
a82f3b4f2a MDL-44746 core_events: minor changes to the user_deleted event 2014-03-29 15:25:49 -07:00
Mark Nelson
601c998c64 MDL-44746 core_events: removed incorrect uses of snapshots 2014-03-29 15:25:49 -07:00
Petr Škoda
ffe60f5bbd MDL-40910 add new core event user_graded
This event is triggered when teacher manually edits the grade in gradebook.
2014-03-29 15:34:11 +08:00
Tim Hunt
6a981b45c3 MDL-31262 fix quiz review capability check.
This change is logically the same as changing
    $this->has_capability('mod/quiz:viewreports')
to
    $this->has_capability('mod/quiz:viewreports') || $this->has_capability('mod/quiz:preview')
in the original code. However, I rewrote the logic so that we test the
most common and performance-critical case first - that of a student
lookign at their own attempt.
2014-03-28 18:37:21 +00:00
Tim Hunt
4dc30936f7 MDL-44811 quiz settings form title: change for consistency.
Thanks to Fred for poining out that most other activities use the work
Appearance for these sorts of settings.
2014-03-28 18:02:02 +00:00
Frederic Massart
23cead686e MDL-44808 atto_table: Remove accessibility information from dialogue 2014-03-28 17:27:57 +08:00
Marina Glancy
dc8a848c7d MDL-41102 report_performance: correctly check state of automated backups
Thanks to Renaat Debleu for the patch
2014-03-28 16:39:55 +08:00
Marina Glancy
9dbcfd93e4 MDL-34012 chat: removing repetetive db query (performance) 2014-03-28 15:21:08 +08:00
Jason Fowler
87c0e4e06b MDL-44754 Atto: Explaining what group names are used for in toolbars 2014-03-28 14:48:38 +08:00
Marina Glancy
d3adc16e48 MDL-33486 wiki: allow searching individual wikis 2014-03-28 14:16:13 +08:00
Petr Škoda
578645aadf MDL-44715 use parent::validate_data() consistently in all events
Includes some minor PHPDocs typo fixes.
2014-03-28 14:09:31 +08:00
Damyon Wiese
e9ddbae9c0 MDL-44832 Assign: Convert grading menu to a moodle action-menu
This is required because YUI broke something.
2014-03-28 12:56:46 +08:00
Petr Škoda
25ab60ba8e MDL-44843 try to hack around strict locale names in OSX 2014-03-28 11:44:18 +08:00
Marina Glancy
e9e9b197b3 MDL-35305 wiki: backup and restore files
Thanks to Tatsuya Shirai for the patch
2014-03-28 10:30:45 +08:00
Petr Škoda
0a5aa65b53 MDL-44733 add support for disabling of scheduled tasks 2014-03-28 10:23:37 +08:00
Oleg Sychev
92e83e2d0e MDL-24408 extra_question_fields: separate answer data creation code
Now any question using extra_question_fields can overload make_answer
(just as make_hint), instead of overloading whole initialise_question_answers.
2014-03-28 00:27:05 +03:00
Oleg Sychev
f0c6c18189 MDL-24408 extra_answer_fields: save_question_answers function
question_type::save_question_answers function added, supporting
saving answers and extra answer fields. It can be called from
save_question_options function for the questions, using
question_answers table. Special functions created for overloading
so that every question could tune it to it's own form.

Shortanswer qtype save_question_options() converted as a proof of
concept and for testing purposes.
2014-03-28 00:27:03 +03:00
Oleg Sychev
a68207b664 MDL-24408 extra_answer_fields: loading data to the question editing form
Now question_edit_form can load extra answer fields. If a question
type need to do something more complex for particular field, it
can overload added functions without duplicating other code.
2014-03-28 00:27:01 +03:00
Oleg Sychev
6276672854 MDL-24408 extra_answer_fields : get answers even if they miss extra data
Extra answer data may be optional, saving DB space - i.e. not every row in
question_answers will have respective row in extra answers table. Current
implementation of question_type::get_question_options() won't return such
answers at all. This commit fix that, changing join type for db query.

Also fixed coding style violation in the variable name in get_question_options.
2014-03-28 00:26:59 +03:00
sam marshall
07ba4070e4 MDL-44837 Behat: 'dialogue' selector only works for confirm dialogues
The dialogue selector in Behat (used only in one place) didn't work for
other types of standard Moodle notification dialogue.
2014-03-27 16:45:04 +00:00
Gilles-Philippe Leblanc
2d35b7d3d8 MDL-42816 auth_manual: Add password expiry for manual auth method 2014-03-27 10:45:01 -04:00
Frederic Massart
5ce4583a46 MDL-44834 editor_atto: Delegate change event to one editor 2014-03-27 19:48:37 +08:00
Marina Glancy
ad32dda90c weekly release 2.7dev 2014-03-27 16:52:07 +08:00
Marina Glancy
6474439d55 NOBUG: Fixed file access permissions 2014-03-27 16:52:07 +08:00
Marina Glancy
a13c2addee NOBUG: Fixed SVG browser compatibility 2014-03-27 16:52:06 +08:00
Marina Glancy
a5c3dec8e8 Merge branch 'install_master' of git://git.moodle.org/moodle-install 2014-03-27 16:52:05 +08:00
Frederic Massart
2f0a1236a7 MDL-44772 editor_atto: Initial height of editor matches textarea's
We set a min-height and a height in JavaScript to force the editor
to start at a certain height, but then it can be expanded thanks
to the CSS property resize. Though as IE does not support the resize
property we ignore we do not set a height so that the editor expands
as we type.
2014-03-27 15:17:49 +08:00