65097 Commits

Author SHA1 Message Date
Sam Hemelryk
d0647301a0 MDL-41392 course: management accessibility tweaking 2013-11-11 17:09:44 +08:00
Sam Hemelryk
68bcc3faaf Merge branch 'wip-mdl-42795' of https://github.com/rajeshtaneja/moodle 2013-11-11 14:10:21 +08:00
Sam Hemelryk
0fd6069ecd Merge branch 'wip-MDL-40612-master-one' of git://github.com/abgreeve/moodle 2013-11-11 13:10:44 +08:00
Damyon Wiese
138e71a42e MDL-42699 Bootstrap tinymce css. Whitespace fix. 2013-11-11 12:40:21 +08:00
Jason Fowler
8bb68e0d23 MDL-42699 TinyMCE: adding padding to editor content in clean 2013-11-11 12:18:14 +08:00
Marina Glancy
b180048946 Merge branch 'MDL-42683-master-2' of git://github.com/mouneyrac/moodle
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
2013-11-11 15:02:48 +11:00
Marina Glancy
f1be232f68 Merge branch 'MDL-42081-master-nomerge2' of git://github.com/mouneyrac/moodle 2013-11-11 15:02:01 +11:00
Jerome Mouneyrac
7444cf322e MDL-42081 EditPDF: Add default stamp images 2013-11-11 11:39:27 +08:00
Adrian Greeve
5b1944bbba MDL-40612 libraries: Tidy up and improvement of the code for additional name fields.
Includes an update to get_all_user_name_fields() and the inclusion of set_user_name_object()
2013-11-11 11:01:14 +08:00
Adrian Greeve
f490f988b7 MDL-40612 libraries: Unit test expansion for get_all_user_name_fields()
and the inclusion of tests for set_user_name_object()
2013-11-11 10:52:24 +08:00
Damyon Wiese
bbdb369868 Merge branch 'wip-mdl-42754' of https://github.com/rajeshtaneja/moodle 2013-11-11 10:41:40 +08:00
Renaat Debleu
6382c482c8 MDL-42795 course: fixed param course in sql
course_sections has course field and not courseid, hence replaced it with course.
2013-11-11 10:24:09 +08:00
Damyon Wiese
d5c0f0453c Merge branch 'MDL-39923_master' of https://github.com/totara/openbadges
Conflicts:
	version.php
