moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
74527 commits 37 branches 540 tags 1.3 GiB
Commit graph

74527 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Monllao
13a2aff3f9 Merge branch 'MDL-49561_master' of git://github.com/markn86/moodle 
Conflicts:
	lib/bennu/readme_moodle.txt
 2015-09-16 09:57:22 +08:00
David Monllao
b3ec8cf95e Merge branch 'MDL-46705-master' of git://github.com/dkns/moodle 2015-09-16 09:44:37 +08:00
David Monllao
04fadbeda4 Merge branch 'MDL-50890_master' of git://github.com/dmonllao/moodle 2015-09-16 09:10:28 +08:00
David Monllao
6bc490e270 MDL-50890 enrol_flatfile: Correcting typo and return 
Would be safer to return nothing, execute methods don't have
a return. I understand this return 2 was inherited from the
previous cron function.
 2015-09-16 09:08:34 +08:00
Jun Pataleta
fd1b399527 MDL-50890 enrol_flatfile: Modifications for compliance with standards 
Also changed the scheduled task to run every hour.
 2015-09-16 09:08:34 +08:00
Troy Williams
a771854c46 MDL-50890 enrol_flatfile: Replace cron processing with scheduled task 
Replace enrolment plugin flatfile cron processing with scheduled task
 2015-09-16 09:08:34 +08:00
Sam Chaffee
5090d26b3a MDL-50936 Atto: Add upgrade path for updating equations setting 2015-09-16 08:24:26 +08:00
Jason Hardin
4f758d7716 MDL-50936 Atto: Add missing math equation buttons 2015-09-16 08:23:20 +08:00
Eloy Lafuente (stronk7)
a4a972285e Merge branch 'MDL-50685_master' of git://github.com/dmonllao/moodle 2015-09-16 02:15:51 +02:00
Eloy Lafuente (stronk7)
7bf83951f9 Merge branch 'MDL-50930-master' of git://github.com/jleyva/moodle 2015-09-16 02:11:12 +02:00
Eloy Lafuente (stronk7)
11fa8ca760 Merge branch 'MDL-49032' of https://github.com/stronk7/moodle 2015-09-16 01:00:03 +02:00
Eloy Lafuente (stronk7)
6aa00dadc6 MDL-49032 lib/bennu: update readme to document the change 2015-09-16 00:53:45 +02:00
Joby Harding
f66cc72387 MDL-49032 lib/bennu: use HTAB only when folding lines 2015-09-16 00:45:51 +02:00
Eloy Lafuente (stronk7)
a9285cd5d4 Merge branch 'MDL-30157_master' of git://github.com/dmonllao/moodle 2015-09-16 00:19:04 +02:00
Eloy Lafuente (stronk7)
62652cdc63 Merge branch 'MDL-50959-master' of git://github.com/lameze/moodle 2015-09-15 23:36:14 +02:00
Eloy Lafuente (stronk7)
4deecee44f Merge branch 'MDL-50892-master' of git://github.com/marinaglancy/moodle 2015-09-15 23:12:22 +02:00
Eloy Lafuente (stronk7)
a16a3592f2 Merge branch 'MDL-50766_master' of git://github.com/dmonllao/moodle 2015-09-15 23:02:25 +02:00
Eloy Lafuente (stronk7)
3c80f01661 MDL-49942 core_course: bump version 2015-09-15 22:53:45 +02:00
Eloy Lafuente (stronk7)
f536f4a77c Merge branch 'MDL-49942-master' of git://github.com/jleyva/moodle 2015-09-15 22:52:13 +02:00
David Monllao
7a3451bc1a MDL-33564 rss: Fixing missing param type 2015-09-15 17:58:05 +08:00
David Monllao
b3434ca51d Merge branch 'MDL-33564-master' of git://github.com/danpoltawski/moodle 
Conflicts:
	lib/upgrade.txt
 2015-09-15 17:56:20 +08:00
David Monllao
3bc0824e46 Merge branch 'MDL-51213-master' of git://github.com/damyon/moodle 2015-09-15 17:28:34 +08:00
David Monllao
b3e8e09175 Merge branch 'MDL-50884-master' of git://github.com/lameze/moodle 2015-09-15 17:15:47 +08:00
David Monllao
224d819678 Merge branch 'MDL-50964-master' of git://github.com/jleyva/moodle 
Conflicts:
	group/tests/externallib_test.php
	lib/db/services.php
 2015-09-15 17:09:33 +08:00
David Monllao
8a08668255 Merge branch 'MDL-50966-master' of git://github.com/jleyva/moodle 2015-09-15 16:58:54 +08:00
David Monllao
d005d71881 MDL-30157 enrol_manual: New option to enrol from now 
We set the new now option as the default one, as other enrol
plugins use it as the default enrolment start date. We are keeping
the default to today on upgrades.
 2015-09-15 16:25:25 +08:00
