mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-12 20:12:15 +02:00
Code Issues Projects Releases Wiki Activity
74,082 Commits 36 Branches 531 Tags
Commit Graph

74082 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marina Glancy
fc62987c84 MDL-49618 forum: apply format_string 2015-07-09 08:24:08 +08: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
64489778cd MDL-50295 output: prevent 'emoji' arrows 
We need to append U+FE0E VARIATION SELECTOR-15 to the arrow to ensure
our l/rarrows are displayed as text icons, not 'emoji' icons.

See http://unicode.org/reports/tr51/#Diversity for more details of why
this changed in iOS 8.3+.
 2015-07-07 14:26:09 +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
Juan Leyva
039c81f098 MDL-50489 forum: Handle qanda forums in get_forum_discussions_paginated 
I removed the last qanda checks in forum_user_can_see_discussion because they are not necessary and
they make the external function fail.

A user in a qanda forum can always see a discussion (he needs to see the discussion to be able to reply).
What he cannot see are the other user posts unless he has replied to the discussion once and the edition period
(usually 30 minutes) has ended.

Note also that forum_user_can_see_discussion was originally only used when displaying forums in blog format
in order to display the button show more or not, this is the reason this wasn't detected before.
 2015-07-02 10:55:40 +02:00
Marina Glancy
6e4b8381bf MDL-48239 grades: corrected docs url for calculation changes 2015-07-02 15:49:48 +08:00
Marina Glancy
f677ece516 MDL-48239 grades: fix notification class 2015-07-02 15:49:46 +08:00
Adrian Greeve
3f8a714f36 MDL-48239 gradebook: Oracle fix for string compare. 
Update to upgradelib.php where string comparisions cause
phpunit failures in Oracle.
 2015-07-02 12:30:26 +08:00
Eloy Lafuente (stronk7)
3950aa134f Merge branch 'wip-MDL-48239-master' of git://github.com/abgreeve/moodle 2015-07-02 05:42:08 +02:00
Adrian Greeve
6a7c8feb10 MDL-48239 gradebook: Change to calculated grade item min and max. 
Regardless of the setting 'Min and max grades used in calculation'
Calculated grade items will always update the min and max raw grade.
 2015-07-02 11:13:26 +08:00
Adrian Greeve
716c081049 MDL-48239 gradebook: Unit test for upgrade function. 2015-07-02 11:13:25 +08:00
Adrian Greeve
f44ffb724a MDL-48239 gradebook: Behat tests for calculated grade items. 2015-07-02 11:13:25 +08:00
Adrian Greeve
4d4dcc2718 MDL-48239 gradebook: Calculated grades maxgrade now able to be set. 2015-07-02 11:13:25 +08:00
Andrew Hancox
fef51794a0 MDL-48970 groups: Fix hover description on groups overview page 
If a course exists within multiple groupings then the description
should display when you mouseover any instance of it on the overview
page.
 2015-07-01 21:26:48 +01:00
Dan Poltawski
559c0f09bd MDL-39319 langimport: fix language file ordering and trailing whitespace 2015-07-01 11:06:33 +02:00
Dan Poltawski
56420e3664 Merge branch 'MDL-39319-master' of git://github.com/mastnym/moodle 2015-07-01 11:04:37 +02:00
Rajesh Taneja
bc7a59536b MDL-50481 behat: SingleSelect can be urlselect and should support id/name 2015-07-01 10:52:21 +08:00
David Monllao
b4d7038a88 Merge branch 'MDL-50497-M30' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2015-07-01 08:54:28 +08:00
Eloy Lafuente (stronk7)
e96e66aa16 MDL-50130 todo: Conditional code to be changed to API by MDL-50728 2015-06-30 19:56:48 +02:00
Juan Leyva
f804c73055 MDL-50130 users: Filter profile fields data in external functions 2015-06-30 19:52:19 +02:00
AMOS bot
7fd8762479 Automatically generated installer lang files 2015-07-01 00:04:55 +08:00
Dan Poltawski
0b45c56da1 Merge branch 'wip-mdl-50481' of https://github.com/rajeshtaneja/moodle 2015-06-30 12:25:52 +02:00
Dan Poltawski
2606aecc3b Merge branch 'MDL-33765_master_offset' of git://github.com/markn86/moodle 2015-06-30 11:32:47 +02:00
Dan Poltawski
8ce68b0723 Merge branch 'MDL-43949_master' of git://github.com/dmonllao/moodle 2015-06-30 10:34:08 +02:00
Dan Poltawski
1b80849856 Merge branch 'MDL-47787-master' of https://github.com/tbannister/moodle 2015-06-30 09:52:52 +02:00
David Monllao
35af60da7e MDL-50569 backup: Missing get_target call 2015-06-30 10:26:18 +08:00