mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-06-03 06:35:57 +02:00
Code Issues Projects Releases Wiki Activity
74,414 Commits 37 Branches 536 Tags
Commit Graph

667 Commits

Author SHA1 Message Date
Helen Foster
ce2c0f3a74 MDL-51148 lang: Merge English strings from the en_fix language pack 2015-08-26 16:46:43 +02:00
Simey Lameze
dcee0b9447 MDL-49360 core_lib: add new method get_local_referer() 
This commit also replace all usages of $_SERVER['HTTP_REFERER'] and get_referer().
 2015-07-27 11:11:24 +08:00
Eloy Lafuente (stronk7)
b758ab3053 MDL-50183 upgrade: add 2.9.0 separation line to all upgrade scripts 2015-05-12 00:21:05 +02:00
Dan Poltawski
57fc76ab92 Merge branch 'MDL-50102' of git://github.com/stronk7/moodle 2015-05-06 10:50:35 +01:00
Andrew Nicols
43ef409276 Merge branch 'MDL-49985_master' of git://github.com/markn86/moodle 
Conflicts:
	mod/forum/post.php
 2015-05-06 11:11:21 +08:00
Eloy Lafuente (stronk7)
26ea380d24 MDL-50102 versions: bump all versions and requires near release 
version = planned 2015051100 release version
requires= current 2015050500 rc1 version

Note: On purpose, the course format social wrong version (2015102100)
has been kept unmodified. Looking forward a solution right now.
 2015-05-05 17:43:19 +02:00
Frederic Massart
b2687a055d MDL-49179 weblib: Secure the direct usage of $_SERVER['HTTP_REFERER'] 2015-05-05 18:31:13 +08:00
Mark Nelson
b3cb726431 MDL-49985 core_course: revert commit belonging to MDL-18309 
This reverts commit 6601690202764d786a5ee4b7bbd9afb5b91dd0ec.

This commit was adding the 'returnurl' param unnecessarily to the
course links in the navigation block, causing a lot of long URLs
to be created.
 2015-05-05 01:09:20 -07:00
Rajesh Taneja
0fe86bbdbb MDL-49799 behat: replaced asd.com with example.com 
asd.com is a valid domain, we should use reserved domain names for testing
 2015-04-20 11:21:20 +08:00
Dan Poltawski
75e20c1845 Merge branch 'wip-MDL-18309-master' of git://github.com/marinaglancy/moodle 2015-04-15 09:54:36 +01:00
Damyon Wiese
221210e9b2 MDL-49412 Behat: Fix behat tests for all of @mod 
This is after the navigation changes for 2.9.

Part of MDL-45774.
 2015-04-10 17:18:23 +08:00
Gregory Zbitnev
6601690202 MDL-18309 Course: enrol/index.php returnurl improvement 
This patch improves usability of enrolment page in case of course is not
enrollable. 'Continue' button now returns student to referring page instead of
main moodle page (as it used to be). To make this improvement, passing correct
returnurl parameter to enrol/index.php page was implemented for links that may
be accessible for not-enrolled students.
 2015-04-10 09:32:31 +08:00
Damyon Wiese
75ece778c5 Merge branch 'MDL-49101' of https://github.com/andrewhancox/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2015-04-07 17:27:17 +08:00
Andrew Hancox
6398ff5387 MDL-49101 core: Add a global admin setting config->requiremodintro 
Removed requiremodintro setting from all core activity plugins and replace
with a single global setting.
Deprecated moodleform_mod::add_intro_editor and replaced with
moodleform_mod::standard_intro_elements
 2015-04-07 10:11:53 +01:00
Tony Butler
74cc07bedf MDL-43770 mod_choice: Add behat scenarios for 'include inactive' option 2015-03-20 09:55:16 +00:00
Tony Butler
799770cbd7 MDL-43770 mod_choice: Add option to include inactive users' responses 2015-03-20 09:55:16 +00:00
Tony Butler
6de3eee04c MDL-43770 mod_choice: Exclude responses from inactive users 2015-03-20 09:55:16 +00:00
Rajesh Taneja
d7fec593f3 MDL-49402 behat: Fixed feature file with same scenario name 
1. We should not have same scanrio name in 1 feature file
   As it doesn't explain what is being tested. So modified.
2. Removed empty line, to keep it consistnet with other features
 2015-03-06 11:47:17 +08:00
Eloy Lafuente (stronk7)
900aa6e5fe Merge branch 'MDL-49328-master' of https://github.com/lucisgit/moodle 2015-03-02 18:12:28 +01:00
Dan Poltawski
add310ab44 Merge branch 'MDL-23273-master' of git://github.com/zbdd/moodle 2015-03-02 09:33:40 +00:00
Tony Butler
d312bb70b4 MDL-49328 mod_choice: Include 'showpreview' field in module backup 2015-02-27 09:46:57 +00:00
Dan Poltawski
86e5b0a707 Merge branch 'MDL-49220-master' of https://github.com/lucisgit/moodle 2015-02-24 16:54:58 +00:00
Tony Butler
f1399fb8e7 MDL-49220 mod_choice: Add behat scenario to test choice preview option 2015-02-24 16:25:18 +00:00
Dan Poltawski
6856894efe Merge branch 'wip_MDL-49184_m29_choice' of https://github.com/skodak/moodle 2015-02-24 10:43:15 +00:00
Zachary Durber
5b83949ad1 MDL-23273 mod_choice: error continue button redirects back to choice 
Locks only occur when a choice is using limits.
 2015-02-24 12:14:15 +08:00
