mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
72,920 Commits 36 Branches 519 Tags
Commit Graph

72920 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Elbert
d83318f19f MDL-49638 login: Wrong location of reCAPTCHA on signup page 2015-04-07 08:35:19 -04:00
Eloy Lafuente (stronk7)
1d3fd63f97 weekly release 2.9dev 2015-04-02 11:48:43 +02:00
Eloy Lafuente (stronk7)
ac84f1f457 NOBUG: Fixed file access permissions 2015-04-02 11:48:43 +02:00
Dan Poltawski
8eba1ea977 Merge branch 'MDL-46805-scorm-last-fix' of git://github.com/dmonllao/moodle 2015-04-02 11:09:31 +02:00
David Monllao
0adf7044ff MDL-46805 mod_scorm: Re-fix as previous object was removed in 2.8 2015-04-02 11:09:30 +02:00
Rajesh Taneja
e43bf473fa MDL-46805 scorm: Set user_id if scorm|aiccuserid config is set 2015-04-02 11:09:29 +02:00
Ankit Agarwal
7ceee32454 MDL-49330 webservices: Fix get_course_notes api 2015-04-02 11:09:25 +02:00
Marina Glancy
f79747171d MDL-46960 completion: trigger event after clearing cache 2015-04-02 11:08:22 +02:00
Rajesh Taneja
345c6a1ac0 MDL-49513 behat: Updated step name to match new step 2015-04-02 11:08:21 +02:00
Eloy Lafuente (stronk7)
31f5ee4a34 MDL-48887 auth: added new hook to upgrade notes. 2015-04-02 11:08:20 +02:00
Brendan Heywood
bf08e3f94c MDL-48887 An auth plugin hook enabling removal of redundant redirects 
This introduces a new hook allowing an auth plugin to redirect to an
external login page directly without redundant redirects to the standard
login page first, or where possible to authenticate the user and simply
continue loading the page without any redirects. For some protocols such
as SAML reducing the number of redirects to the bare minimum greatly
speeds up the login process on high latency networks.
 2015-04-02 11:08:20 +02:00
Eloy Lafuente (stronk7)
be5743f655 Merge branch 'MDL-49330-master' of git://github.com/jleyva/moodle 2015-04-02 11:08:18 +02:00
Eloy Lafuente (stronk7)
82cf09885c Merge branch 'MDL-49686-master' of git://github.com/merrill-oakland/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
 2015-04-02 11:08:11 +02:00
Andrew Nicols
df15759724 Merge branch 'wip-mdl-49513' of https://github.com/rajeshtaneja/moodle 2015-04-02 11:06:27 +02:00
Eloy Lafuente (stronk7)
299469d08c Merge branch 'MDL-49314-master' of git://github.com/jleyva/moodle 2015-04-02 11:06:26 +02:00
Juan Leyva
1d3e954630 MDL-49606 webservices: Use correct item null value for files in summary 2015-04-02 11:06:25 +02:00
Juan Leyva
4dfef5e9ef MDL-49453 webservices: Validate section number (exists and visibility) 2015-04-02 11:06:24 +02:00
Eloy Lafuente (stronk7)
605324fb10 Merge branch 'MDL-49330-master' of git://github.com/jleyva/moodle 
Conflicts:
	lib/db/services.php
	version.php
 2015-04-02 11:06:20 +02:00
Eloy Lafuente (stronk7)
3b2e6aec62 MDL-49314 webservices: Version bump 2015-04-02 11:06:07 +02:00
Eloy Lafuente (stronk7)
f8da6281a0 Merge branch 'MDL-49314-master' of git://github.com/jleyva/moodle 2015-04-02 11:06:02 +02:00
David Monllao
120dee7a1a MDL-49481 theme_bootstrapbase: Fix responsive margin-top 2015-04-02 11:05:45 +02:00
Dan Poltawski
62d94d17d0 Revert "Merge branch 'MDL-37864' of https://github.com/serega1394/moodle" 
This reverts commit 19ffcbe273171ea9e2d3f0974e99de2ea10c2d7e, reversing
changes made to 2112dd44e87092d5b760e7c4f91db3cdd8fb1c35.
 2015-04-02 11:05:45 +02:00
David Monllao
ee366cf907 Merge branch 'MDL-49587' of git://github.com/mike-grant/moodle 2015-04-02 11:05:43 +02:00
David Monllao
72457d7a72 Merge branch 'MDL-49481' of git://github.com/aolley/moodle 2015-04-02 11:05:42 +02:00
Dave Cooper
3004a92332 MDL-49534 libraries: Removed pear/HTTP/WebDav 2015-04-02 11:05:42 +02:00
Eloy Lafuente (stronk7)
b485fb20dd Merge branch 'MDL-49693-master' of git://github.com/merrill-oakland/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
 2015-04-02 11:05:32 +02:00
