73922 Commits

Author SHA1 Message Date
Dan Poltawski
ca43103134 Merge branch 'MDL-50639_mod_book_fontsize_master' of https://github.com/barrysspace/moodle 2015-07-21 09:08:15 +01:00
Andrew Nicols
83bd7fcc89 Merge branch 'MDL-49618-master' of https://github.com/marinaglancy/moodle 2015-07-21 12:14:53 +08:00
Andrew Nicols
8aa8a7465b Merge branch 'MDL-49176_marking_guide' of git://github.com/davosmith/moodle 2015-07-21 11:25:42 +08:00
Andrew Nicols
fd05c11399 Merge branch 'MDL-47230_master' of https://github.com/barrysspace/moodle 2015-07-21 11:11:52 +08:00
Andrew Nicols
31cd898ce7 Merge branch 'wip-MDL-41650-master' of https://github.com/marinaglancy/moodle 2015-07-21 09:29:11 +08:00
Andrew Nicols
7b8d4f4005 Merge branch 'MDL-49434-master' of https://github.com/sammarshallou/moodle 2015-07-21 08:13:19 +08:00
Dan Poltawski
2e934446c8 Merge branch 'MDL-49440_master' of https://github.com/crazyserver/moodle 2015-07-20 14:02:55 +01:00
Dan Poltawski
641e3c4346 Merge branch 'wip-MDL-50678-master' of git://github.com/marinaglancy/moodle 2015-07-20 13:53:47 +01:00
Dan Poltawski
0c59bb747d Merge branch 'MDL-50673-master-workshop-submissions' of git://github.com/mudrd8mz/moodle 2015-07-20 11:20:12 +01:00
Dan Poltawski
d44ae46632 Merge branch 'wip-MDL-50612-master' of https://github.com/marinaglancy/moodle 2015-07-20 10:12:16 +01:00
Dan Poltawski
8bdb261a31 Merge branch 'MDL-49582-master' of https://github.com/lucisgit/moodle 2015-07-20 08:23:22 +01:00
apsdehal
aba6e0bfe9 MDL-41650 Tags: Changed css classes of errors and success notice 2015-07-19 20:21:47 +08:00
Barry Oosthuizen
545e415802 MDL-50639 mod_book: Remove 0.8em font sizes 2015-07-17 08:47:07 +01:00
David Mudrák
a81b4cab22 MDL-50673 workshop: Fix some coding style violations 2015-07-16 19:44:06 +02:00
David Mudrák
65ba4cdad2 MDL-50673 workshop: Fix the way how submissions are counted
The count_submissions() method does not take the actual enrolment into
account. It is part of the API that looks on all existing data
regardless the actual status of their owner. The author of the
submission may be unenrolled or suspended, in which case they are not
displayed in the report and we would get wrong figures.
2015-07-16 19:41:16 +02:00
M Kassaei
bfde810a8b MDL-50673 workshop: Display all participants during submission phase
This patch adds a new report to be displayed during the submission
phase. The report displays all participants who are supposed to submit
their work into the workshop and the status of their submission.
2015-07-16 19:21:37 +02:00
Tony Butler
bf7c844e94 MDL-49582 core_lib: Add button to allow user to reset table preferences 2015-07-16 11:39:25 +01:00
pau.ferrer-ocana
6d4088b7e3 MDL-49440 lib: Date picker duplicated week day names repaired
Thanks Marc Català for the patch
2015-07-16 12:38:59 +02:00
Dan Poltawski
e1d4e288ac weekly release 3.0dev 2015-07-16 08:16:15 +01:00
Dan Poltawski
8b11f0db8a Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-07-16 08:16:12 +01:00
sam marshall
aad5b7f1d0 MDL-49434 availability: Revert MDL-49418 (obsoleted by this change)
This reverts commit 51fef1de359439c79fa98bd9ebec19077e66cb57.
2015-07-15 11:43:05 +01:00
sam marshall
c7b738546c MDL-49434 availability: Use renderables for multiple messages
Co-Authored-By: Andrew Nicols <andrew@nicols.co.uk>
2015-07-15 11:43:01 +01:00
Barry Oosthuizen
5f9ff79065 MDL-47230 mod_book: Sub chapter bullet formatting 2015-07-15 09:38:29 +01:00
Marina Glancy
f1aeb61893 MDL-50678 mod_glossary: removed extra login check 2015-07-15 14:08:48 +08:00
AMOS bot
a42a8b6273 Automatically generated installer lang files 2015-07-15 00:05:00 +08:00
Dan Poltawski
82b9551f2d Merge branch 'MDL-49796-master' of git://github.com/jleyva/moodle 2015-07-14 13:01:18 +01:00
Juan Leyva
1c2b788256 MDL-49796 webservices: Fix the functions description 2015-07-14 11:31:57 +02:00
Dan Poltawski
2002b96aea Merge branch 'MDL-37832-M30' of git://github.com/lazydaisy/moodle 2015-07-14 10:14:11 +01:00
Dan Poltawski
0492b93211 Merge branch 'MDL-50270-master' of git://github.com/ankitagarwal/moodle 2015-07-14 08:57:30 +01:00
Dan Poltawski
af78b79a58 Merge branch 'MDL-50814-master' of git://github.com/jleyva/moodle 2015-07-14 08:55:06 +01:00
Dan Poltawski
22c844acf4 Merge branch 'MDL-50711_M30' of git://github.com/lazydaisy/moodle 2015-07-14 08:45:27 +01:00
Marina Glancy
fc55273e0f MDL-50612 grades: remove gradepass if there is no grading 2015-07-14 13:16:34 +08:00
Pierre GUINOISEAU
7dc5dac678 MDL-50612 grades: do not remove grade box if gradepass field exists 2015-07-14 13:16:31 +08:00
Mary Evans
20955a30c3 MDL-37832 theme: Improved "My Moodle" expandable/collapsible caption. 2015-07-14 00:39:43 +01:00
Dan Poltawski
5852140e65 Merge branch 'MDL-50799-master' of git://github.com/merrill-oakland/moodle 2015-07-13 16:08:23 +01:00
Damyon Wiese
b0a583932a MDL-50784 ajax: Require a sesskey for all ajax requests.
This needs to be done before we can expose any webservices that
change state, or return private info to ajax (to prevent CSRF).

