Commit graph

65238 commits

Author SHA1 Message Date
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
Frederic Massart
13d888771d MDL-42043 theme: Use $theme instead of $OUTPUT for pix_url() 2013-11-08 13:15:31 +08:00
Aparup Banerjee
b661e76c3f MDL-42711 hide course theme option for non bootstrapbase based themes. some other minor fixes too. 2013-11-08 13:10:40 +08: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
Adrian Greeve
b63f542d21 MDL-42762 administration: Fixed additional names section from being missing.
When an additional name field is not enabled in the admin settings the
text box should still be available to fill out in a section further down
the page (Additional names).
2013-11-08 12:05:53 +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
AMOS bot
c09786a9b9 Automatically generated installer lang files 2013-11-08 00:43:04 +00: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
Tim Hunt
a289a2b51c MDL-42540 quiz manual grading should have setType 2013-11-07 09:44:24 +00: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
Yuliya
be2b37cf4b MDL-39923 badges: Fix unit tests 2013-11-07 21:48:01 +13:00
Andrew Nicols
5bf8e9ae5e MDL-40975 Course: Ensure that editinstructions line up with activity rename again 2013-11-07 16:46:34 +08:00
Marina Glancy
d1cfb36b59 Merge branch 'MDL-42748-master' of git://github.com/andrewnicols/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-11-07 19:31:52 +11:00
Damyon Wiese
a79cea102d Merge branch 'MDL-42668-master' of git://github.com/FMCorz/moodle 2013-11-07 16:20:53 +08:00
Jerome Mouneyrac
eb11ae0d5c MDL-42760 EditPDF: sometimes the dropdown or search comment appear below the editpdf 2013-11-07 16:11:51 +08:00
Andrew Nicols
1ef33d5914 MDL-42679 mod_scorm: Include gallery-sm-treeview for https support 2013-11-07 15:58:22 +08:00
Frederic Massart
ab1658fb17 MDL-42666 repository_boxnet: Do not run the upgrade multiple times 2013-11-07 15:53:59 +08:00
Frederic Massart
def961fd0d MDL-42668 portfolio_boxnet: Do not run upgrade multiple times 2013-11-07 15:35:24 +08:00
Frederic Massart
a5a84cc894 MDL-42668 portfolio_boxnet: Disable the portfolio when non-HTTPS 2013-11-07 15:28:34 +08:00
Frederic Massart
337107fe4b MDL-42668 portfolio_boxnet: Disable the portfolio during upgrade 2013-11-07 15:28:34 +08:00
Frederic Massart
7c6ad254f3 MDL-42668 portfolio_boxnet: Notify the admins about the upgrade process 2013-11-07 15:28:34 +08:00
Frederic Massart
d130777df5 MDL-42668 portfolio_boxnet: Migration to APIv2 2013-11-07 15:28:34 +08:00
Dan Poltawski
b74c8389b1 Merge branch 'MDL-42666-master-fixup' of git://github.com/FMCorz/moodle 2013-11-07 14:19:14 +08:00
Marina Glancy
cc58ba267d Merge branch 'w46_MDL-42708_m26_mymobile' of https://github.com/skodak/moodle 2013-11-07 17:17:42 +11:00
Marina Glancy
4c0e155433 Merge branch '42375-26' of git://github.com/samhemelryk/moodle 2013-11-07 17:08:03 +11:00
Sam Hemelryk
10a2bf4613 MDL-42375 course: management interface icon tweaks
* Drag and drop icon switched to a 12x12px icon.
* Drag and drop icon now uses cursor:pointer
* Improved alignment of the caret for course listing actions.
2013-11-07 14:01:17 +08:00
Frederic Massart
7cb353ff69 MDL-42666 tests: Setting new Box.net mandatory arguments 2013-11-07 13:54:47 +08:00