mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
65,392 Commits 36 Branches 519 Tags
Commit Graph

65392 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Ankit Agarwal
164931570f MDL-40040 events: Add blog events 
Added blog_entries_viewed
Added blog_association_created
 2013-12-02 12:06:32 +08:00
Dan Poltawski
466aa44471 Merge branch 'w49_MDL-43106_m27_doublecookie' of https://github.com/skodak/moodle 2013-12-02 11:58:01 +08:00
Damyon Wiese
8d68ea7233 Merge branch 'MDL-43018-master' of git://github.com/andrewnicols/moodle 2013-12-02 11:23:46 +08:00
Dan Poltawski
10c12c94a8 Merge branch 'wip-MDL-40191-master' of git://github.com/marinaglancy/moodle 2013-12-02 11:19:41 +08:00
Dan Poltawski
9a7de39d7a Merge branch 'MDL-43068' of git://github.com/timhunt/moodle 2013-12-02 11:11:07 +08:00
Damyon Wiese
ecfbb657f3 Merge branch '43033-27' of git://github.com/samhemelryk/moodle 2013-12-02 09:33:39 +08:00
Sam Hemelryk
c619d3d48d Merge branch 'MDL-42876-master' of git://github.com/mouneyrac/moodle 2013-12-02 14:04:09 +13:00
Sam Hemelryk
12539749f4 Merge branch 'MDL-42918' of git://github.com/rwijaya/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-12-02 13:44:05 +13:00
Sam Hemelryk
f2d7e2dca9 Merge branch 'MDL-42951-master' of git://github.com/FMCorz/moodle 2013-12-02 10:52:11 +13:00
Sam Hemelryk
06ef842707 Merge branch 'wip-mdl-33618' of https://github.com/rajeshtaneja/moodle 2013-12-02 10:35:46 +13:00
Sam Hemelryk
1e9f4c98e3 MDL-43033 cache: added stats logging to set_many methods 2013-12-02 09:30:04 +13:00
Sam Hemelryk
e28a953996 MDL-43033 cache: fixed display of definition stores in admin interface 2013-12-02 09:30:03 +13:00
Sam Hemelryk
d31fd615eb MDL-43033 cache: added a warning icon for mappings 
We now show a warning icon with an explanatory alt if the user
has mapped a store as a mode default that doesn't not fulfill the
requirements of every known definition.
 2013-12-02 09:30:03 +13:00
Sam Hemelryk
bf77c0b273 MDL-43033 cache: fixed mode map event invalidation scenario 2013-12-02 09:30:03 +13:00
Sam Hemelryk
6dbe2df208 MDL-43033 cache: added stats logging to get_many methods 2013-12-02 09:30:03 +13:00
Petr Škoda
226991e9fe MDL-43106 fix double cookies on first access 2013-11-29 15:47:16 +08:00
Dan Poltawski
9b37cd72a2 weekly release 2.7dev 2013-11-29 12:52:39 +08:00
Dan Poltawski
4f42752d70 Merge branch 'install_master' of git://git.moodle.org/moodle-install 2013-11-29 12:52:35 +08:00
Eloy Lafuente (stronk7)
4942801c39 Merge branch 'MDL-42957-master' of https://github.com/jamiepratt/moodle 
Conflicts:
	question/classes/statistics/questions/calculator.php
	question/classes/statistics/responses/analyser.php
 2013-11-28 12:44:04 +01:00
James Pratt
7d6b28d87a MDL-42957 (3) quiz statistics : removing assertEquals(time(), ..) tests 2013-11-28 17:57:02 +07:00
James Pratt
487e7e6602 MDL-42957 (2) quiz statistics : Hardcoded sql LIMIT clause 
Fixing some typos and adding some tests.
 2013-11-28 17:13:26 +07:00
AMOS bot
4be2c1b812 Automatically generated installer lang files 2013-11-28 09:12:39 +00:00
Frederic Massart
74c4405b8a MDL-42951 curl: Re-organise Unit Tests in smaller chunks 2013-11-28 12:14:13 +08:00
Frederic Massart
102230b23c MDL-42951 curl: Always keep the last headers of a request 2013-11-28 12:00:42 +08:00
Tim Hunt
1c73df9eea MDL-43068 course&gradebook: show/hide cm & CONTROLS_GRADE_VISIBILITY 
Making a quiz visible on the course page, of via the settings form,
could cause the grade item to become visible in the gradebook, even
though the quiz supports FEATURE_CONTROLS_GRADE_VISIBILITY to ensure
that when the grades are hidden in the quiz settings, they do not appear
in the gradebook.

