mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-19 23:20:09 +01:00
Code Issues Projects Releases Wiki Activity
82,926 Commits 36 Branches 527 Tags
Commit Graph

82926 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
facf039a00 MDL-57557 boost: allow any type of popover 2017-02-17 14:05:29 +00:00
Dan Poltawski
9ec952f237 weekly release 3.3dev 2017-02-16 08:14:32 +00:00
Dan Poltawski
3129b28a28 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-02-16 08:14:28 +00:00
Dan Poltawski
1fff8332cf Merge branch 'wip-MDL-4782-fix' of https://github.com/marinaglancy/moodle 2017-02-16 07:51:02 +00:00
Marina Glancy
024d120ffc MDL-4782 install: add major db change version 2017-02-16 09:28:29 +08:00
David Monllao
c181f152d7 MDL-57697 survey: Remove unexisting param 2017-02-15 11:02:02 +01:00
David Monllao
759a70d32e Merge branch 'MDL-57697-master' of git://github.com/danpoltawski/moodle 2017-02-15 11:00:55 +01:00
Dan Poltawski
bdad6c4a99 MDL-57697 mod_survey: clean up data passing to js 
Get rid of the ugly huge array passed to JS as it went over our debug
limit.

(It's a cleaner solution and we get rid of one globals hack.. I just was
avoiding doing to many changes in the original patch, because this whole
interface is not very usable and needs rethinking)
 2017-02-15 09:51:16 +00:00
Eloy Lafuente (stronk7)
2ea3a89aa2 Merge branch 'wip-mdl-57030-fix' of https://github.com/rajeshtaneja/moodle 2017-02-15 10:38:08 +01:00
Eloy Lafuente (stronk7)
c362c351de Merge branch 'MDL-57896-master-clicfg' of git://github.com/mudrd8mz/moodle 2017-02-15 10:33:36 +01:00
David Mudrák
00eeb686bf MDL-57896 admin: Prevent cfg.php from trying to change hard-set value 
Credit goes to Andrew Nicols for spotting and suggesting this check.
 2017-02-15 09:23:02 +01:00
Rajesh Taneja
52d1697c12
MDL-57030 behat: Save run status after execution 2017-02-15 10:16:09 +08:00
Eloy Lafuente (stronk7)
bad6e880b2 Merge branch 'MDL-53991_m33v4' of https://github.com/sbourget/moodle 2017-02-14 18:12:39 +01:00
Eloy Lafuente (stronk7)
afd3eb9e11 Merge branch 'wip-mdl-57030' of https://github.com/rajeshtaneja/moodle 2017-02-14 16:30:39 +01:00
David Monllao
ab1058247c MDL-56122 editpdf: Fix ghostscript checking 2017-02-14 13:45:21 +01:00
Dan Poltawski
c3998beb3f Merge branch 'MDL-57810-nginx-buffers' of https://github.com/brendanheywood/moodle 2017-02-14 11:20:37 +00:00
Dan Poltawski
898f227f40 Merge branch 'MDL-46375-master' of git://github.com/andrewnicols/moodle 2017-02-14 10:34:39 +00:00
David Monllao
2fe4261efd Merge branch 'wip-MDL-4782-master-3' of https://github.com/marinaglancy/moodle 2017-02-14 10:00:32 +01:00
David Monllao
ccaf17855e Merge branch 'MDL-56122-master' of https://github.com/lucisgit/moodle 2017-02-14 09:53:22 +01:00
Dan Poltawski
518f42f5f9 Merge branch 'wip-mdl-55476' of https://github.com/rajeshtaneja/moodle 2017-02-14 08:40:07 +00:00
Marina Glancy
3f9503468f MDL-4782 course: Behat tests for stealth mode support 2017-02-14 16:38:08 +08:00
Marina Glancy
8341055eb4 MDL-4782 course: Allow activities in the "stealth" mode 
Add field 'visibleoncoursepage' to the course_modules table
Add site-wide setting for turning on stealth mode availability
Add callback for "stealth" mode support in the course formats
Change display of modules/sections availability on the course page
 2017-02-14 16:38:05 +08:00
Rajesh Taneja
30536aaadb
MDL-55476 auth: Fixed missing double quote in template 2017-02-14 16:19:20 +08:00
Marina Glancy
4b6728e431 MDL-4782 course: substitute YUI with AMD and rest.php with calling WS 2017-02-14 15:57:33 +08:00
Marina Glancy
4529327a22 MDL-4782 course: new WS for section and module editing 2017-02-14 15:57:33 +08:00
Marina Glancy
28ac3a54b9 MDL-4782 availability: new template for course display 2017-02-14 15:57:33 +08:00
Marina Glancy
084c2ef1ef MDL-4782 course: swap availability info and description 2017-02-14 15:57:32 +08:00
Damyon Wiese
dd7de4ea82 MDL-57766 assign: Put back the manual marker filter 
I removed too much from gradingtable.php in the last patch.
 2017-02-14 10:16:56 +08:00