Juan Leyva
d4fdd3a1b0 MDL-49330 core_notes: Fixed unit tests (broken in postgres) 2015-04-01 13:02:25 +02:00
Juan Leyva
ea2f0e3e87 MDL-49314 webservices: Fix unit tests for handling hidden activities 2015-04-01 12:22:08 +02:00
Costantino Cito
12068d65cb MDL-49330 core_notes: Unit tests for get_course_notes 2015-04-01 10:44:45 +02:00
Costantino Cito
9857381dc3 MDL-49330 core_notes: New external function core_notes_get_course_notes 2015-04-01 10:44:45 +02:00
Juan Leyva
9cd1093c33 MDL-49314 webservices: Check groups using groups_user_groups_visible 2015-04-01 10:21:17 +02:00
Juan Leyva
aa5faf0070 MDL-49314 groups: Unit tests for groups_user_groups_visible 2015-04-01 10:19:26 +02:00
Juan Leyva
c616c5f145 MDL-49314 groups: New API function groups_user_groups_visible 2015-04-01 10:19:26 +02:00
Juan Leyva
f578820b3b MDL-49314 webservices: Unit tests for the new external function 2015-04-01 10:19:25 +02:00
Juan Leyva
604afeff1c MDL-49314 webservices: Add the new function to the mobile service 
The commit also include some clean-up
 2015-04-01 10:19:25 +02:00
Costantino Cito
5f2406c94a MDL-49314 webservices: New WS get_activities_completion_status 2015-04-01 10:19:25 +02:00
Rajesh Taneja
bed97c39eb MDL-49513 behat: Set admin config using php api 
Added a new set to set config using set_config() api
to make steps faster and more efficient
 2015-04-01 14:25:23 +08:00
David Monllao
7c5dbf0396 Merge branch 'MDL-49453-master' of git://github.com/jleyva/moodle 
Conflicts:
	lib/db/services.php
 2015-04-01 11:59:33 +08:00
David Monllao
a647e1f053 Merge branch 'MDL-49502-master' of git://github.com/jleyva/moodle 
Conflicts:
	lib/db/services.php
 2015-04-01 11:49:31 +08:00
David Monllao
0005ce8e4b Merge branch 'MDL-49520-master' of git://github.com/gurgus/moodle 2015-04-01 11:13:28 +08:00
Andrew Nicols
2b53b13ff7 MDL-49627 core: Update uses of generate_image_thumbnail 
This removes the need to write tempfiles in these locations.
 2015-04-01 11:05:19 +08:00
Andrew Nicols
b7067f065e MDL-49627 core: Improve thumbnail generation 
We now abstract the actual file generation to a new function.
We are then able to call this function from the other image generation
sources. This allows us to generate thumbnails in a more efficient manner.

* Stored files stay as stored files and are not temporarily re-written to
  disk;
* Strings containing an image remain as a variable and are not temporarily
  written to disk; and
* Arbitrary files are not captured to string.
 2015-04-01 11:05:19 +08:00
David Monllao
47d333857d Merge branch 'MDL-23296-master' of git://github.com/FMCorz/moodle 2015-04-01 10:41:41 +08:00
David Monllao
4d9dda2389 Merge branch 'MDL-40992' of git://github.com/timhunt/moodle 2015-04-01 08:00:43 +08:00
Eloy Lafuente (stronk7)
e025f20995 Merge branch 'wip-mdl-48605' of https://github.com/rajeshtaneja/moodle 2015-04-01 01:09:25 +02:00
Dan Poltawski
f31c4f27f3 Merge branch 'MDL-49617-master' of git://github.com/jleyva/moodle 2015-03-31 20:10:27 +01:00
Dan Poltawski
2c92e06106 Merge branch 'MDL-49518-master' of git://github.com/gurgus/moodle 2015-03-31 20:04:54 +01:00
Dan Poltawski
19ffcbe273 Merge branch 'MDL-37864' of https://github.com/serega1394/moodle 2015-03-31 19:53:46 +01:00
Damyon Wiese
2112dd44e8 MDL-49578 TinyMCE: Update to 3.5.11 2015-03-31 19:38:53 +01:00
Dan Poltawski
3d8b835aec Merge branch 'MDL-49564-master' of git://github.com/merrill-oakland/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
 2015-03-31 19:25:10 +01:00