mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
60,157 Commits 36 Branches 519 Tags
Commit Graph

60157 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damyon Wiese
6fb437b2bb Merge branch 'MDL-38705' of git://github.com/jonof/moodle 2013-04-03 14:35:12 +08:00
Damyon Wiese
dcf6318515 MDL-26644 Course - Version bump for upgrade script. 2013-04-03 14:32:19 +08:00
Damyon Wiese
7bf602d9d3 Merge branch 'MDL-26644-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
 2013-04-03 14:32:11 +08:00
Dan Poltawski
dc4260d918 Merge branch 'MDL-38681-master-int' of git://github.com/FMCorz/moodle 2013-04-03 14:27:08 +08:00
Dan Poltawski
ac8bc0f947 Merge branch 'MDL-34640' of git://github.com/timhunt/moodle 2013-04-03 13:57:02 +08:00
Dan Poltawski
ba98c8ab54 Merge branch 'MDL-38855_master' of git://github.com/dmonllao/moodle 2013-04-03 12:44:05 +08:00
Dan Poltawski
f27be4c1aa Merge branch 'MDL-37602-workshop-overall-feedback' of git://github.com/mudrd8mz/moodle 2013-04-03 12:30:12 +08:00
Damyon Wiese
178652e9eb MDL-10516 Question Type - Fix upgrade code so new install matches upgrade. 2013-04-03 12:21:04 +08:00
Damyon Wiese
25f6019128 MDL-10516 Question Type - Essay - Whitespace fix 2013-04-03 11:30:42 +08:00
Jean-Michel Vedrine
60527d0c34 MDL-10516 Pre-populated answer (template) in essay questions 2013-04-03 11:30:42 +08:00
Dan Poltawski
eed5bb7468 MDL-38509 Version bump for plugins installation 2013-04-03 11:29:56 +08:00
Dan Poltawski
6833c6d901 Merge branch 'MDL-38509-tool-installaddon' of git://github.com/mudrd8mz/moodle 2013-04-03 11:28:49 +08:00
David Monllao
238a6572c9 MDL-38855 blocks: Fix missing setType calls 2013-04-03 11:11:01 +08:00
Damyon Wiese
686730243e MDL-38016 Theme Bootstrap: Fix for unit tests undefined variable 2013-04-03 10:58:23 +08:00
Damyon Wiese
29c1fb339d MDL-38016 Theme Bootstrap - Add bootstrap to standard themes list. 2013-04-03 10:26:12 +08:00
Damyon Wiese
d9df063e3a MDL-38016 Theme Bootstrap - Whitespace in Moodle .less files 2013-04-03 10:02:55 +08:00
Dan Poltawski
0bcdbb7ff1 Merge branch 'MDL-38735' of git://github.com/stronk7/moodle 2013-04-03 09:59:01 +08:00
Dan Poltawski
89cc9816dc Merge branch 'MDL-38538_clean' of git://github.com/timhunt/moodle 2013-04-03 09:55:21 +08:00
Damyon Wiese
c985d1217c MDL-38016 Theme Bootstrap - Add license information to lib/thirdpartylibs.xml 
Also minor formatting cleanup.
 2013-04-03 09:43:18 +08:00
Bas Brands
8903b17b01 MDL-38016 Themes - Add a bootstrap theme to core 
This theme has been contributed by:
Bas Brands <bmbrands@gmail.com>
David Scotson <david.scotson@glasgow.ac.uk>
Michael Aherne <michael.aherne@strath.ac.uk>
Stuart Lamour <thisismyrice@gmail.com>

Thanks for your hard work.
 2013-04-03 09:43:18 +08:00
Eloy Lafuente (stronk7)
636376947c Merge branch 'MDL-38738-master' of git://github.com/danpoltawski/moodle 2013-04-03 03:17:08 +02:00
Eloy Lafuente (stronk7)
5ae69b2aed MDL-38735 backup: add missing setType() to forms 2013-04-03 02:17:40 +02:00
David Mudrák
3e6a8aeb7c MDL-38509 Unify curl class usage in the add-on installer tool 
Both classes using cURL features now access it via the core curl wrapper
class. Credit goes to Dan Poltawski for spotting the previous discrepancy
during the integration review.
 2013-04-02 23:11:01 +02:00