Now, if a module supports FEATURE_CONTROLS_GRADE_VISIBILITY, then
set_coursemodule_visible calls the _grade_item_update callback to update
the grade item(s).

In addition, there was a bug when saving the quiz form, where it used
the value of $cm->visible from the database, which was wrong if the
value of cm->visible had just been changed on the setting form.
 2013-11-27 17:40:40 +00:00
Dan Poltawski
ab47c758d1 MDL-42942 behat: increment version 2013-11-27 11:33:11 +08:00
Dan Poltawski
eeb6b7847b Merge branch 'MDL-42942_master' of git://github.com/dmonllao/moodle 2013-11-27 11:32:23 +08:00
Andrew Nicols
19d97d6b15 MDL-43018 JavaScript: Correct joining of multiple minified JS 
When minifiying JS, unnecessary semi-colons are removed - this includes the
trailing semi-colon.

Since we join multiple files together after minification, we need to add an
additional semi-colon in this situation to produce valid JavaScript.
 2013-11-27 09:33:14 +08:00
AMOS bot
4729051593 Automatically generated installer lang files 2013-11-27 00:48:23 +00:00
Sam Hemelryk
8d5a9d6ec1 Merge branch 'wip-MDL-42508-master' of git://github.com/marinaglancy/moodle 2013-11-27 12:36:02 +13:00
Eloy Lafuente (stronk7)
51e9d69af2 Merge branch 'master_MDL-43045' of git://github.com/totara/moodle 2013-11-26 21:27:35 +01:00
Damyon Wiese
e359857e41 Merge branch 'wip-MDL-43008-master' of git://github.com/abgreeve/moodle 2013-11-26 16:56:20 +08:00
Adrian Greeve
b404b1f41c MDL-43008 calendar: Allow calendar plugins to display setting pages. 2013-11-26 15:44:57 +08:00
Dan Poltawski
bb29677965 Merge branch 'MDL-43000' of git://github.com/timhunt/moodle 2013-11-26 15:05:42 +08:00
Dan Poltawski
2bc34d6528 Merge branch 'MDL-40741_master' of git://github.com/dmonllao/moodle 2013-11-26 14:52:21 +08:00
Dan Poltawski
fb9c770d8d Merge branch 'MDL-42851' of git://github.com/rwijaya/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-11-26 14:48:21 +08:00
Dan Poltawski
6ac888c5f2 Merge branch 'wip-MDL-43006-master' of git://github.com/marinaglancy/moodle 2013-11-26 13:24:02 +08:00
rwijaya
e94d023225 MDL-42918: fixed fullscreen width for multichoice answers editor 2013-11-26 12:21:51 +08:00
Dan Poltawski
c9ed9e5662 Merge branch 'MDL-42733_master' of git://github.com/dmonllao/moodle 2013-11-26 12:09:45 +08:00
David Monllao
5df9e40cec MDL-40741 behat: Changing xpaths for clean theme 
Keeps compatibility with standard theme.
 2013-11-26 11:41:13 +08:00
Marina Glancy
4fd2a16e35 MDL-40191 navigation: do not throw an error if activity is not visible 
navigationlib is not the place to check it, let the page itself decide what to do in this case
 2013-11-26 13:54:19 +11:00
Damyon Wiese
46b9d1bec6 Merge branch 'master-mdl42998' of https://github.com/tlock/moodle 2013-11-26 10:49:32 +08:00
David Monllao
e2d7379682 MDL-42842 behat: Adding a new formatter 
Based on ProgressFormatter, the site info
will be displayed when the suite begins.
 2013-11-26 10:48:58 +08:00
David Monllao
7514c2f282 MDL-42842 testing: Generalization of the site info 2013-11-26 10:48:29 +08:00
Dan Poltawski
01db5af468 Merge branch 'MDL-43050_master' of git://github.com/dmonllao/moodle 2013-11-26 10:42:04 +08:00