Zachary Durber
e776b415f4 MDL-23273 mod_choice: Using locks to ensure choice limits 2015-02-23 10:47:46 +08:00
Tony Butler
c30dbd69e7 MDL-49220 mod_choice: Add option to allow students to preview choices 2015-02-20 14:27:55 +00:00
Petr Skoda
5fb2315a8b MDL-49184 choice: fix block actions 
The problems was that blocks editing breaks if you redirect
after if (data_submitted()) - all form actions must make sure
it is really their form, otherwise they may hijack the post from
block actions.

Note that this is not a problem for mforms, only legacy forms
are affected.

# Conflicts:
#	mod/choice/view.php
 2015-02-17 17:00:15 +13:00
Stephen Bourget
c04b66a564 MDL-34375 Choice: Display choice on 'my home' 2015-02-13 14:19:55 -05:00
Eloy Lafuente (stronk7)
147bae8f7c MDL-48144 upgrade: add v2.8.0 sep lines 2014-11-10 18:08:15 +01:00
Eloy Lafuente (stronk7)
6fdd4633a7 Merge branch 'MDL-48035-master-enfix' of git://github.com/mudrd8mz/moodle 2014-11-06 11:14:52 +01:00
David Mudrák
6887e2e53e MDL-48035 Fix Behat tests regressions after merging en_fix strings 2014-11-06 10:54:27 +01:00
Dan Poltawski
5a6c9f1cfb Merge branch 'MDL-48021' of git://github.com/stronk7/moodle 
Conflicts:
	admin/tool/monitor/version.php
	mod/lesson/version.php
 2014-11-05 12:11:16 +00:00
Helen Foster
ba033b861e MDL-48035 Merge English strings from the en_fix language pack 2014-11-04 21:55:26 +01:00
Eloy Lafuente (stronk7)
de881693f7 MDL-48021 bump: Bump all versions to planned release 
This bumps all versions to planned 2.8 release
(2014111000) version and all the dependencies to
current 2.8rc1 (2014110400)
 2014-11-04 17:52:35 +01:00
pau.ferrer-ocana
5ea0d026b0 MDL-47875 choice: chat module strings not required from Choice anymore 
AMOS BEGIN
 CPY [chatintro,mod_chat],[description,mod_choice]
AMOS END
 2014-10-30 22:41:23 +01:00
Sam Hemelryk
cbb1677cb9 MDL-3034 mod_choice: minor tidy up 2014-09-25 14:03:52 +12:00
Michael Aherne
54bdf1d406 MDL-3034 choice Support multiple answers 2014-09-25 11:33:55 +12:00
Marina Glancy
634a5c0b81 MDL-45336 choice: removed unused code 
function prepare_choice_show_results() is never called with the 5th argument,
forming of html has been moved to the renderer in MDL-20508, when function
choice_show_results() was transformed into prepare_choice_show_results() but
not all code was deleted from the funciton.
 2014-09-24 01:22:58 +02:00
sam marshall
9c85baa8c5 MDL-44725 Availability: Replace groupmembersonly - FEATURE_xx (6) 
Remove old FEATURE_GROUPMEMBERSONLY as no longer required.
 2014-09-02 13:03:17 +01:00
Marina Glancy
ba9390784d MDL-46691 mod_choice: apply filters to user input 2014-08-15 15:53:10 +08:00
Eloy Lafuente (stronk7)
c45754d840 Merge branch 'MDL-45445_master' of https://github.com/markn86/moodle 2014-06-24 21:54:58 +02:00
Russell Smith
d2c58b95bb MDL-43835 phpunit: Correct unit tests. 
When different ID's are set for each sequence a number
of unit test failures appear.  They have been corrected
to allow unit tests to pass with the new generator in place.
 2014-06-17 19:08:01 +10:00
Mark Nelson
3b0347712a MDL-45445 events: added '(optional)' to event params where applicable 2014-06-12 20:46:58 -07:00
Mark Nelson
1ea5f1e2d3 MDL-45630 events: removed unnecessary 'the' from event descriptions 2014-05-31 15:27:11 -07:00
Eloy Lafuente (stronk7)
f94891cc00 MDL-45503 upgrade: add v2.7.0 sep lines 2014-05-28 01:13:42 +02:00
Eloy Lafuente (stronk7)
538bf99ece MDL-45486 Bump all versions to planned release 
This bumps all versions to planned 2.7 release
(2014051200) version and all the dependencies to
current 2.7rc2 (2014050800)
 2014-05-09 02:12:28 +02:00
Andrew Nicols
02915dfc23 MDL-45357 events: Remove unnecessary the before 'id' in event descriptions 2014-05-06 16:45:05 +08:00
Petr Skoda
8e937d25d0 MDL-45262 remove set_page_detail() leftover from choice report 2014-04-30 15:25:47 +08:00
Mark Nelson
02a5a4b2ff MDL-43557 events: fixed minor issues in existing events 2014-04-29 19:16:11 -07:00