mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-02 06:52:36 +02:00
Code Issues Projects Releases Wiki Activity
59,193 Commits 36 Branches 528 Tags
Commit Graph

59193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
93a2d4e1a6 Merge branch 'MDL-37858_master' of git://github.com/dmonllao/moodle 2013-02-19 10:33:50 +08:00
Damyon Wiese
0c4ba06047 MDL-29938 Version bump for webservices. 2013-02-19 10:31:25 +08:00
Damyon Wiese
ebb1385c39 Merge branch 'MDL-29938-master' of git://github.com/mouneyrac/moodle 2013-02-19 10:10:48 +08:00
Dan Poltawski
858b3a2487 Merge branch 'MDL-37997-muc-stats-display' of git://github.com/mudrd8mz/moodle 2013-02-18 16:17:06 +08:00
Dan Poltawski
35b5c04f0b Merge branch 'MDL-38039_master' of git://github.com/lazydaisy/moodle 2013-02-18 15:59:48 +08:00
Dan Poltawski
9c70147d54 Merge branch 'MDL-31983-master' of git://github.com/FMCorz/moodle 2013-02-18 15:54:22 +08:00
Frederic Massart
dd1c2f5a02 MDL-31983 navigation: Renaming the Settings block to Administration 
AMOS BEGIN
 CPY [administration,core],[pluginname,block_settings]
AMOS END
 2013-02-18 15:48:12 +08:00
Damyon Wiese
74f3d44d37 Merge branch 'MDL-37687_comments_ajax_fix' of git://github.com/nebgor/moodle 2013-02-18 14:51:50 +08:00
Dan Poltawski
69898d6b9a Merge branch 'MDL-37396' of git://github.com/rwijaya/moodle 2013-02-18 14:22:02 +08:00
Dan Poltawski
3672b3b9b0 Merge branch 'MDL-36380-master' of git://github.com/FMCorz/moodle 2013-02-18 14:18:25 +08:00
Damyon Wiese
82a6332837 Merge branch 'MDL-37939-m' of https://github.com/andrewnicols/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-02-18 13:35:36 +08:00
Rossiani Wijaya
62a973cef0 MDL-37396 Enrollmen: pass $perpage as optional_param and set default perpage variable in quickenrolment.js 2013-02-18 13:22:07 +08:00
Dan Poltawski
93d5dc1c03 Merge branch 'MDL-35336' of git://github.com/rwijaya/moodle 2013-02-18 12:23:51 +08:00
Dan Poltawski
32c3446fab Merge branch 'MDL-37337-master' of git://github.com/damyon/moodle 2013-02-18 12:00:45 +08:00
Dan Poltawski
219faacc33 MDL-35622 - fix crazy character causing upgrade problems 
Can you see it?!
 2013-02-18 11:55:29 +08:00
Dan Poltawski
28d72ad973 Merge branch 'MDL-35622-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-02-18 11:31:07 +08:00
Dan Poltawski
8450149249 Merge branch 'MDL-34800_ajax_submit' of git://github.com/andyjdavis/moodle 2013-02-18 11:07:28 +08:00
Damyon Wiese
7866b094cb MDL-37683 cache: - Comments cleanup and remove ;; 2013-02-18 10:35:31 +08:00
Rossiani Wijaya
4be3ed4b3d MDL-37396 User Enrollment: fixed missing user from enrolment sub-menu 2013-02-18 10:28:23 +08:00
Rossiani Wijaya
17b57ec881 MDL-35336 report (course overview): check the setting for enablestats before printing out the node for setting > site admin > reports 2013-02-18 10:21:53 +08:00
Rossiani Wijaya
2975c3429e MDL-35336 Report (course overview): fixed redirect url to enable statistics setting page when statistics is disable 2013-02-18 10:21:53 +08:00
Damyon Wiese
cd747874a4 Merge branch 'wip-MDL-37683-m25' of git://github.com/samhemelryk/moodle 2013-02-18 09:30:47 +08:00
Sam Hemelryk
7634410b6e MDL-37683 cache: improved indentifier collection and storage 2013-02-18 10:20:02 +13:00
Sam Hemelryk
e0d9b7c0d4 MDL-37683 cache: siteidentifier is now included in the keys 2013-02-18 08:32:03 +13:00
Andrew Robert Nicols
3f61e4cbf3 MDL-37939 Course: Add additional unit tests to confirm that module move occurs correctly 2013-02-15 21:28:50 +00:00
Andrew Robert Nicols
59a0ba3bdc MDL-37939 Course: Correct broken sequence data 2013-02-15 21:28:33 +00:00
Frederic Massart
304baba01a MDL-36380 stats: No more duplicated entries when viewing monthly stats 2013-02-15 15:02:54 +08:00
David Monllao
ee7447a9f4 MDL-37858 behat: Testing the step arguments replacements 2013-02-15 13:38:14 +08:00
David Monllao
b08b0a2875 MDL-37858 behat: Arguments transformations 
To remove the escape characters and to
replace var names for nasty strings
 2013-02-15 13:38:14 +08:00
