Commit graph

68128 commits

Author SHA1 Message Date
Damyon Wiese
22cee6a7ea MDL-43856 MathJax: Remove unused build folder.
This is left over from when I renamed the module.
2014-04-07 17:21:43 +08:00
Dan Poltawski
4834cfdf59 Merge branch 'MDL-43856-master' of git://github.com/damyon/moodle 2014-04-07 16:58:46 +08:00
Ankit Agarwal
1722da6a7b MDL-43682 Some imporvements to loglive report 2014-04-07 16:58:45 +08:00
Ankit Agarwal
1ac341e23f MDL-43682 log: Fix issues with log report
Following fixes have been made:-
Porfile links where generating errors when there was no courseid present. Fixed the same.
get_readers() method was accessing an undefined property.
popups were used for action and ip address before the whole rewrite, we should maintain the same behaviour.
Fixed string issues.
Pass context to format_string method
2014-04-07 16:58:44 +08:00
Ankit Agarwal
5991eb80cd MDL-43682 loglive: Rewrite loglive to use new logging stores
AMOS BEGIN
 CPY [eventcomponent,report_log],[eventcomponent,report_loglive]
 CPY [eventcontext,report_log],[eventcontext,report_loglive]
 CPY [eventloggedas,report_log],[eventloggedas,report_loglive]
 CPY [eventorigin,report_log],[eventorigin,report_loglive]
 CPY [eventrelatedfullnameuser,report_log],[eventrelatedfullnameuser,report_loglive]
 CPY [nologreaderenabled,report_log],[nologreaderenabled,report_loglive]
 CPY [selectlogreader,report_log],[selectlogreader,report_loglive]
AMOS END
2014-04-07 16:58:44 +08:00
Damyon Wiese
e017c50bcf Merge branch 'wip-MDL-40843-master' of git://github.com/marinaglancy/moodle 2014-04-07 16:57:06 +08:00
Marina Glancy
a8e4b006ce Merge branch 'MDL-44761-master' of git://github.com/andrewnicols/moodle 2014-04-07 16:16:32 +08:00
Marina Glancy
502ff062a0 Merge branch 'wip-mdl-44873' of git://github.com/rajeshtaneja/moodle 2014-04-07 16:16:25 +08:00
Dan Poltawski
e2e1622946 Merge branch 'MDL-44927-master' of git://github.com/damyon/moodle 2014-04-07 16:10:14 +08:00
Dan Poltawski
5e8be14cb9 Merge branch 'MDL-41569-master' of git://github.com/damyon/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-04-07 16:01:56 +08:00
Damyon Wiese
353473aa59 MDL-44927 Atto: Improve table editing UX
Hide context menu items that don't apply.
Add "Edit table" menu entry to change the caption / headers.
2014-04-07 15:57:59 +08:00
Damyon Wiese
1c9785d52d MDL-43856 MathJAX: Small correction to readme_moodle.txt
The CDN urls have been moved to settings.php.
2014-04-07 15:44:06 +08:00
Damyon Wiese
2aa476bbc8 Merge branch 'wip-MDL-43021-master' of git://github.com/marinaglancy/moodle 2014-04-07 15:19:11 +08:00
Rajesh Taneja
22001b4a9b MDL-44977 tool_profiling: set xhprof default settings
Set xhprof default settings, even if xhprof is not installed.
If xhprof is not installed, hide profiling admin settings,
else show them.
This is needed, because if xhprof is installed, then it will
fail all non-js behats which navigate to setting under
site administration, as profiling settings get displayed on
default admin page.
2014-04-07 14:55:55 +08:00
Nobelium
e3528983f2 MDL-41476 scorm settings- SCORM1.2 standard mode and CMIString length
Adding SCORM 1.2 standard mode checkbox in scorm admin panel. By default it will be enabled
(i.e: config name = `scorm12standard`, plugin name = `scorm`, value = `1`)
If `scorm12standard` is `1` CMIString256 is of length 256 and CMIString4096 is of length is 4096
if `scorm12standard` is `0` CMIString256 and CMIString4096 are of length is 64000
2014-04-07 14:07:48 +08:00
Dan Poltawski
0678d09213 Merge branch 'wip-MDL-33486-master' of git://github.com/marinaglancy/moodle 2014-04-07 13:10:41 +08:00
Andrew Davis
abdfe18ddb MDL-44454 core_user: removed unused code from user/index.php 2014-04-07 12:02:15 +08:00
Sam Hemelryk
54c4398a6d Merge branch 'w15_MDL-44882_m27_upgrademaint' of https://github.com/skodak/moodle 2014-04-07 15:43:12 +12:00
Sam Hemelryk
b017ff6da6 Merge branch 'MDL-44748-master' of git://github.com/damyon/moodle 2014-04-07 15:18:52 +12:00
Damyon Wiese
c61269af86 Merge branch '44967-27' of git://github.com/samhemelryk/moodle 2014-04-07 11:15:51 +08:00
Sam Hemelryk
5ee0b3ceaf Merge branch 'MDL-44758-master' of git://github.com/jethac/moodle
Conflicts:
	lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js