Currently there are no webservices exposed to ajax that meet these
criteria - so this issue is to prevent future security issues.
2015-07-13 16:49:06 +02:00
Juan Leyva
d3754a972d MDL-50814 badges: Fix incorrect default ordering 2015-07-13 15:08:22 +02:00
Dan Poltawski
5fceb11e6c Merge branch 'MDL-50806-master' of git://github.com/merrill-oakland/moodle 2015-07-13 13:42:53 +01:00
Dan Poltawski
a1333dd3a3 Merge branch 'MDL-50732_composerFix' of https://github.com/moodlerooms/moodle 2015-07-13 13:41:15 +01:00
Dan Poltawski
218936aecc Merge branch 'MDL-50798-master' of git://github.com/merrill-oakland/moodle 2015-07-13 13:35:14 +01:00
Dan Poltawski
da52ce53b6 Merge branch 'MDL-50800-master' of https://github.com/dkleto/moodle 2015-07-13 13:27:01 +01:00
Ankit Agarwal
d494100ea8 MDL-50270 groups: Properly deprecate old apis 2015-07-13 14:55:38 +05:30
Dan Poltawski
eb2b84d6d2 Merge branch 'master_MDL-49647' of https://github.com/danmarsden/moodle 2015-07-13 10:05:27 +01:00
Juan Leyva
91a12bc64c MDL-49796 assign: Unit texts for view_grading_table 2015-07-13 09:25:24 +02:00
Juan Leyva
e0d6d10a83 MDL-49796 assign: New external function view_grading_table 2015-07-13 09:25:23 +02:00
Adam Riddell
faf01a4f82 MDL-50800 question: Add missing make_answer method
question/type/calculatedmulti/questiontype.php:
        - Add public make_answer method so that apply_attempt_state
          method in qtype_multichoice_base does not cause a fatal
          error when attempting to call make_answer.
2015-07-13 09:54:15 +10:00
Mary Evans
0163c590f3 MDL-50711 theme_bootstrapbase: Added inverse horizontal divider colors. 2015-07-12 02:50:45 +01:00
Eloy Lafuente (stronk7)
9325cd963f weekly release 3.0dev 2015-07-10 18:11:13 +02:00
Eloy Lafuente (stronk7)
188458a604 MDL-50049 deprecation: Extra minor fixes.
- complete and cleanup upgrade.txt
- replace remaining uses in comments.
- fix some incorrect bulk-replacement in previous commit.
2015-07-10 01:59:31 +02:00
Eloy Lafuente (stronk7)
b164e2ec30 Merge branch 'MDL-50049-master' of git://github.com/ankitagarwal/moodle 2015-07-09 20:24:13 +02:00