73898 Commits

Author SHA1 Message Date
Juan Leyva
e9bf301145 MDL-50427 mod_scorm: New Web Service mod_scorm_view_scorm 2015-07-20 09:15:44 +02:00
Juan Leyva
ade341deb2 MDL-50427 mod_scorm: Move logging and completion to new API 2015-07-20 09:13:42 +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
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
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
Eric Merrill
cef7621e30 MDL-50806 questions: Allow more memory when doing a question import 2015-07-09 12:27:32 -04:00
Dan Marsden
d1673b8f6c MDL-49647 mod_scorm: correct escaping of javascript content. 2015-07-09 16:35:20 +12:00
Eric Merrill
a8524f3354 MDL-50799 question: Improve Show all text to be more accurate 2015-07-08 17:17:02 -04:00
Eric Merrill
c7092fe489 MDL-50798 question: Raise time limit when rendering questions
Rendering a large number of questions may be quite slow, so we want to
raise the limit.

We don’t call raise() in the loop because the quiz buffer captures this
function for a AJAX script, and we should only call raise if we expect
a corresponding output to the users browser. This helps to prevent
unexpected load balancer disconnects. See core_php_time_limit::raise()
for more details.
2015-07-08 15:49:10 -04:00
Eloy Lafuente (stronk7)
525dce0ade Merge branch 'MDL-49732_master' of https://github.com/jinhofer/moodle 2015-07-07 19:18:19 +02:00
Eloy Lafuente (stronk7)
17d47fa5aa Merge branch 'MDL-50489-master' of git://github.com/jleyva/moodle 2015-07-07 19:12:12 +02:00
Eloy Lafuente (stronk7)
cc623a384f Merge branch 'MDL-49185-master' of git://github.com/lameze/moodle 2015-07-07 16:59:19 +02:00
Dan Poltawski
6bf2e10e0a MDL-50466 logstore: bump version to load new task definitions 2015-07-07 15:09:28 +01:00
Dan Poltawski
81eaa3400f Merge branch 'MDL-48074_not_in_group' of git://github.com/davosmith/moodle 2015-07-07 10:09:48 +01:00
Dan Poltawski
fae47ac284 Merge branch 'MDL-50466-m' of https://github.com/micaherne/moodle 2015-07-07 09:36:50 +01:00
Dan Poltawski
b4947d16d1 MDL-50653 myprofilelib: fix stray ending dl tag
(That is outputing content, rest of function is not!)
2015-07-07 08:53:38 +01:00
Dan Poltawski
28f2335d61 Merge branch 'MDL-50653' of https://github.com/bmbrands/moodle 2015-07-07 08:52:37 +01:00
Dan Poltawski
f79860257a MDL-50749 js: add some TODOs to some small hacks 2015-07-07 08:48:32 +01:00
Dan Poltawski
da24257a3b Merge branch 'MDL-50749-master' of https://github.com/mackensen/moodle 2015-07-07 08:38:43 +01:00
Charles Fulton
8d1cdd0139 MDL-50749 course: add fake element for behat compatibility 2015-07-03 18:43:46 +00:00
Eloy Lafuente (stronk7)
78ebb3481c Merge branch 'MDL-50757-master' of git://github.com/damyon/moodle 2015-07-03 11:26:18 +02:00
Damyon Wiese
4359caa22b MDL-50757 upgrade: Unset config value that will never be used again 2015-07-03 16:37:54 +08:00
Davo Smith
0c9d8172b5 MDL-48074 enrol: option to filter by users 'not in any group' 2015-07-03 09:35:57 +01:00
Adrian Greeve
316c560cc5 MDL-50757 gradebook: Update fix for pre 2.8 upgrades.
Moodle installations that updated before the 2.8 grade push
were being flagged for a gradebook freeze. This was resulting in
calculated grades being shown as different to how they were
displayed before the upgrade. This fix retains the original
grade value.
2015-07-03 13:13:12 +08:00
Mark Nielsen
a256eddbc3 MDL-50732 testing: Remove repositories from composer 2015-07-02 09:15:41 -07:00
Dan Poltawski
e5eefbbf01 weekly release 3.0dev 2015-07-02 14:25:56 +01:00
Dan Poltawski
5a559cacf1 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-07-02 14:25:53 +01:00