moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 02:46:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
66038 commits 37 branches 544 tags 1.3 GiB
Commit graph

66038 commits

This branch
This branch
All branches
Author SHA1 Message Date
Damyon Wiese
53741d32a6 Merge branch 'MDL-42962-master' of git://github.com/ankitagarwal/moodle 2013-12-03 15:15:25 +08:00
Damyon Wiese
4c9464ca0d Revert "MDL-39286 Remove link on My Courses settings heading" 
This reverts commit 8b79059480.

Behat is failing with this change.
 2013-12-03 14:59:16 +08:00
Dan Poltawski
6ca388028e Revert "MDL-42932 core_calendar: introduced calendar type system setting" 
This reverts commit bb32a499e1.
 2013-12-03 14:57:10 +08:00
Dan Poltawski
aa8abbee14 Revert "MDL-42932 core_lib: added missing $CFG declaration" 
This reverts commit 4c61097cc7.
 2013-12-03 14:57:08 +08:00
Andrew Nicols
d3f62f2aa3 MDL-42989 JavaScript: Check result of navigation IO requests before reporting errors 
When making a request which fails, we need to ensure that the AJAX query
was not aborted before displaying the error.

This ensures that if the navigation tree is being requested at the same
time as a page load is being processed, the abortion of the AJAX request is
not displayed before the page reloads.
 2013-12-03 14:36:42 +08:00
Ankit Agarwal
e10ea84ed0 MDL-42962 events: Remove duplicate code from all course_module_viewed events 2013-12-03 14:24:32 +08:00
Ankit Agarwal
3c24828823 MDL-42962 events: Add unit tests for the abstract class course_module_viewed 2013-12-03 14:24:31 +08:00
Ankit Agarwal
df2ac49f72 MDL-42962 events: Add a abstract class course_module_viewed 
AMOS BEGIN
 CPY [eventcoursemoduleviewed,core],[eventcoursemoduleviewed,mod_feedback]
AMOS END
 2013-12-03 14:24:31 +08:00
Andrew Nicols
2f13dd98b0 MDL-42989 JavaScript: Do not attempt to expand navigation when opening link 
When clicking on a link which is also expandable, we should not attempt to
expand it.
 2013-12-03 14:20:51 +08:00
Ankit Agarwal
963cdce4e2 MDL-42097 auth: Auth plugins must check passwordurl before returning it 2013-12-03 14:17:42 +08:00
Damyon Wiese
8f49492ac2 Merge branch 'time-limit-fix' of https://github.com/danpoltawski/moodle 2013-12-03 14:17:34 +08:00
Ankit Agarwal
6513cc0376 MDL-42097 formslib: updates to edit profile form 
Add a new dependency 'in' in forms library
Use the 'in' dependency to disable the 'changepassword' field when a auth plugin doesn't support it
 2013-12-03 14:15:16 +08:00
Dan Poltawski
0b2f11dbc3 MDL-42084 lib: fix undefined variable warnings 2013-12-03 14:00:21 +08:00
Dan Poltawski
753eb47edc Merge branch 'wip-mdl-43028' of https://github.com/rajeshtaneja/moodle 2013-12-03 13:45:59 +08:00
Rajesh Taneja
e6e5f43efc MDL-40079 repositories: Added deprecated tags 2013-12-03 13:34:33 +08:00
Rajesh Taneja
7f9a4b35c3 MDL-40079 repositories: Replaced const with configs for boxnet 2013-12-03 13:24:10 +08:00
Damyon Wiese
6b8c6278bc Merge branch 'MDL-43076-master' of git://github.com/phalacee/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-12-03 13:18:47 +08:00
Damyon Wiese
e7af63633e Merge branch 'MDL-43081-master' of git://github.com/danpoltawski/moodle 
Conflicts:
	lib/upgrade.txt
 2013-12-03 13:03:32 +08:00
Dan Poltawski
4ab19f9c71 Merge branch 'wip-mdl-43028' of https://github.com/rajeshtaneja/moodle 2013-12-03 12:52:10 +08:00
Dan Poltawski
ebe051792d Merge branch 'MDL-42738_master' of git://github.com/dmonllao/moodle 2013-12-03 12:41:03 +08:00
Dan Poltawski
03742ae8f9 Merge branch 'MDL-43066_master' of git://github.com/dmonllao/moodle 2013-12-03 12:36:50 +08:00
Damyon Wiese
b3d252a6b4 Merge branch 'wip-mdl-43048' of https://github.com/rajeshtaneja/moodle 2013-12-03 11:43:32 +08:00
Dan Poltawski
cd515a9421 Merge branch 'MDL-42932_master' of https://github.com/markn86/moodle 2013-12-03 11:41:06 +08:00
Mark Nelson
4c61097cc7 MDL-42932 core_lib: added missing $CFG declaration 2013-12-02 19:25:32 -08:00
Damyon Wiese
de3e0d20bd Merge branch 'wip-mdl-42904' of https://github.com/rajeshtaneja/moodle 
Conflicts:
	enrol/self/db/upgrade.php
 2013-12-03 11:10:18 +08:00