David Monllao
32f1e17a01 MDL-30157 enrol_manual: Setting proper default 
The wrong default value was working because of count starting from 1.
 2015-09-15 16:25:25 +08:00
Andrew Nicols
1c97055b68 Merge branch 'MDL-50983-master' of git://github.com/junpataleta/moodle 2015-09-15 15:25:46 +08:00
Juan Leyva
740c354f17 MDL-49942 core_course: New Web Service core_course_search_courses 2015-09-15 09:18:26 +02:00
David Monllao
366d350412 Merge branch 'MDL-50921-master' of git://github.com/ryanwyllie/moodle 2015-09-15 14:26:57 +08:00
David Monllao
de5dd7c5c5 MDL-51048 backup: Removing unnecessary var 2015-09-15 13:43:45 +08:00
David Monllao
79167d5fa9 Merge branch 'MDL-51048' of git://github.com/timhunt/moodle 2015-09-15 13:40:55 +08:00
Andrew Nicols
bbbca469ad Merge branch 'MDL-51290-master' of git://github.com/cameron1729/moodle 2015-09-15 13:05:30 +08:00
Damyon Wiese
4093d64332 MDL-50783 ajax: Default for ajax calls to requirelogin=true 2015-09-15 13:01:30 +08:00
David Monllao
785ebcdbe6 Merge branch 'MDL-51008-master' of git://github.com/marinaglancy/moodle 2015-09-15 11:21:22 +08:00
Andrew Nicols
52eaa0ceda Merge branch 'MDL-50982-master' of git://github.com/junpataleta/moodle 2015-09-15 11:01:50 +08:00
David Monllao
d4218943d8 Merge branch 'MDL-51147' of git://github.com/timhunt/moodle 2015-09-15 10:07:55 +08:00
David Monllao
9ff2a265d0 Merge branch 'm30_MDL-51363_Fix_Default_Settings_1x_Restore' of git://github.com/scara/moodle 
Conflicts:
	mod/scorm/version.php
 2015-09-15 09:58:08 +08:00
Andrew Nicols
0b90eb6155 Merge branch 'MDL-50981-master' of git://github.com/junpataleta/moodle 2015-09-15 08:33:06 +08:00
Andrew Nicols
5a191b2f44 Merge branch 'MDL-51017-master' of git://github.com/jleyva/moodle 2015-09-15 08:23:10 +08:00
Matteo Scaramuccia
32c114ca04 MDL-51363 SCORM: fixed default settings on restoring 1.x backups 2015-09-14 23:48:25 +02:00
Cameron Ball
80ef91effa MDL-51290 user: Expand picture section in profile by default 2015-09-14 17:49:48 +08:00
Juan Leyva
22de67f4af MDL-51017 mod_scorm: New WS mod_scorm_get_scorm_attempt_count 2015-09-14 10:55:52 +02:00
David Monllao
742548e251 Merge branch 'wip-mdl-51101' of git://github.com/rajeshtaneja/moodle 2015-09-14 16:18:01 +08:00
Andrew Nicols
ac43dc23e4 Merge branch 'MDL-50783-master' of git://github.com/damyon/moodle 2015-09-14 15:52:42 +08:00
Andrew Nicols
7267daa8d0 MDL-50994 mod_forum: Correct docs for discussion WS 2015-09-14 15:43:26 +08:00
Andrew Nicols
08a4dbfe10 Merge branch 'MDL-50994-master' of git://github.com/jleyva/moodle 2015-09-14 15:40:05 +08:00
Damyon Wiese
88982b71b2 MDL-50783 ajax: Properly deprecate the is_allowed_from_ajax() methods. 2015-09-14 15:10:40 +08:00
Damyon Wiese
ad348cbdf9 MDL-50783 ajax: Add specific check for NO_MOODLE_COOKIES 
If loginrequired is set for a webservice - NO_MOODLE_COOKIES cannot
be true - or it is a coding error.
 2015-09-14 15:10:39 +08:00
Damyon Wiese
ba224fb42c MDL-50783 Ajax: Configure how to call a webservice through db/service.php 
Now the db/service.php array can contain these extra keys to provide information
on how a webservice may be called:

    'ajax' => true (Default is false)

Replaces the xx_is_allowed_from_ajax callback.

    'loginrequired' => false (Default is true)

Means that this webservice can be called through lib/ajax/service-nosession.php
which sets NO_MOODLE_COOKIES to true (faster). This is only safe for webservices returning
static public data (e.g. get_string).
 2015-09-14 15:10:21 +08:00