2013-11-11 10:17:07 +08:00
Damyon Wiese
f845946821 MDL-36224 LTI: Whitespace fix 2013-11-11 10:04:10 +08:00
Damyon Wiese
75a4dd38ad Merge branch 'MDL-36224-master' of git://github.com/damyon/moodle 2013-11-11 09:57:36 +08:00
Damyon Wiese
e3552170da Merge branch 'MDL-42772-master' of git://github.com/FMCorz/moodle 2013-11-08 16:15:17 +08:00
Dan Poltawski
46af039925 Merge branch 'MDL-42743' of git://github.com/timhunt/moodle 2013-11-08 16:08:20 +08:00
Dan Poltawski
dbb68d7779 Merge branch 'wip-mdl-42777' of https://github.com/rajeshtaneja/moodle 2013-11-08 16:05:06 +08:00
Dan Poltawski
d06d812c51 Merge branch 'wip-MDL-40883-master' of git://github.com/marinaglancy/moodle 2013-11-08 15:32:11 +08:00
Rajesh Taneja
be3d6de5aa MDL-42777 courses: Added behat to test ajax on course view page 2013-11-08 14:44:04 +08:00
Damyon Wiese
2bdd5ff4aa MDL-36224 LTI: Fix up docs, add plugininfo class and create subplugin folder. 2013-11-08 14:35:32 +08:00
Mark Nielsen
8cf7670e58 MDL-36224: Improving lti_get_types
If there are no LTI source plugins that
need to be added to the activity chooser
menu, then fallback to the default
activity chooser display.
2013-11-08 14:35:31 +08:00
Mark Nielsen
4d7a2c9e1c MDL-36224: Minor updates to LTI
* No debug display on service.php
* Send a 400 header on error
2013-11-08 14:35:31 +08:00
Chris Scribner
fdbf2f229c MDL-36224: Adding subplugins.php 2013-11-08 14:35:31 +08:00
Chris Scribner
976b5bca31 MDL-36224: Add support for pluggable extensions to add new LTI services 2013-11-08 14:35:31 +08:00
Rajesh Taneja
428a1bbdb1 MDL-42777 courses: removed unneeded category check
On course view manage page, JS was not getting initalised as category-listing
is not visible, initialiseCourses is doing unnessary check for category as
it takes care of empty category so it should not return on empty category
2013-11-08 14:08:46 +08:00
Frederic Massart
4bceea11be MDL-42772 upgrade: Force alternate fields in session user 2013-11-08 14:01:39 +08:00
Marina Glancy
2e84b4b323 Merge branch 'MDL-42775-master' of git://github.com/danpoltawski/moodle 2013-11-08 16:37:55 +11:00
Jason Fowler
d37ec4b6a7 MDL-42684 TinyMCE: Including details of patch in moodle-readme.txt 2013-11-08 12:57:46 +08:00
Jason Fowler
762a29690e MDL-42684 TinyMCE: make tinymce start at full width 2013-11-08 12:57:46 +08:00
Dan Poltawski
356d33a866 MDL-42775 dml: remove invalid unit test assertion 2013-11-08 12:25:49 +08:00
Damyon Wiese
c8868cefe2 MDL-42679 Scorm: Remove stale yui shifted css files. 2013-11-08 11:54:48 +08:00
Damyon Wiese
16fd6fb6d7 Merge branch 'w46_MDL-42769_m26_admineditor' of https://github.com/skodak/moodle 2013-11-08 11:43:10 +08:00
Damyon Wiese
13f04e7c91 Merge branch 'MDL-42679-master' of git://github.com/andrewnicols/moodle 2013-11-08 11:23:00 +08:00
Marina Glancy
61d1e9c44d Merge branch 'MDL-41586-master' of git://github.com/ankitagarwal/moodle 2013-11-08 14:13:24 +11:00
Dan Poltawski
f9dc4bd78b MDL-42704 quiz statistics: make test more tolerant 2013-11-08 11:11:31 +08:00
Dan Poltawski
379cbb459a Merge branch 'MDL-42704-master' of git://github.com/jamiepratt/moodle 2013-11-08 11:11:28 +08:00
Marina Glancy
9fec5cb333 Merge branch 'MDL-42760-master' of git://github.com/mouneyrac/moodle 2013-11-08 14:10:41 +11:00
Dan Poltawski
7925c3b45c MDL-42666 repository_boxnet: fix broken version
The last commit here looked like Fred had broken the version,
but it was my mistake. I owe Fred a beer at the next available
opportunity.
2013-11-08 11:02:35 +08:00
Ankit Agarwal
6cff6350df MDL-41586 libaries: Fix issues with scale in sqlsrv libraries
0 is a valid value
null is the default scale we set in other DBs
2013-11-08 10:49:35 +08:00
Marina Glancy
a9d11e3cd0 MDL-40883 ddl: unittest for objects name length 2013-11-08 13:17:47 +11:00
Jason Fowler
46f763ed4a MDL-42660 TinyMCE: Ensure upgrade is only performed when possible
Conflicts:

	lib/editor/tinymce/db/upgrade.php
2013-11-08 09:49:02 +08:00
Marina Glancy
dcde391b44 MDL-40883 ddl: make sure object name never exceeds max length
Many thanks to Ray Bon for finding the problem
2013-11-08 11:58:35 +11:00
Damyon Wiese
d25e988d08 Merge branch 'MDL-40975-editinstructions' of git://github.com/andrewnicols/moodle 2013-11-08 08:45:11 +08:00
Petr Škoda
8213007c7f MDL-42769 use only text area editor before install completed 2013-11-07 23:51:59 +01:00
Jamie Pratt
ec477ba1bb MDL-42704 quiz statistics : SQL Errors under MSSQL 2013-11-07 18:05:10 +07:00
Tim Hunt
a568785223 MDL-42743 improve wording of the CBM summary on quiz review 2013-11-07 10:30:06 +00:00
Dan Poltawski
5b5447fa83 MDL-41615 question: fix unit tests
Heading levels have been changed.
2013-11-07 18:10:55 +08:00
Dan Poltawski
0967c74a3d Merge branch 'MDL-42737-master' of git://github.com/andrewnicols/moodle 2013-11-07 17:21:54 +08:00
Dan Poltawski
48fe93fa26 Merge branch 'MDL-41615_c' of git://github.com/rwijaya/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-11-07 17:17:32 +08:00