73614 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
1df669e7bf Merge branch 'MDL-50228' of git://github.com/timhunt/moodle 2015-06-03 01:29:46 +02:00
Eloy Lafuente (stronk7)
23abab38e7 Merge branch 'MDL-50198' of git://github.com/timhunt/moodle 2015-06-03 01:19:42 +02:00
Eloy Lafuente (stronk7)
2426d816fe Merge branch 'MDL-49901_master' of https://github.com/jinhofer/moodle 2015-06-02 19:57:38 +02:00
Dan Poltawski
4bbb035830 Merge branch 'MDL-49905_postform_timeoption' of https://github.com/kylemn/moodle 2015-06-02 16:06:45 +01:00
Dan Poltawski
38414e965c Merge branch 'MDL-50009-m' of https://github.com/micaherne/moodle 2015-06-02 14:42:21 +01:00
Dan Poltawski
f272503420 Merge branch 'MDL-50260-remove-code-optional_param' of git://github.com/tmuras/moodle 2015-06-02 14:22:59 +01:00
Dan Poltawski
09bc038674 Merge branch 'MDL-49793-master' of git://github.com/jleyva/moodle 2015-06-02 14:01:05 +01:00
Dan Poltawski
356fd5bae7 Merge branch 'm29_MDL-49628a' of https://github.com/totara/moodle 2015-06-02 13:54:01 +01:00
Dan Poltawski
290b156276 Merge branch 'MDL-49323-master' of git://github.com/nmoller/moodle 2015-06-02 13:23:37 +01:00
Dan Poltawski
f73b04871a Merge branch 'MDL-50155' of https://github.com/andrewhancox/moodle 2015-06-02 12:08:24 +01:00
Dan Poltawski
17abf1caa2 MDL-30960 version: bump for new setting 2015-06-02 11:47:43 +01:00
Dan Poltawski
ca5c7d7535 Merge branch 'MDL-30960_master' of https://github.com/danielneis/moodle 2015-06-02 11:42:10 +01:00
Marina Glancy
29645f9745 MDL-26501 mod_glossary: fixes to tabs management 2015-06-02 11:25:27 +01:00
Nivedita Setru
223d6cb3bf MDL-26501 mod_glossary: Allow to specify visible tabs 2015-06-02 11:25:26 +01:00
Dan Poltawski
77679fb2e5 Merge branch 'MDL-36957-master' of git://github.com/FMCorz/moodle 2015-06-02 11:07:57 +01:00
Dan Poltawski
554dedf6a6 Merge branch 'MDL-46927_master' of git://github.com/markn86/moodle 2015-06-02 09:03:43 +01:00
Mark Nelson
94f78b0d15 MDL-46927 core_files: fixed issue with system course restores
When clicking on 'Restore' next to a file in the 'Course
backup area' in the system context the message 'Sorry,
the requested file could not be found' was displayed.
This fix adds missing functionality to the class
'file_info_context_system' so that the file information
is correctly returned.
2015-06-01 23:08:40 -07:00
Nelson Moller
b73eed1249 MDL-49323 mod_assign: Fixed numeric validation in grade form.
The behat test for another decimal separator was incorporated.
2015-06-01 10:54:12 -04:00
Eloy Lafuente (stronk7)
f0fa70d0df Merge branch 'MDL-29771' of git://github.com/timhunt/moodle 2015-06-01 16:13:18 +02:00
Dan Poltawski
df0a584485 Merge branch 'MDL-50341' of git://github.com/timhunt/moodle 2015-06-01 15:03:23 +01:00
Dan Poltawski
825be82b8a MDL-50322 forum: add basic split post behat coverage
Also bump version for autoloading new class.
2015-06-01 14:59:06 +01:00
Dan Poltawski
918950d0cd Merge branch 'MDL-50322-master' of git://github.com/mastnym/moodle 2015-06-01 13:49:57 +01:00
Dan Poltawski
3235dc1285 Merge branch 'MDL-50140_master' of https://github.com/jinhofer/moodle 2015-06-01 13:34:18 +01:00
Dan Poltawski
6395168b67 Merge branch 'MDL-50304_master' of https://github.com/jinhofer/moodle 2015-06-01 13:21:54 +01:00
Juan Leyva
752036b826 MDL-49793 url: New Web Service mod_url_view_url 2015-06-01 13:46:22 +02:00
Juan Leyva
f3fe1b8b35 MDL-49793 url: Move logging and completion to new API 2015-06-01 13:43:17 +02:00
Dan Poltawski
0800e9637c Merge branch 'MDL-46479-master' of git://github.com/ankitagarwal/moodle 2015-06-01 12:36:25 +01:00
Dan Poltawski
c92bfbfcca MDL-50406 less: build css 2015-06-01 12:01:34 +01:00
Dan Poltawski
5a1a53a03a Merge branch 'MDL-50406_master' of git://github.com/nadavkav/moodle 2015-06-01 11:42:22 +01:00
Dan Poltawski
9492e529ef Merge branch 'MDL-50309_master' of git://github.com/markn86/moodle 2015-06-01 10:25:48 +01:00
Dan Poltawski
5ffb982d25 Merge branch 'MDL-49707-master' of git://github.com/ankitagarwal/moodle 2015-06-01 10:09:06 +01:00
Ankit Agarwal
2639cdf0b0 MDL-49707 inbound: localpart should be < 15 2015-06-01 10:06:16 +05:30
Tim Hunt
3af05ae35b MDL-29771 interactive behaviour: better state text in try again state
Before it just said 'Not complete'. It is more helpful to show the number
of tries remaining in this state as well.
2015-05-31 21:09:55 +01:00
Tim Hunt
312dce0ebc MDL-50341 quiz statistics: non-attempted questions broke first-try stats
For behaviours that allow multiple tries, and when the teacher had chosen to
generate statistics for the first tries only, and when a student had not
attempted one question, then an error occurred. It should have been classified
as no response.
2015-05-31 13:36:53 +01:00
Nadav Kavalerchik
af3a0656be MDL-50406 Messages: Right align messages menu box, in RTL mode. 2015-05-29 20:45:54 +03:00
Martin Mastny
069d0f1733 MDL-50322 mod_forum: Added validation when spliting discussions 2015-05-29 09:11:39 +08:00
jinhofer
aa65ecea98 MDL-50304 atto/plugins/table: Fixed _addRowAfter function 2015-05-28 07:53:10 -05:00
jinhofer
0fa9b33463 MDL-50140 grade/import: Added CSH buttons to import grades
CSH buttons have been added to CSV Import as well as Paste
from spreadsheet in the following areas:
Encoding, Separator (csv only), Verbose, Preview, Map to,
and Map from.

