15531 Commits

Author SHA1 Message Date
Petr Škoda
b1c5c4a887 MDL-38750 show errors at the end of OCI setup script
Credit goes to Damyon Wiese.
2013-04-07 19:44:46 +02:00
Dan Poltawski
1a90b9b6dc fix permissions 2013-04-05 17:56:05 +08:00
Dan Poltawski
2916ca61be MDL-35073 badges: fix incorrect fk name
Good spotting Damyon!
2013-04-05 15:47:15 +08:00
Dan Poltawski
bdc518b507 MDL-35073 badges: fix duplicate indexes 2013-04-05 15:27:32 +08:00
Eloy Lafuente (stronk7)
577173a51f Merge branch 'MDL-38897-master' of git://github.com/danpoltawski/moodle 2013-04-05 03:21:52 +02:00
Andrew Robert Nicols
b0fb4c12d7 MDL-38667 JavaScript: Don't use -min files for YUI CSS 2013-04-04 17:18:56 +02:00
Aparup Banerjee
37240ce5c6 Merge branch 'wip-MDL-38708-master' of git://github.com/marinaglancy/moodle
Conflicts:
	version.php
2013-04-04 15:07:01 +08:00
Dan Poltawski
b7d20148a1 MDL-38897 formslib: add unit tests for setType debugging 2013-04-04 14:59:21 +08:00
Dan Poltawski
48056d5459 MDL-38885 - don't test for setType in display() itself
Doing it in _process_submission is enough.
2013-04-04 14:58:14 +08:00
David Monllao
b82e0c17fb MDL-38691 behat: Fixing behat tests 2013-04-04 13:52:24 +08:00
Damyon Wiese
200571507f Merge branch 'wip-MDL-37009-master' of git://github.com/marinaglancy/moodle 2013-04-04 11:22:20 +08:00
Damyon Wiese
b38f932abf Merge branch 'MDL-38823_master-fix' of git://github.com/dmonllao/moodle 2013-04-04 10:34:50 +08:00
Eloy Lafuente (stronk7)
33871fbf3e Merge branch 'MDL-38751-master' of git://github.com/FMCorz/moodle 2013-04-04 01:07:23 +02:00
Eloy Lafuente (stronk7)
896efbeadb Merge branch 'MDL-38756-m' of git://github.com/andrewnicols/moodle 2013-04-03 21:59:18 +02:00
Eloy Lafuente (stronk7)
6b117438b9 Merge branch 'MDL-38482_master' of git://github.com/dmonllao/moodle 2013-04-03 16:48:42 +02:00
Eloy Lafuente (stronk7)
57902e2738 Merge branch 'MDL-38619_master' of git://github.com/dmonllao/moodle 2013-04-03 13:33:16 +02:00
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