15565 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
c9f8620492 Merge branch 'MDL-26956' of git://github.com/timhunt/moodle 2013-04-03 13:20:23 +02:00
Tim Hunt
d2e32121b0 MDL-26956 user selector: fix regressions sam caused. 2013-04-03 11:44:23 +01:00
Dan Poltawski
5cc929bc12 Merge branch 'MDL-38691-master-int' of git://github.com/FMCorz/moodle 2013-04-03 16:27:16 +08:00
Damyon Wiese
82b175e868 Merge branch 'w13_MDL-38627_m25_byteservingstop' of git://github.com/skodak/moodle 2013-04-03 15:48:35 +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
David Monllao
060bafefe3 MDL-38823 behat: New behat_form_radio
To deal with radio inputs after allowing
behat_form_field to delegate in specific
fields managers. It also fixes a BIG issue
when calling a no required class.
2013-04-03 13:55:42 +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
Damyon Wiese
29c1fb339d MDL-38016 Theme Bootstrap - Add bootstrap to standard themes list. 2013-04-03 10:26:12 +08:00
David Monllao
d2eca4cd0f MDL-38482 behat: Data generator for system assigns
Chaning also the adapt_ prefix for non-direct
data generator uses to process_ because not all
of behat's data generators would have a lib/testing
data generator to share with phpunit tests.
2013-04-03 10:09:18 +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
David Monllao
a8a4849518 MDL-38482 behat: Allow frontpage course role assigns
There are no enrolment plugins at frontpage
course level.
2013-04-03 09:43:10 +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
Damyon Wiese
594d66c27e MDL-38840 Statslib - Fix failing unit tests on ci server (DST change) 2013-04-02 16:47:04 +02:00
Dan Poltawski
15c2b2c43a Merge branch 'MDL-26956' of git://github.com/timhunt/moodle 2013-04-02 19:49:02 +08: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
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
Dan Poltawski
ec6089f07b Merge branch 'MDL-38455-master-int' of git://github.com/FMCorz/moodle 2013-04-02 14:53:28 +08:00
Eloy Lafuente (stronk7)
a5efbe6161 Merge branch 'MDL-38814_master' of git://github.com/dmonllao/moodle 2013-04-02 03:30:30 +02:00
Eloy Lafuente (stronk7)
51cae58998 Merge branch 'MDL-38689_master' of git://github.com/dmonllao/moodle 2013-04-02 02:41:44 +02:00
Eloy Lafuente (stronk7)
3e27548431 Merge branch 'MDL-38620_master' of git://github.com/dmonllao/moodle 2013-04-02 02:26:54 +02:00
Marina Glancy
d1f8c1bd62 MDL-38708 Added course overview files (most often images) to courses 2013-04-02 11:08:21 +11:00
Marina Glancy
09ae7ee031 MDL-37009 Deprecated all courses display functions that are not used any more
print_my_moodle(), print_remote_course(),
  print_remote_host(), print_whole_category_list(), print_category_info(), get_course_category_tree(),
  print_courses(), print_course(), get_category_courses_array(), get_category_courses_array_recursively()
2013-04-02 10:58:24 +11:00
Marina Glancy
43e389eabf MDL-37009 Created functions in core_course_renderer to display courses and categories listings 2013-04-02 10:54:48 +11:00
Marina Glancy
a8d683ca8e MDL-37009 function print_course_search() is moved to deprecatedlib.php 2013-04-02 10:54:48 +11:00
Eloy Lafuente (stronk7)
12879418e9 Merge branch 'MDL-38823_master' of git://github.com/dmonllao/moodle
Conflicts:
	mod/forum/tests/behat/behat_mod_forum.php
2013-04-02 01:47:40 +02:00
Eloy Lafuente (stronk7)
23726a43d4 Merge branch 'MDL-38805_master' of git://github.com/dmonllao/moodle 2013-04-02 01:45:43 +02:00
Eloy Lafuente (stronk7)
62eb5c466e MDL-38547 behat: coding style fixes. 2013-04-01 22:40:50 +02:00
Eloy Lafuente (stronk7)
54e48dc32d Merge branch 'MDL-38547_master' of git://github.com/dmonllao/moodle 2013-04-01 22:32:06 +02:00
Eloy Lafuente (stronk7)
c57c57c575 Merge branch 'MDL-38499_master' of git://github.com/dmonllao/moodle 2013-04-01 22:23:58 +02:00
Eloy Lafuente (stronk7)
0251a62500 Merge branch 'MDL-38486_master' of git://github.com/dmonllao/moodle 2013-04-01 22:17:12 +02:00
Eloy Lafuente (stronk7)
68adfee6d4 Merge branch 'MDL-38788_master' of git://github.com/dmonllao/moodle 2013-04-01 13:17:20 +02:00
Eloy Lafuente (stronk7)
b216376811 Merge branch 'MDL-38787_master' of git://github.com/dmonllao/moodle 2013-04-01 13:12:08 +02:00
David Monllao
7bc7625e04 MDL-38823 behat: Make default form field manage different HTML elements 2013-04-01 17:51:54 +08:00
David Monllao
3a4d76ac3d MDL-38805 behat: Externalized behat_form_field loader 2013-04-01 12:32:25 +08:00
David Monllao
5bc64b0fab MDL-38814 behat: Deleting old files 2013-04-01 12:22:43 +08:00
David Monllao
cd7ea8f0cc MDL-38788 behat: Generic form elements interaction compatibile with JS disabled 2013-04-01 11:18:33 +08:00
David Mudrák
2459758b30 MDL-38509 Mark the new installaddon admin tool as the standard plugin 2013-03-28 11:54:05 +01:00
David Mudrák
b8efcb9233 MDL-38509 Implement new plugin_manager::plugintype_name()
This has exactly the same behaviour as the existing
plugintype_name_plural() method, but returns the singular form of the
plugin type (such as 'Activity module').
2013-03-28 11:54:05 +01:00
David Mudrák
ce1a0d3cd8 MDL-38509 Implement new plugin_manager::get_plugin_types()
This new method just takes the result of the core get_plugin_types() and
re-orders the plugin types in the same way as they are displayed at the
Plugins overview screen.
2013-03-28 11:54:05 +01:00
sam marshall
d953b18495 MDL-26956 (2) Forms: Function to render form to string
Previously it was only possible to display the form immediately as
HTML output. You had to wrap in an output buffer in order to put
it in a renderer. This new function does the output buffer for you.
2013-03-28 10:46:33 +00:00
sam marshall
b2ec866fc7 MDL-26956 (1) Library: Move search SQL function to datalib
This function used to be in the user selector, but it is useful in
other areas where we want to search for users as it handles a number
of search options (including extra fields, etc.) and returns SQL
which can be included in a joined query.

A unit test has been added to check the results of these searches.
2013-03-28 10:45:12 +00:00
David Monllao
eff79d5378 MDL-38787 behat: Move to the new Javascript-based test class manager 2013-03-28 16:59:18 +08:00
David Monllao
60054942ec MDL-38689 behat: Steps definitions to compare DOM nodes position inside the DOM 2013-03-28 14:41:41 +08:00
Damyon Wiese
9ee29404be Fix permissions 2013-03-28 14:36:33 +08:00
David Monllao
e62f1b3b63 MDL-38620 behat: Modified upload_users.csv fixture
Including course and group enrolments
2013-03-28 11:19:09 +08:00
David Monllao
ba097b8253 MDL-38619 behat: New test
According to MDLQA-1445, an administrator
can upload users to a cohort.
2013-03-28 11:17:33 +08:00