e35bc644de
MDL-51089 mod_quiz: Hide first page last node
2017-12-28 11:46:50 +01:00
913abd448b
Merge branch 'MDL-51089-34' of https://github.com/lucaboesch/moodle into MOODLE_34_STABLE
2017-12-27 17:56:10 +01:00
dfe9aa213b
Merge branch 'MDL-58983-34' of git://github.com/damyon/moodle into MOODLE_34_STABLE
2017-12-27 17:56:10 +01:00
dc24b81fef
Merge branch 'MDL-61056-34-feedbackresponsenav' of git://github.com/mudrd8mz/moodle into MOODLE_34_STABLE
2017-12-27 17:56:09 +01:00
237e1a85ce
MDL-51089 quiz: "Add" menu in edit quiz more keyboard accessible
2017-12-22 09:23:00 +01:00
88498220a1
Merge branch 'MDL-60938-34-2' of git://github.com/junpataleta/moodle into MOODLE_34_STABLE
2017-12-19 07:53:20 +01:00
fb8b947963
Merge branch 'MDL-61045_34' of git://github.com/timhunt/moodle into MOODLE_34_STABLE
2017-12-19 06:43:27 +01:00
0c794fc199
MDL-57431 mod_quiz: remove unnecessary class from selector
2017-12-19 12:49:45 +08:00
7d7edc8820
Merge branch 'MDL-59999-34' of git://github.com/mihailges/moodle into MOODLE_34_STABLE
2017-12-19 11:04:01 +08:00
18c838f586
MDL-59709 mod_assign: Export to portfolio button not working
...
Changed the button to a text link
2017-12-19 13:29:48 +13:00
21c63124ab
Merge branch 'MDL-59200-34' of git://github.com/damyon/moodle into MOODLE_34_STABLE
2017-12-19 01:10:33 +01:00
350cefe41e
Merge branch 'MDL-58888-34' of git://github.com/junpataleta/moodle into MOODLE_34_STABLE
2017-12-19 01:05:01 +01:00
47c56f3475
Merge branch 'MDL-60750-34' of git://github.com/lameze/moodle into MOODLE_34_STABLE
2017-12-19 00:59:36 +01:00
8ed193c3ee
Merge branch 'm34_MDL-60793_Mod_Chat_Reserved_Words_In_MySQL8p0p3_And_Above' of https://github.com/scara/moodle into MOODLE_34_STABLE
2017-12-19 12:13:57 +13:00
40e430e634
MDL-61056 feedback: Fix the response navigation links
...
Floats are evil and unreliable. Even with the clearfix class added to
the response_navigation wrapper, the Next link would remain unaligned.
We need a proper three columns layout here.
It did not feel necessary to introduce a special template here so I'm
making use of the core one.
2017-12-18 21:54:47 +01:00
18e6878f5a
Merge branch 'MDL-61042-34' of git://github.com/junpataleta/moodle into MOODLE_34_STABLE
2017-12-18 17:26:55 +01:00
1041ccaf2e
Merge branch 'MDL-61040-34' of git://github.com/junpataleta/moodle into MOODLE_34_STABLE
2017-12-18 17:25:07 +01:00
8827e7fc3f
MDL-60793 mod_chat: Renamed 'system' into 'issystem'
...
'system' is now a reserved word in MySQL 8.0.3+.
2017-12-18 15:26:20 +01:00
2faa795209
Merge branch 'MDL-56932-34' of git://github.com/lameze/moodle into MOODLE_34_STABLE
2017-12-18 12:15:22 +01:00
06588b2cc0
Merge branch 'MDL-42676-34' of git://github.com/zig-moodle/moodle into MOODLE_34_STABLE
2017-12-18 15:32:51 +08:00
a603f86d65
Merge branch 'MDL-57431-34' of git://github.com/lameze/moodle into MOODLE_34_STABLE
2017-12-18 12:54:03 +08:00
5681222a0b
MDL-59999 lesson: Boost grade essays page not indicating grade status
...
AMOS BEGIN
CPY [graded,assign],[graded,lesson]
CPY [notgraded,assign],[notgraded,lesson]
AMOS END
2017-12-18 09:17:06 +08:00
3093cc28f1
MDL-61045 quiz settings: add back missing disabledIf
...
This got broken in Moodle 2.1 by MDL-20636.
2017-12-15 13:15:12 +00:00
0ff581cece
MDL-61042 mod_lesson: Initialise pageid variable
2017-12-15 17:42:08 +13:00
4ab37af070
MDL-58888 mod_choice: Sort choice_get_my_response() results by optionid
2017-12-15 15:56:28 +13:00
f85f002b37
MDL-58888 mod_choice: Verify sorting when testing multiple selections
...
* Improve test_choice_get_my_response() to verify the sorting of the
responses returned by choice_get_my_response().
* Fix correct usage of choice_get_my_response().
2017-12-15 15:56:28 +13:00
64abea941e
MDL-61040 mod_choice: Save my choice button needs some space
2017-12-15 13:07:30 +13:00
b9bebd0e36
MDL-60938 mod_choice: Fix rendering of users for choice results
2017-12-15 12:52:54 +13:00
ab0847d328
MDL-56932 theme_boost: fix quiz max mark input height
2017-12-13 11:48:53 +08:00
7e9f55f138
MDL-60750 mod_quiz: only apply form css rules on clean theme
2017-12-12 12:14:02 +08:00
aa383f1b47
Merge branch 'MDL-52538-34' of git://github.com/mihailges/moodle into MOODLE_34_STABLE
2017-12-12 10:40:35 +08:00
8bb22c4544
Merge branch 'MDL-44667-34' of https://github.com/snake/moodle into MOODLE_34_STABLE
2017-12-12 10:26:18 +08:00
d997069c62
MDL-57431 mod_quiz: Quiz editing help icon fix
2017-12-12 09:57:46 +08:00
ece94bb4e2
MDL-42676 mod_assign: Display message fix when using grade override
...
Logic fix in mod_assign locallib.php to correctly set the submissionlockedstatus,
and added associated unit test in test_grade_submission_override()
2017-12-12 09:04:59 +08:00
cd44d4e463
MDL-52538 lesson: Grade info displayed while ongoing score disabled
2017-12-12 09:03:23 +08:00
8721afb2c6
Merge branch 'wip-MDL-34161-34' of git://github.com/marinaglancy/moodle into MOODLE_34_STABLE
2017-12-05 17:59:53 +13:00
9164ab6e39
MDL-44667 database: fix incorrect usages of $DB->get_field
...
Some places were passing 5 params, meaning the strictness param was
lost. This fixes those usages.
2017-12-04 18:01:34 +08:00
2af1421e34
Merge branch 'MDL-60219-34' of https://github.com/abias/moodle into MOODLE_34_STABLE
2017-12-04 16:28:39 +08:00
5a9fa0fe57
MDL-34161 mod_lti: backup and restore of submissions
2017-12-04 15:05:58 +08:00
c1db07d55b
MDL-34161 mod_lti: backup/restore of lti types
...
Only course tools are backed up, site tools and registrations
can be matched by id if they are restored to the same site only.
For predefined course tools the secret is backed up encrypted
and can be restored on the same site only.
2017-12-04 15:05:58 +08:00
c5b7a25ee6
MDL-34161 mod_lti: Added Behat tests
2017-12-04 15:05:58 +08:00
7cc665e9c7
MDL-34161 mod_lti: Add support for restoring site tool
2017-12-04 15:05:57 +08:00
369caa6183
Merge branch 'MDL-60914_34' of git://github.com/markn86/moodle into MOODLE_34_STABLE
2017-12-04 12:49:48 +13:00
2a9c11965b
MDL-60219 lti: Replace pagelayout frametop with incourse
2017-11-29 09:58:45 +01:00
af4fa2a55b
Merge branch 'wip-MDL-60591-34' of git://github.com/marinaglancy/moodle into MOODLE_34_STABLE
2017-11-28 22:38:37 +01:00
b4cbad15de
MDL-58983 assign: Hide grade button if no cap
...
If the current user cannot grade students, don't show them the button.
2017-11-28 15:48:55 +08:00
03df75c0de
MDL-59200 assign: add feedback when grade locked
...
We are including a hidden field when the grade is locked in the gradebook for a student. This field fails validation, so
the form cannot be submitted.
2017-11-28 14:37:33 +08:00
8938d826d9
Merge branch 'MDL-53004-34' of https://github.com/lucaboesch/moodle into MOODLE_34_STABLE
...
Conflicts:
mod/assign/styles.css
2017-11-28 12:50:57 +08:00
8952d3f100
Merge branch 'MDL-24678-MOODLE_34-chat_get_latest_message' of https://github.com/bozoh/moodle into MOODLE_34_STABLE
2017-11-28 12:14:49 +08:00
0bb9e2d8d7
MDL-60669 forum: Added duplicate check for restoring forum subscriptions
...
Before MDL-59854 it was possible to have duplicate forum subscriptions.
Trying to import backups created from back then, caused a DB exception
due to unqiue key constraints. Now only one of multiple identical forum
subscritions is restored.
2017-11-28 12:06:25 +08:00
David Monllao