Commit graph

69915 commits

Author SHA1 Message Date
Tim Hunt
a6bbb92607 MDL-46868 glossary / filter: performance, check modinfo sooner.
Since we need to check modinfo anyway, do that as soon as possible so we
can get a performance win if there are no glossaries in the course.
2014-08-21 14:16:15 +01:00
Tim Hunt
062d04cffc MDL-46867 filter_glossary: don't use static for one-time JS. 2014-08-21 14:16:07 +01:00
Dan Poltawski
cae945d272 MDL-46880 mod_forum: move cron to scheduled task
Note that this is a very basic conversion without doing any refactoring
to split the tasks up better. That will come in MDL-44734, this is about
being a safe backportable change to give admins better control over the
running of the forum cron task.
2014-08-21 13:45:43 +01:00
shashirepo
ce72c045e6 MDL-46477 chat:hard coded string in mod/chat 2014-08-21 17:29:45 +05:30
Amanda Doughty
a472912d73 MDL-46619 mod/forum author showing in Q and A forum 2014-08-21 12:32:08 +01:00
Mary Evans
8c97393ce5 MDL-46812 grade/report/grader: Need to tie up loose ends in Gradebook after MDL-43824
Squashed commit of the following:

commit 5881cccc95c135e1440ce0c5441a84b462941758
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Thu Aug 21 02:15:05 2014 +0100

    MDL-46812 grade/report/grader: Reset previous commit for left scroller.

commit 5abeb60470f02ab4c79c27b2a6f6187e75891e0b
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Thu Aug 21 01:29:41 2014 +0100

    MDL-46812 grade/report/grader: Added jsenabled css body class to rtl style.

commit a95d23d8b753a590d980e5427e8c74ba597c2b91
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Thu Aug 21 00:59:06 2014 +0100

    MDL-46812 theme_base; Removed more redundent CSS.

commit 3fb326e5b39738343e0b7c0d9c8da17adf5a09bb
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Wed Aug 20 13:24:59 2014 +0100

    MDL-46812 theme_base: Removed redundent grade/report/grader CSS in style/grade.css

commit c602e7e277f9ce1fed6d0eccf72c547432e130b6
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Thu Aug 14 12:50:14 2014 +0100

    MDL-46812 grade/report/grader: Need to tie up loose ends in Gradebook after MDL-43824

        1. fixed gradebook layout when JS is disabled
        2. added height and background color to scroller when JS is enabled
        3. removed redundent top margin in user-grades table
2014-08-21 11:13:56 +01:00
Mark Nelson
08678f6f45 MDL-46923 core_behat: fixed typos in function names 2014-08-20 22:09:29 -07:00
Damyon Wiese
720d22404b MDL-44304 assignfeedback_editpdf: Fix fatal error when viewing team assignments with editpdf responses. 2014-08-21 12:09:27 +08:00
Damyon Wiese
506df250af MDL-44304 assignfeedback_editpdf: Behat test for group submissions 2014-08-21 12:09:22 +08:00
Brian Barnes
e5cb8da2f2 MDL-46900 theme: allowed more than 1 nav collapse element 2014-08-21 14:56:56 +12:00
Marina Glancy
e609e6cf02 weekly release 2.8dev 2014-08-21 10:18:37 +08:00
Marina Glancy
ea1a0ff85a NOBUG: Fixed file access permissions 2014-08-21 10:18:37 +08:00
Marina Glancy
5aec206c66 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-08-21 10:18:35 +08:00
AMOS bot
24eb45cc40 Automatically generated installer lang files 2014-08-21 00:05:27 +08:00
Gregory Faller
767fda9bce MDL-46842: Reopen assignment submissions when using offline grading worksheet 2014-08-20 19:13:49 +09:30
Damyon Wiese
a0ac406055 MDL-46904 core_task: Gracefully handle rubbish entries in the tasks table. 2014-08-20 17:01:15 +08:00
Damyon Wiese
7c32b87bfd Merge branch 'MDL-45029-master' of git://github.com/lameze/moodle
Conflicts:
	course/modlib.php