The heading of Import CSV had a CSH button added as well.

All CSH buttons were given associated language strings.
2015-05-28 07:51:50 -05:00
Mark Nelson
2b7b0bae62 MDL-50309 core_upgrade: fixed undefined '$customusermenuitems' notice 2015-05-27 21:29:39 -07:00
David Monllao
0c6faf4b51 weekly on-sync release 3.0dev 2015-05-28 11:41:36 +08:00
David Monllao
187c4d47be Merge branch 'MDL-50373' of git://github.com/timhunt/moodle 2015-05-28 09:27:30 +08:00
Tim Hunt
e7df2335b6 MDL-50373 questions: random Qs must not pick deleted or sub- questions
This was a regression caused by MDL-6340. I missed the necessary
    AND parent = 0 AND hidden = 0
in one query of the question table.
2015-05-27 20:32:47 +01:00
Eloy Lafuente (stronk7)
e987eeef75 Merge branch 'wip-mdl-49806' of https://github.com/rajeshtaneja/moodle 2015-05-27 12:20:50 +02:00
Ankit Agarwal
648cddcbca MDL-46479 enrol_plugin: Final deprecation of instance_deletable() 2015-05-27 14:03:21 +05:30
David Monllao
c5954f64ae MDL-50330 blog: Make other users blogs accessible 2015-05-27 14:03:34 +08:00
David Monllao
de6b4e9dac Merge branch 'MDL-50340-master' of git://github.com/ankitagarwal/moodle 2015-05-27 11:58:22 +08:00
David Monllao
9d1593d686 Merge branch 'wip-mdl-49772' of git://github.com/rajeshtaneja/moodle 2015-05-27 11:50:01 +08:00
Rajesh Taneja
b7861ddab3 MDL-49772 behat: Removed optimization as it's not required
This api is called very few times in behat
initilisation process, so such optimization
is an over engineer. Hence removing it.
2015-05-27 11:20:48 +08:00
Rajesh Taneja
e2e37bc510 MDL-49806 behat: Ensure user is marked complete before runnning cron 2015-05-27 09:24:18 +08:00
David Monllao
1bd2c8ad01 Merge branch 'MDL-49611' of git://github.com/srynot4sale/moodle-fixes 2015-05-27 08:49:23 +08:00