Andrew Nicols
69353dcecd MDL-43164 JavaScript: Use the up/down move icon for non-AJAX courses 
When a course format does not support AJAX, or AJAX is disabled at the site
level, we should revert back to the old-style move icon.

This helps to clarify that you cannot drag/drop the icon, but must click
instead.
 2013-12-03 10:49:29 +08:00
Dan Poltawski
8d8e6f9607 Merge branch 'MDL-42932_master' of https://github.com/markn86/moodle 2013-12-03 10:07:10 +08:00
Damyon Wiese
13410584be Merge branch 'MDL-40939-master' of https://github.com/timgus/moodle 
Conflicts:
	filter/tex/version.php
	lang/en/admin.php
 2013-12-03 09:26:58 +08:00
Sam Hemelryk
a59a423926 Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle 2013-12-03 11:12:34 +13:00
Sam Hemelryk
b5fd2497d6 Merge branch 'w48_MDL-41819_m27_maxinputvars' of https://github.com/skodak/moodle 2013-12-03 10:25:26 +13:00
Tim Hunt
b2f1717143 MDL-43093 update repeat_elements PHPdoc. 2013-12-02 17:48:44 +00:00
Damyon Wiese
2a1e730eb3 Merge branch 'wip-MDL-39286-master' of git://github.com/ds125v/moodle 2013-12-02 15:16:12 +08:00
Damyon Wiese
2b267d31c8 MDL-32888: Whitespace fixes (grr) 2013-12-02 15:14:26 +08:00
Damyon Wiese
7363aacb65 Merge branch 'MDL-32888_master' of https://github.com/maitkin-ltu/moodle 2013-12-02 15:01:37 +08:00
Dan Poltawski
6bc8b35add Merge branch 'MDL-42989-master' of git://github.com/andrewnicols/moodle 2013-12-02 14:52:03 +08:00
Marina Glancy
9842e231e8 MDL-42731 block_activity_modules: added behat tests 2013-12-02 17:44:32 +11:00
Marina Glancy
6dfd8325f0 MDL-42731 behat: load 'Site administration' when expanding node in non-javascript mode 2013-12-02 17:44:32 +11:00
Damyon Wiese
cc9651dcae Merge branch 'm27_MDL-43039_SessionDiskFull_False_Positive' of https://github.com/scara/moodle 2013-12-02 14:37:22 +08:00
Andrew Nicols
0bb56f2e31 MDL-42989 Admin: Clean output when building site administration tree for JS 
Previously, any inappropriate whitespace found whilst building the admin
tree caused a JSON error and for the site administration tree retrieval to
fail.

This change ensures that access to the site administration tree is unbroken
for non-developers, whilst still alerting developers that there is an
issue.
 2013-12-02 14:28:37 +08:00
Dan Poltawski
4b9e9fcb01 Merge branch 'MDL-42969-master' of git://github.com/mouneyrac/moodle 2013-12-02 14:23:48 +08:00
David Monllao
677b2e79f1 MDL-41592 general: Also checking the site path 2013-12-02 14:18:10 +08:00
David Monllao
7f7a91e4ce MDL-41592 behat: Config settings more flexible 
Adding the option to just set ->behat_wwwroot to
allow switching to the behat test site.
 2013-12-02 14:18:10 +08:00
Aaron Barnes
cc2691a7bb MDL-41592 behat: Allow alt wwwroot to be set for acceptance testing 
To set add $CFG->behat_wwwroot = 'http://alturl'; in your config.php
 2013-12-02 14:18:10 +08:00
David Monllao
e7c71c448b MDL-42627 behat: Moving the deprecated method to behat_deprecate and updating scenarios 2013-12-02 14:13:17 +08:00
David Monllao
c3a40deab7 MDL-42627 behat: New steps definitions class for deprecated steps 2013-12-02 14:13:17 +08:00
David Monllao
0e825e5dd4 MDL-43066 behat: Checking that the site is not already installed 2013-12-02 14:10:57 +08:00
Damyon Wiese
bd3811f1b4 MDL-43018 Fix unit tests for minify changes. 2013-12-02 12:52:01 +08:00
Damyon Wiese
df68e73824 Merge branch 'MDL-40040-master' of git://github.com/ankitagarwal/moodle 2013-12-02 12:16:59 +08:00
Ankit Agarwal
6b36411587 MDL-40040 Cleanup some blog methods and replace add_to_log 
Cleaned up add_association()
cleaned up add_associations()
Replaced remaining add_to_log() in blogs with events
 2013-12-02 12:06:32 +08:00
Ankit Agarwal
cf0116db07 MDL-40040 events: Add unit tests for blog events 2013-12-02 12:06:32 +08:00