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

4420 Commits

Author SHA1 Message Date
Marina Glancy
efbd56960c MDL-51215 course: redirect to manage appropriate category 2015-08-27 11:13:06 +08:00
David Monllao
d2999f8085 Merge branch 'MDL-50391-master' of git://github.com/aspark21/moodle 2015-08-19 18:30:28 +02:00
David Monllao
fd76204a8b Merge branch 'MDL-51100-master' of git://github.com/andrewnicols/moodle 2015-08-17 08:50:49 +08:00
Andrew Nicols
711b1d6b3e MDL-51100 behat: Remove javascript tag from usermenu steps 
These tests only needed the javascript tag because of the user menu.
Now that issue has been resolved, they do not need it.

Note: Some were also not using the singleselect feature, so would fail
without changes to use this too as they were not handling proper selection
of the singleselect element.
 2015-08-14 08:52:29 +08:00
Marina Glancy
3bacf558d1 MDL-50391 format_singleactivity: fix activity_has_subtypes() 2015-08-13 14:13:02 +01:00
Eloy Lafuente (stronk7)
20c50b0d5c Merge branch 'MDL-50062-master' of git://github.com/FMCorz/moodle 2015-08-12 01:52:04 +02:00
Marina Glancy
7f0c7f01c0 MDL-51062 behat: permission steps should work without js 2015-08-09 20:33:27 +08:00
Frederic Massart
5419cbc9eb MDL-50062 grades: Carry agg. settings between categories when possible 2015-08-06 10:24:25 +08:00
Dave Cooper
135efd5116 MDL-50062 gradebook: Fixed behaviour when changing aggregation mathods. 2015-08-06 10:24:25 +08:00
Dan Poltawski
4cb1a61f81 Merge branch 'MDL-50535_master' of git://github.com/markn86/moodle 2015-07-28 13:14:24 +01: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
Mark Nelson
7080b38f2e MDL-50535 core_course: disabled 'gradepass' field when no ratings set 2015-07-24 13:31:18 -07:00
Dan Poltawski
d44ae46632 Merge branch 'wip-MDL-50612-master' of https://github.com/marinaglancy/moodle 2015-07-20 10:12:16 +01:00
Juan Leyva
1c2b788256 MDL-49796 webservices: Fix the functions description 2015-07-14 11:31:57 +02:00
Marina Glancy
fc55273e0f MDL-50612 grades: remove gradepass if there is no grading 2015-07-14 13:16:34 +08:00
Pierre GUINOISEAU
7dc5dac678 MDL-50612 grades: do not remove grade box if gradepass field exists 2015-07-14 13:16:31 +08: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
Dan Poltawski
f79860257a MDL-50749 js: add some TODOs to some small hacks 2015-07-07 08:48:32 +01:00
Charles Fulton
8d1cdd0139 MDL-50749 course: add fake element for behat compatibility 2015-07-03 18:43:46 +00:00
Tyler Bannister
7f7144fd50 MDL-47787 course: Added question delete to cm delete. 2015-06-25 16:35:22 -04:00
Dan Poltawski
bceaa941c8 Merge branch 'MDL-49959_course_dnd_message' of https://github.com/barrysspace/moodle 2015-06-18 07:13:39 +02:00
Barry Oosthuizen
a3657f8b42 MDL-49959 course: Fix hidden drag and drop message 2015-06-09 09:37:53 +01:00
Eloy Lafuente (stronk7)
d4d1b2b5a3 Merge branch 'MDL-50394_master' of git://github.com/markn86/moodle 2015-06-08 18:32:45 +02:00
Mark Nelson
9758da6ed5 MDL-50394 core_course: fixed form validation of 'gradepass' 2015-06-02 23:31:46 -07:00
Eloy Lafuente (stronk7)
2426d816fe Merge branch 'MDL-49901_master' of https://github.com/jinhofer/moodle 2015-06-02 19:57:38 +02:00
David Mudrák
01f329babe MDL-50318 course: Fix the URL of embedded images at resources overview 
Not only mod_resource instances are listed here. All modules that
declare their FEATURE_MOD_ARCHETYPE as MOD_ARCHETYPE_RESOURCE (well, all
but those without own view page, such as mod_label) are listed. So we
must use the real plugin name when rendering the intro field.
 2015-05-21 17:23:25 +02:00
Rajesh Taneja
53cf1a4149 MDL-50259 behat: Use strict activity name checking 
contains might select wrong activity
so using strict activity text checking
 2015-05-19 14:20:05 +08:00
Dan Poltawski
57fc76ab92 Merge branch 'MDL-50102' of git://github.com/stronk7/moodle 2015-05-06 10:50:35 +01:00
Marina Glancy
46be1d58ac MDL-49718 externallib: unittest correction 2015-05-06 13:00:56 +08: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
John Okely
4887d15228 MDL-49983 navigation: Remove 'my' from user context navigation 2015-05-04 12:38:50 +08:00
Adrian Greeve
12261113a9 MDL-49888 navigation: Added missing reports to user profile. 
Added statistics and grade to the reports section in the user
profile.
 2015-04-28 14:30:26 +08:00
Andrew Nicols
b3b6588262 Merge branch 'MDL-34921_master_unwanted-sitehome-redirects' of https://github.com/colin-umn/moodle 2015-04-23 11:49:16 +08:00
Simey Lameze
e35bac3e80 MDL-49854 core: User navigation refinements 
Fixing some reported issues:
- Removing unnecessary conditional include
- Require login in grade/report/mygrades.php
- Remove unnecessary defined('MOODLE_INTERNAL') call
- Fixing context_header::__construct $imagedata param type
 2015-04-21 11:46:32 +08:00
Andrew Nicols
bd305d3dcb Merge branch 'wip-mdl-49799-m' of https://github.com/rajeshtaneja/moodle 2015-04-20 12:22:18 +08:00
Mark Nelson
595b911a98 MDL-48187 core_course: use updated '$grade_item' 2015-04-19 20:30:21 -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
jinhofer
253db9dea7 MDL-49901 course/yui: Changed action for course format 2015-04-16 14:22:17 -05:00
David Monllao
89a6290fb9 Merge branch 'MDL-45131-master' of git://github.com/jleyva/moodle 2015-04-16 17:04:34 +08:00
Juan Leyva
bdf9f4d41c MDL-45131 course: Add validation for returned parameters in WS tests 2015-04-16 10:25:24 +02:00
Rajesh Taneja
f53688e289 MDL-18309 behat: Fixed navigating to edit profile 2015-04-16 07:12:47 +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
Dan Poltawski
0627d5802c Merge branch 'wip-MDL-45774-master' of git://github.com/abgreeve/moodle 2015-04-14 15:32:13 +08:00
Andrew Nicols
b0f08eaa03 Merge branch 'MDL-44611-Automate-MDLQA-5252' of https://github.com/ramdesh/moodle 2015-04-13 10:26:03 +08:00
Damyon Wiese
46a2fbc4b7 MDL-49412 Navigation: Remaining behat fixed for nav branch 
Behat is passing after this change.

Part of MDL-45774.
 2015-04-10 17:19:28 +08:00
Adrian Greeve
c699310c40 MDL-49412 behat: Updates to course behat tests. 
Part of MDL-45774
 2015-04-10 17:18:22 +08:00
Adrian Greeve
45367bdf0c MDL-49688 navigation: First review fixes and version bump. 
Part of MDL-45774.
 2015-04-10 17:18:03 +08:00