Andrew Nicols
0c03db6a32 MDL-46375 core_files: Correct filename in mbz test 
I noticed during the file system abstraction that this test was
incorrect.

Since both $storagefalse, and $storagetrue are in the same context,
component, area, itemid, and folder, the fact that they had the same
filename meant that they constantly overwrote one another.

As part of archive_to_storage, existing files in the same location are
found, the files themselves deleted, and the existing file record in the
files table is deleted.

The tests continued to pass because:
* the existing variables were not affected by the deletion of the file
  record and file so the comparisons were successful; and
* subsequent calls to fetch the content of the file meant that the
  files themselves were restored from the trash directory.
 2017-02-14 08:42:28 +08:00
Andrew Nicols
16a34ae189 MDL-46375 core_files: Split parts of file_storage into new file system 
This change moves all operations which deal with the fetching/updating, or
setting of files from the file_storage class into a new file_system class.

A new file_system can be specified in the config.php and used to replace
all relevant methods in order to move the file system component to an
alternative solution.
 2017-02-14 08:42:28 +08:00
Eloy Lafuente (stronk7)
846d899329 Merge branch 'MDL-57868-master' of git://github.com/jleyva/moodle 2017-02-13 23:37:39 +01:00
Eloy Lafuente (stronk7)
369df31150 Merge branch 'MDL-57708-master' of git://github.com/merrill-oakland/moodle 2017-02-13 23:32:35 +01:00
Eloy Lafuente (stronk7)
a2c0fff9d1 Merge branch 'MDL-57687-master' of git://github.com/danpoltawski/moodle 2017-02-13 19:14:22 +01:00
Tony Butler
63a117dcb2 MDL-56122 assignfeedback_editpdf: Add test assertions for pdf generation 2017-02-13 17:27:24 +00:00
Tony Butler
fecfb4c6fb MDL-56122 assignfeedback_editpdf: Regenerate PDF & page images if blank 2017-02-13 17:23:42 +00:00
Eloy Lafuente (stronk7)
8b1af72760 Merge branch 'MDL-57890-master' of git://github.com/dpalou/moodle 2017-02-13 17:53:37 +01:00
Eloy Lafuente (stronk7)
11db8fe2b9 Merge branch 'MDL-57896-master-clicfg' of git://github.com/mudrd8mz/moodle 2017-02-13 17:41:02 +01:00
Dan Poltawski
cb00816610 Merge branch 'MDL-56841' of https://github.com/andrewhancox/moodle 2017-02-13 16:22:34 +00:00
B Krishnan Iyer
5c3e1eedb7 MDL-57354 output: Render continue button as a primary button. 2017-02-13 15:50:52 +00:00
Dan Poltawski
7322592606 MDL-55476 block_login: fix whitespace 2017-02-13 15:32:36 +00:00
Dan Poltawski
69723d002b Merge branch 'MDL-57752_tracksessionip' of git://github.com/davosmith/moodle 2017-02-13 13:53:10 +00:00
Dan Poltawski
f5af2e6866 Merge branch 'MDL-55476-master' of git://github.com/jadet23/moodle 2017-02-13 13:41:13 +00:00
Dan Poltawski
b747a90082 Merge branch 'MDL-57768-webservice-config-error' of https://github.com/ilya-catalyst/moodle 2017-02-13 13:28:37 +00:00
David Monllao
43e890aabe Merge branch 'MDL-57697-master' of git://github.com/danpoltawski/moodle 2017-02-13 13:19:39 +01:00
David Monllao
815ce88f44 Merge branch 'MDL-57766-master' of git://github.com/damyon/moodle 2017-02-13 10:12:14 +01:00
Davo Smith
a2f1c5c39a MDL-57752 session: fix check_security() session termination 2017-02-13 07:54:02 +00:00
Marina Glancy
a572272768 MDL-50770 blocks: remove orphaned block positions 2017-02-13 15:18:51 +08:00
Marina Glancy
34c9d28e62 MDL-50770 blocks: copy sitewide blocks positions when cloning dashboards 2017-02-13 15:17:09 +08:00
AMOS bot
55bbbfafe7 Automatically generated installer lang files 2017-02-11 00:11:06 +08:00
Ilya Tregubov
1138af352a MDL-57768 webservice: Delete manual setting of config in test 2017-02-10 11:49:09 +11:00