mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-15 13:10:08 +01:00
Code Issues Projects Releases Wiki Activity
79,305 Commits 36 Branches 523 Tags
Commit Graph

79305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
c5ec7b698b MDL-54671 css: reformat css 2016-07-08 12:54:13 +01:00
Eloy Lafuente (stronk7)
5a1728df39 weekly release 3.2dev 2016-07-07 10:19:49 +02:00
Eloy Lafuente (stronk7)
ffe0699c44 NOBUG: Fixed SVG browser compatibility 2016-07-07 10:19:45 +02:00
Eloy Lafuente (stronk7)
2487a92837 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-07-07 10:19:44 +02:00
Andrew Nicols
aa49ee0f29 Merge branch 'wip-mdl-55043' of https://github.com/rajeshtaneja/moodle 2016-07-07 11:27:58 +08:00
Rajesh Taneja
56c5c9a08a MDL-55043 core_competency: Sort by id to ensure we get expected result. 2016-07-10 11:25:06 +08:00
Andrew Nicols
71f81adce9 Merge branch 'MDL-54869-master' of git://github.com/jleyva/moodle 2016-07-07 10:30:17 +08:00
Eloy Lafuente (stronk7)
9825afd76a Merge branch 'wip-MDL-46682-master' of git://github.com/abgreeve/moodle 2016-07-06 13:50:12 +02:00
Eloy Lafuente (stronk7)
080c1e798b MDL-54934 workshop: ensure "Current phase" is always separated 
Apparently some readers can join 2 adjacent spans completely, simply
adding a whitespace between them prevents that, ensuring separation.,
 2016-07-06 11:30:40 +02:00
Cameron Ball
c30bfed180 MDL-41945 mod_assign: Add empty submission check 2016-07-06 10:07:04 +01:00
Adrian Greeve
3261b9eeea MDL-46682 auth/db: Increase of chunk size and update change. 
The update query was not checking the mnet auth id and could
have been updating the wrong entry.
 2016-07-06 16:41:51 +08:00
Andrew Nicols
9ce2448091 Merge branch 'MDL-54734-master' of git://github.com/lameze/moodle 2016-07-06 15:01:06 +08:00
Andrew Nicols
de374c3df1 Merge branch 'MDL-53495' of https://github.com/mr-russ/moodle 2016-07-06 13:29:18 +08:00
Simey Lameze
ec90722870 MDL-54734 core_user: do not cache dummy user records 2016-07-06 13:07:03 +08:00
Russell Smith
848d212e7a MDL-53495 database xmldb: Ensure field tests use constant. 
Some tests were still using hard coded values which break
if the constants are changed.
 2016-07-06 14:45:00 +10:00
Andrew Nicols
42f7b608ed Merge branch 'MDL-54165-master' of git://github.com/ryanwyllie/moodle 2016-07-06 12:01:51 +08:00
Ryan Wyllie
2441100db9 MDL-54165 mod_assign: Fix doc in grading_events.js 2016-07-06 03:42:25 +00:00
Rajesh Taneja
d44fc20414 MDL-54844 mod_glossary: Don't append AND as it's done later 2016-07-06 11:34:18 +08:00
Andrew Nicols
06d05f461e Merge branch 'MDL-54165-master' of git://github.com/ryanwyllie/moodle 2016-07-06 11:04:40 +08:00
Ryan Wyllie
f6bb3f482d MDL-54165 mod_assign: Collapsible review and grade panel 2016-07-06 02:50:24 +00:00
Andrew Nicols
aa03ced86c MDL-54734 user: Add tests to demonstrate multi-user issues 2016-07-06 09:27:44 +08:00
Adrian Greeve
6c04427daa MDL-54844 mod_glossary: Limiting of glossary searching. 
Searching of the glossary was returning results from all
glossaries on the site. It has now been returned to just
the glossary that you are currently viewing.
 2016-07-06 09:20:32 +08:00