2014-04-07 15:02:40 +12:00
Dan Poltawski
d69f584fe6 Merge branch 'wip-mdl-44945' of https://github.com/rajeshtaneja/moodle 2014-04-07 10:53:56 +08:00
Jetha Chan
3a6511a530 MDL-44758 editor-atto: prevent table-in-table creation
Prevent new table creation, displaying table context menu instead when cursor is within caption, when multiple cells are selected, when selection contains both nodes within and outside of the table, and when selection contains nodes from multiple tables.
2014-04-07 10:44:29 +08:00
Dan Poltawski
1c9e738b54 Merge branch '41551-27' of git://github.com/samhemelryk/moodle 2014-04-07 10:28:27 +08:00
Sam Hemelryk
b96bee62b1 Merge branch 'MDL-44940' of git://github.com/timhunt/moodle 2014-04-07 13:16:12 +12:00
Jason Fowler
9754ab92da MDL-44765 Atto: Fix the accessibility warning events for image dialogue 2014-04-07 07:59:45 +08:00
Aaron Wells
d54404e5bb MDL-44971 Add hook to "add_attempt" for mod/assign/submission plugins 2014-04-07 10:52:48 +12:00
Sam Hemelryk
2429e44011 Merge branch 'MDL-44846-master' of git://github.com/damyon/moodle 2014-04-07 08:48:50 +12:00
Sam Hemelryk
70aab3836a Merge branch 'MDL-44949-master' of git://github.com/damyon/moodle 2014-04-07 08:15:34 +12:00
Sam Hemelryk
af23b60598 MDL-44944 theme_bootstrapbase: fixed content spacing issue with docked region
Thanks Mary Evans for the peer-review and better solution
2014-04-07 08:12:35 +12:00
Petr Škoda
1a361486a9 MDL-44882 always set maintenance mode on non-cached admin pages
This should resolve all issues with themes during upgrades.
2014-04-06 20:37:55 +08:00
Sam Hemelryk
566889aaa8 MDL-42317 output: reviewed standard/base layouts and converted where a better option was available 2014-04-06 15:57:32 +12:00
Sam Hemelryk
20015af513 MDL-42317 theme_bootstrapbase: more responsive styling for forms with blocks pre && post 2014-04-06 15:40:09 +12:00
Sam Hemelryk
04f1a90d05 MDL-41551 theme_base: improved custom block region handling for base 2014-04-06 15:17:48 +12:00
Sam Hemelryk
292dcf047f MDL-41551 blocks: added tracking and recognition of custom block regions 2014-04-06 15:17:47 +12:00
Sam Hemelryk
225c418fd2 MDL-41511 blocks: improved how custom block regions were being rendered.
There is a new theme property 'blockrendermethod' that can be set by the
theme in its config.php and tells Moodle what method it is using to render
blocks in the layout files.
Either blocks, or blocks_for_region.
Then when adding custom block regions to a page content we ensure we use
the same method the theme is using elsewhere.

This is really a hack becuase we (I) didn't properly deprecate
blocks_for_region when I added the blocks method.
2014-04-06 15:17:47 +12:00
Sam Hemelryk
9bebe2bbbc MDL-44967 upgrade: fixed theme removal when themes have been removed already 2014-04-06 10:50:34 +12:00
shashirepo
600be271c6 MDL-39833 course: require token change
MDL-39833 course: require token change
2014-04-05 12:29:47 +05:30
Eric Merrill
288e7b0921 MDL-36141 course Define role to limit access to Other users. 2014-04-04 14:58:48 -04:00
Tim Hunt
3a528d4e76 MDL-44948 add tool_qeupgradehelper to the list of deleted plugins. 2014-04-04 19:21:23 +01:00
Tim Hunt
07a0370bf8 MDL-44940 quiz editing page problems from MDL-43749.
* If the quiz starts with an empty page, you could not move the first
question up onto it.
* Adding page breaks in the middle sometimes added them in the wrong
place.
* Adding a new page at the end is problematic, and here we fix it as
much as possible, by letting you move the last question down to create a
new page. This needs MDL-40987 to be fixed properly.
2014-04-04 19:03:16 +01:00
sam marshall
15c8c47401 MDL-44891 Behat: Add step to check attribute
This commit creates a Behat step of the form:

Then the "title" attribute of "Toggle visibility" "button"
should contain "Show"

This is useful because unless I missed something there is currently
no step that checks attribute values; this seems like a simple
generic step. Behat is intended to check user-visible effects in
the resulting HTML, and sometimes these effects are implemented
using attribute values (two common examples are the alt= attribute,
which is visible to screenreader users, and the title= attribute,
which is visible to all users; there's also the src attribute of
images, and lots of other possibilities too).
2014-04-04 18:17:39 +01:00
sam marshall
c0fb7f4417 MDL-44891 Behat: Add step to check attribute
This commit creates a Behat step of the form:

Then the "title" attribute of "Toggle visibility" "button"
should contain "Show"

This is useful because unless I missed something there is currently
no step that checks attribute values; this seems like a simple
generic step. Behat is intended to check user-visible effects in
the resulting HTML, and sometimes these effects are implemented
using attribute values (two common examples are the alt= attribute,
which is visible to screenreader users, and the title= attribute,
which is visible to all users; there's also the src attribute of
images, and lots of other possibilities too).
2014-04-04 18:16:28 +01:00
Tony Butler
1da7d44ac6 MDL-44349 core_moodlelib: Add unit tests for count_words()
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
2014-04-04 17:10:45 +01:00
Tony Butler
456acec4cc MDL-44349 core_moodlelib: Improve word counting rules
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
2014-04-04 17:10:45 +01:00
Juan Leyva
4595c79b74 MDL-44408 Adding missing order (so we start looking for newest discussions) 2014-04-04 12:13:47 +02:00
Juan Leyva
1fee2cd4e9 MDL-44408 Add "pagination" to WebService get_forum_discussions 2014-04-04 12:13:47 +02:00
Marina Glancy
9fb549a543 MDL-40843 workshop: sort entries in recent activity block by time 2014-04-04 16:52:02 +08:00
Marina Glancy
a1bff2f92a MDL-40843 workshop: show user names in recent activity 2014-04-04 16:52:01 +08:00
Marina Glancy
e19c086c36 MDL-40843 recent_activity: corrections to grouping and user fields 2014-04-04 16:52:01 +08:00