Eloy Lafuente (stronk7)
a2f667472e Merge branch 'm25_MDL-38790_Missing_setType_in_My_private_files_form' of https://github.com/scara/moodle 2013-04-02 21:06:21 +02:00
Eloy Lafuente (stronk7)
991dcb1b82 Merge branch 'MDL-38690_master' of git://github.com/dmonllao/moodle 2013-04-02 21:01:52 +02:00
Eloy Lafuente (stronk7)
d3f422bdc1 Merge branch 'MDL-38687_master' of git://github.com/dmonllao/moodle 2013-04-02 20:46:05 +02:00
Eloy Lafuente (stronk7)
80430739d9 Merge branch 'MDL-38785_master' of git://github.com/dmonllao/moodle 2013-04-02 20:41:00 +02:00
Eloy Lafuente (stronk7)
a534e06e47 Merge branch 'MDL-38616_master' of git://github.com/dmonllao/moodle 2013-04-02 18:35:41 +02:00
Tim Hunt
d122fe3245 MDL-38538 question autosave: fix missing method. 
Also change the unit tests to detect this problem.
 2013-04-02 16:53:25 +01:00
David Mudrák
c9c4d0b24e MDL-38509 Fix false unit test failures in the add-on installer 
Previously, the testable validator's get_plugintype_location() used to
return path to a directory that itself did not need to be writable. This
was causing false failures. This patch reimplements the testable
validator's get_plugintype_location() method so that it returns a path
inside $CFG->tempdir which is always writable.

Also, to make all test methods consistent, all of them now use the
testable_tool_installaddon_validator class. Before this patch, some test
methods used the testable class and some used the parent class.
 2013-04-02 16:58:12 +02:00
Damyon Wiese
594d66c27e MDL-38840 Statslib - Fix failing unit tests on ci server (DST change) 2013-04-02 16:47:04 +02:00
Eloy Lafuente (stronk7)
871da25a40 Merge branch 'MDL-38622_master' of git://github.com/dmonllao/moodle 2013-04-02 15:51:17 +02:00
David Monllao
08aa2c3b81 MDL-38549 behat: New tests 
Group mode activity icons toggle group
mode correctly. According to MDLQA-1603,
MDLQA-1604, MDLQA-1605, MDLQA-1606
and MDLQA-1607
 2013-04-02 15:46:38 +02:00
Eloy Lafuente (stronk7)
c9a66fc2b5 MDL-38811 behat: whitespace fixes 2013-04-02 15:45:19 +02:00
David Monllao
46ef87c535 MDL-38811 behat: New test 
According to MDLQA-1564, a teacher can
indent items on the course page
 2013-04-02 15:44:05 +02:00
Eloy Lafuente (stronk7)
7fb5b7fae1 Merge branch 'MDL-38548_master' of git://github.com/dmonllao/moodle 2013-04-02 15:25:19 +02:00
Dan Poltawski
881afa48bf MDL-38821 enrol_paypal: fix cost param type 2013-04-02 20:05:39 +08:00
Dan Poltawski
6842ab4455 Merge branch 'MDL-38821_master' of git://github.com/dmonllao/moodle 2013-04-02 19:54:46 +08:00
Dan Poltawski
15c2b2c43a Merge branch 'MDL-26956' of git://github.com/timhunt/moodle 2013-04-02 19:49:02 +08:00
Tim Hunt
0e0a980631 MDL-26956 enrol form: add missing setType calls. 2013-04-02 11:57:12 +01:00
Dan Poltawski
73b8f191cc MDL-35073 badges: fix xmldb editor diff 
Tut tut tut!
 2013-04-02 16:30:42 +08:00
Dan Poltawski
eee20b123b Merge branch 'wip-mdl-38344' of git://github.com/rajeshtaneja/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-04-02 16:23:44 +08:00
Damyon Wiese
cc067484a8 Merge branch 'MDL-38711-master' of git://github.com/danpoltawski/moodle 2013-04-02 16:17:25 +08:00
Damyon Wiese
5423f9a0af Merge branch 'MDL-38712-master' of git://github.com/danpoltawski/moodle 2013-04-02 16:14:44 +08:00
Dan Poltawski
899fd9372f Merge branch 'master_MDL-38715' of git://github.com/danmarsden/moodle 2013-04-02 16:11:01 +08:00
Damyon Wiese
2188a69799 MDL-35073 Badges - Set of minor fixes for issues found during integration 2013-04-02 15:55:21 +08:00
Yuliya Bozhko
278065528a MDL-35073 badges: Open badges integration 
The badges feature allows to integrate Mozilla "Open Badges" to issue, assign,
manage and display digital badges in Moodle. This feature supports:
-- badge creation and issuing based on criteria
-- badge baking and verification service
-- direct pushing of internal badges to external backpack
-- interanl and external badge display in Moodle
-- Moodle block to display latest badges
 2013-04-02 15:49:02 +08:00
David Monllao
1ad8902820 MDL-38821 enrol_self: Fixing setType missing calls 2013-04-02 15:39:44 +08:00
David Monllao
eeb6c4ace8 MDL-38821 enrol_paypal: Fixing setType missing calls 2013-04-02 15:37:21 +08:00
David Monllao
361c4da2fb MDL-38821 enrol_manual: Fixing setType missing calls 2013-04-02 15:37:11 +08:00