2014-08-20 13:58:22 +08:00
Damyon Wiese
f01330f6ca Merge branch 'MDL-46792-master' of git://github.com/xow/moodle 2014-08-20 12:10:13 +08:00
Mark Nelson
617dbe49ed MDL-46188 core_course: use correct hide/show icon 2014-08-20 12:04:35 +08:00
John Okely
248e23c335 MDL-46792 core_group: Add unit tests to ensure that group updates and grouping updates do not require names 2014-08-20 12:02:58 +08:00
Simey Lameze
78618bc677 MDL-45029 core_course: set aggregationcoef while creating a new course module 2014-08-20 11:56:11 +08:00
Damyon Wiese
391da2bf82 Merge branch 'MDL-45029-master' of git://github.com/lameze/moodle 2014-08-20 10:21:20 +08:00
uhunkler
6dccf359a0 MDL-46302 correct atto img float right
Correct the atto image "float right" margin CSS
2014-08-20 00:59:31 +02:00
Eloy Lafuente (stronk7)
1ca98142cd Merge branch 'MDL-46536_oauthSig' of https://github.com/moodlerooms/moodle 2014-08-19 20:27:52 +02:00
AMOS bot
35aa137dd8 Automatically generated installer lang files 2014-08-20 00:05:24 +08:00
Eloy Lafuente (stronk7)
36be1bf189 Merge branch 'MDL-46051_LTI_event' of https://github.com/moodlerooms/moodle 2014-08-19 15:59:03 +02:00
Michael Wheeler
3f4ac1eb9a Normalize request header names. 2014-08-19 15:39:46 +02:00
David Balch
6ba716c118 MDL-46887 mod_assign: Enforce module's maxbytes setting at submission. 2014-08-19 13:29:15 +01:00
Dan Poltawski
ba774b42a2 MDL-46885 mod_forum: diverge version numbers
Before this patch the version number could dangerously clash with
27_STABLE increments - and miss the upgrade steps for MDL-1626
2014-08-19 13:04:01 +02:00
Marina Glancy
376a6f687c Merge branch 'wip-mdl-46327' of git://github.com/rajeshtaneja/moodle 2014-08-19 17:28:55 +08:00
Rajesh Taneja
a9950b49c4 MDL-46327 phpunit: drop_table should be used, rather then drop_temp_table 2014-08-19 17:16:55 +08:00
Damyon Wiese
52ed065131 Merge branch 'MDL-46706-master' of https://github.com/sammarshallou/moodle
Conflicts:
	lib/tests/modinfolib_test.php
2014-08-19 17:13:05 +08:00
Simey Lameze
82f336aa84 MDL-45029 core_course: set aggregationcoef while creating a new course module 2014-08-19 17:06:49 +08:00
Marina Glancy
6ee21ea1d0 Merge branch 'MDL-18014-master' of git://github.com/damyon/moodle 2014-08-19 16:57:05 +08:00
Marina Glancy
e913caab92 Merge branch 'MDL-46538_master' of git://github.com/lazydaisy/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-08-19 16:51:46 +08:00
Damyon Wiese
aba9019832 Merge branch 'wip_MDL-46711_m28_memcachesrvs' of https://github.com/skodak/moodle 2014-08-19 16:31:06 +08:00
Marina Glancy
4cb61b6b4e Merge branch 'MDL-46281-master' of git://github.com/lucisgit/moodle 2014-08-19 16:26:35 +08:00
Damyon Wiese
d32bc7d655 MDL-18014 Atto autosave: Atto requires $PAGE->url be set or debugging is triggered
2 quiz tests are creating forms with text editors manually - they need to ensure a valid
$PAGE->url is set so they don't trigger debugging warnings from $PAGE->url magic method
called by Atto.
2014-08-19 16:02:14 +08:00
Damyon Wiese
fc9b567f32 Merge branch 'MDL-46772-master' of git://github.com/andrewnicols/moodle 2014-08-19 15:41:32 +08:00
Marina Glancy
816ddceceb Merge branch 'MDL-46829_master' of git://github.com/lazydaisy/moodle 2014-08-19 14:20:51 +08:00
Marina Glancy
7e4475d37c Merge branch 'MDL-46833-master' of git://github.com/lucisgit/moodle 2014-08-19 14:20:41 +08:00
Marina Glancy
c86ae8660c Merge branch 'MDL-46846-master' of git://github.com/damyon/moodle 2014-08-19 14:20:31 +08:00
Damyon Wiese
c97bb5df16 Merge branch 'MDL-41513_Scrollbar_not_working' of https://github.com/MorrisR2/moodle 2014-08-19 14:11:43 +08:00
Marina Glancy
2c0ee558e5 Merge branch 'wip-mdl-46817' of git://github.com/rajeshtaneja/moodle 2014-08-19 14:03:27 +08:00
Marina Glancy
04821cbbe7 Merge branch 'MDL-46469-master' of git://github.com/ankitagarwal/moodle 2014-08-19 14:01:48 +08:00
Damyon Wiese
32d3bfa2de Merge branch 'MDL-46792-master' of https://github.com/lucisgit/moodle 2014-08-19 13:57:50 +08:00
Ankit Agarwal
2eca9a23ae MDL-46469 scorm: Update report plugins to use namespaced classnames 2014-08-19 13:56:13 +08:00
Ankit Agarwal
fd57607fdb MDL-46469 scorm: Support autoloading for report plugins 2014-08-19 13:56:13 +08:00
Marina Glancy
430529bde8 Merge branch 'MDL-18014-master' of git://github.com/damyon/moodle 2014-08-19 13:50:44 +08:00
Marina Glancy
dd924ea9db Merge branch 'MDL-43197-master-2nd' of git://github.com/FMCorz/moodle 2014-08-19 13:25:32 +08:00