Eloy Lafuente (stronk7)
6e24e529c9 Merge branch 'wip-mdl-55043' of https://github.com/rajeshtaneja/moodle 2016-07-06 03:19:08 +02:00
Jerome Mouneyrac
6f08f36c49 MDL-46682 auth/db: IN clause crashes when too many users to sync 2016-07-06 09:18:41 +08:00
Rajesh Taneja
2648dddd2a MDL-55043 core_competency: Set proper sort order for each field 2016-07-06 08:12:13 +08:00
Eloy Lafuente (stronk7)
a339f0dde0 Merge branch 'wip-mdl-54860-m' of https://github.com/rajeshtaneja/moodle 2016-07-06 01:42:34 +02:00
Rajesh Taneja
25fbce21e7 MDL-54860 behat: Stop execution if setup problem found 2016-07-06 07:27:41 +08:00
Andrew Nicols
6f9ad7e2db MDL-54951 webservice: Add upgrade notes for external_files 2016-07-06 07:23:32 +08:00
Eloy Lafuente (stronk7)
006e2b787a Merge branch 'MDL-54857-master' of git://github.com/jleyva/moodle 2016-07-06 00:03:39 +02:00
Eloy Lafuente (stronk7)
f5be4e3d91 Merge branch 'MDL-54856-master' of git://github.com/jleyva/moodle 2016-07-05 21:18:41 +02:00
Eloy Lafuente (stronk7)
ed2d12a125 Merge branch 'MDL-54955-master' of git://github.com/jleyva/moodle 2016-07-05 21:15:31 +02:00
Eloy Lafuente (stronk7)
8a8e436cf7 Merge branch 'MDL-54800-master' of git://github.com/jleyva/moodle 2016-07-05 21:10:28 +02:00
Eloy Lafuente (stronk7)
6880e350d3 Merge branch 'MDL-54602-master' of git://github.com/jleyva/moodle 2016-07-05 20:59:52 +02:00
Eloy Lafuente (stronk7)
1d44e47cc4 Merge branch 'MDL-54934-master' of https://github.com/nashtechdev01/moodle 2016-07-05 20:44:14 +02:00
Eloy Lafuente (stronk7)
4b7ac6023c Merge branch 'MDL-54867-master' of git://github.com/jleyva/moodle 2016-07-05 20:25:54 +02:00
Eloy Lafuente (stronk7)
e51f7a6a20 Merge branch 'MDL-49244-master' of git://github.com/jleyva/moodle 2016-07-05 20:16:44 +02:00
Eloy Lafuente (stronk7)
efb2517a2f Merge branch 'MDL-54795_master' of https://github.com/snake/moodle 2016-07-05 20:10:33 +02:00
Eloy Lafuente (stronk7)
6b43e964ac MDL-55000 grade: Use correct component names + minor jsdocs 
Note the js_call_amd() call still is using incorrect 'grades'
as component name where it should be core_grades. That will be
fixed by MDL-55133.
 2016-07-05 19:59:24 +02:00
Eloy Lafuente (stronk7)
17695e4b4d Merge branch 'MDL-55000-master' of git://github.com/andrewnicols/moodle 2016-07-05 19:35:56 +02:00
Eloy Lafuente (stronk7)
46da6e14ec Merge branch 'MDL-29738-master' of git://github.com/andrewnicols/moodle 2016-07-05 17:05:28 +02:00
Andrew Nicols
b5233f9bc9 MDL-55000 grade: Convert remaining YUI2 -> AMD 2016-07-05 20:07:46 +08:00
Andrew Nicols
ff3778bf97 MDL-29738 file: Remove unused stylesheet functionality 
This functionality was commented out in
78946b9bdb1299a21f00b88d81c73ad8700c951e for MDL-20204 back in 2009.
Since then it has been wasting cycles performing utterly pointless
preg_match and preg_replace calls.

The decision has been made to deprecate it in stables, and remove it in
3.2.
 2016-07-05 19:31:22 +08:00
Eloy Lafuente (stronk7)
eb3b4893b5 Merge branch 'MDL-55114-master' of git://github.com/andrewnicols/moodle 2016-07-05 12:44:52 +02:00
Eloy Lafuente (stronk7)
5920c233fe Merge branch 'MDL-55113-master' of git://github.com/dpalou/moodle 2016-07-05 12:21:46 +02:00
Dan Poltawski
88dd8edf7b Merge branch 'MDL-54928-master' of git://github.com/dpalou/moodle 2016-07-05 11:20:07 +01:00
Dan Poltawski
27ade02c67 Merge branch 'MDL-54841-master' of https://github.com/nashtechdev01/moodle 2016-07-05 11:06:38 +01:00
Dani Palou
6f2815fa51 MDL-54928 notifications: Add username to emailto users 2016-07-05 10:34:52 +02:00
Juan Leyva
6e7bf3963b MDL-54869 webservice: Fix core_user_add_user_private_files 2016-07-05 09:01:35 +01:00
Juan Leyva
460897052e MDL-54869 files: Create new required functions 
This was a complex change requiring three new functions:
file_merge_files_from_draft_area_into_filearea - To just add files from a draft area into a real one (just adding or updating, not deleting)
file_merge_draft_area_into_draft_area - To merge files from two draft areas, used by the latest for creating a draft area with all the original files plus the new ones.
file_overwrite_existing_draftfile - Required to update existing files not losing metadata or references.

The whole process is the following:

    User uploads a file (upload.php)
    Client gets a new draftid A containing the file only (return of upload.php)
    Client requests to merge that draftid in the user's private files (core_user_add_user_private_files)
    Server prepares a new UNUSED draftid B from existing area
    Server merges A into B
    Server saves the draft B into the final area
 2016-07-05 09:01:34 +01:00
Juan Leyva
d089e4984d MDL-54869 files: Fix file_save_draft_area_files documentation 2016-07-05 08:40:06 +01:00