David Monllao
110761997a MDL-37858 testing: Adding nasty strings generator 2013-02-15 13:38:14 +08:00
David Monllao
02ca6219a6 MDL-37858 behat: Removing fixStepArgument 
It can be managed by a @Transform in
a centralized way
 2013-02-15 13:38:14 +08:00
David Monllao
9305c29f35 MDL-37912 behat: Use text area if there is no html editor 2013-02-15 13:37:14 +08:00
Frederic Massart
ebd9ae6523 MDL-31983 navigation: Move reports from Navigation to Settings 2013-02-15 13:06:26 +08:00
Damyon Wiese
b0da618b61 MDL-37337 Assignment: Restructure assignment settings screen to make it "wieldy" 2013-02-15 11:26:21 +08:00
Jerome Mouneyrac
85e6bf8e71 MDL-29938 throw exception when a criteria is repeated, used self instead classname when possible, return only not deleted users 2013-02-15 11:03:13 +08:00
Eloy Lafuente (stronk7)
9e7e1b1c9e MDL-38040 Clean core from CRLFs 2013-02-15 02:13:32 +01:00
Mary Evans
6e8f7688cc MDL-38039 theme_base: Corrected typo fickering to flickering in CSS comment which blocked IPCOP browser firewall in IE. 2013-02-15 00:48:08 +00:00
David Monllao
10dd80c2ac MDL-38029 behat: Cleaning caches before each test 2013-02-14 16:33:33 +08:00
Damyon Wiese
1dd6835d8c weekly release 2.5dev 2013-02-14 13:46:04 +08:00
Damyon Wiese
f22bc6d963 Fix permissions 2013-02-14 13:43:58 +08:00
Damyon Wiese
082685e2de Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2013-02-14 13:37:48 +08:00
AMOS bot
ca3ee769e1 Automatically generated installer lang files 2013-02-14 00:49:54 +00:00
Dan Poltawski
583b20abd7 Merge branch 'MDL-37883-master' of git://github.com/damyon/moodle 2013-02-13 15:47:27 +08:00
Damyon Wiese
7688a3191c MDL-37883 Assignment Grade import/export. Additional fix to prevent different grade rounding on export. 2013-02-13 15:33:10 +08:00
Damyon Wiese
6e59159387 Merge branch 'MDL-37750_master-add-seconds' of git://github.com/dmonllao/moodle 2013-02-13 15:04:51 +08:00
David Monllao
cd65dc3220 MDL-37750 behat: More time for AJAX-related actions 
When we want to assert against data coming
from an AJAX request with 1 second we don't
have enough time to ensure the elements are
loaded
 2013-02-13 13:19:56 +08:00
Dan Poltawski
733c17694d MDL-30637 - fix padding on show/collapse arrow 2013-02-13 11:44:26 +08:00
AMOS bot
731bea1b3b Automatically generated installer lang files 2013-02-13 00:45:39 +00:00
Eloy Lafuente (stronk7)
6033723098 Merge branch 'MDL-37598-abort-after-config' of git://github.com/mudrd8mz/moodle 2013-02-12 22:49:05 +01:00
David Mudrák
08caae5b22 MDL-37997 Improve the display of MUC caches used in the footer 
Cache stores with no hits and some misses are highlighted in red. Caches
stores with some hits but more misses are highlighted in yellow.
Otherwise (more hits than misses) the stores are highlighted in green.
 2013-02-12 22:27:55 +01:00