moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
62848 commits 37 branches 540 tags 1.3 GiB
Commit graph

62848 commits

This branch
This branch
All branches
Author SHA1 Message Date
Damyon Wiese
820ad5dfd8 Merge branch 'MDL-40465-master' of git://github.com/FMCorz/moodle 2013-07-16 21:35:38 +08:00
Damyon Wiese
b30a12db52 Merge branch 'wip-MDL-40621-master' of git://github.com/marinaglancy/moodle 2013-07-16 21:29:58 +08:00
Damyon Wiese
59e649180d Merge branch 'w29_MDL-40574_m26_editordelete' of https://github.com/skodak/moodle 2013-07-16 21:23:30 +08:00
Damyon Wiese
e202521f25 Merge branch 'wip-MDL-39299-master' of git://github.com/phalacee/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-07-16 20:59:41 +08:00
Eloy Lafuente (stronk7)
5b0804c4b1 Merge branch 'w29_MDL-40563_m26_themecaching' of https://github.com/skodak/moodle 2013-07-16 11:41:47 +02:00
Eloy Lafuente (stronk7)
3f0a8871d3 Merge branch 'MDL-40555-master' of git://github.com/FMCorz/moodle 
Conflicts:
	cache/stores/static/lib.php
 2013-07-16 09:57:34 +02:00
Jason Fowler
c604e01c13 MDL-39299 - Course - Correcting some rendering problems in bootstrapbase 2013-07-16 15:51:23 +08:00
Damyon Wiese
259e3c2525 Merge branch 'MDL-40464-master' of git://github.com/ankitagarwal/moodle 2013-07-16 15:44:38 +08:00
Damyon Wiese
924ea4845a Merge branch 'wip-MDL-40638-master' of git://github.com/abgreeve/moodle 
Conflicts:
	version.php
 2013-07-16 15:14:49 +08:00
Marina Glancy
3e2b5734dd Merge branch 'w29_MDL-40549_m26_oacleanup' of https://github.com/skodak/moodle 2013-07-16 17:07:23 +10:00
Dan Poltawski
fb5ce7d351 MDL-40666 enrol|cohort: PARAM_NUMBER -> PARAM_INT 
PARAM_NUMBER is a float, our id's are int's

* Fix core_cohort_get_cohorts to specify correct return type on cohort id
* Fix core_enrol_get_enrolled_users_with_capability to specify correct
  correct return type on user id
* Fix core_cohort_update_cohorts to specify the right parameter type
  (int) on cohort id
* Add tests to verify the bug on core_cohort_update_cohorts param type.
 2013-07-16 15:03:03 +08:00
Damyon Wiese
06c8b60936 Merge branch 'MDL-40462_master' of https://github.com/markn86/moodle 2013-07-16 15:00:46 +08:00
Petr Škoda
b961cc4c59 MDL-40549 remove last traces of oacleanup 
Thanks Marina!
 2013-07-16 09:00:46 +02:00
Dan Poltawski
4f60c4af77 MDL-40666 cohort: remove duplicated code from tests 2013-07-16 14:51:59 +08:00
Damyon Wiese
ed9e492087 Merge branch 'MDL-40431_master' of https://github.com/markn86/moodle 2013-07-16 14:49:25 +08:00
Damyon Wiese
792522198a MDL-40167 tests: The dock subsystem was removed 
Fix the unit test that counts the core subsystems.
 2013-07-16 14:29:59 +08:00
Marina Glancy
b7361a9be7 Merge branch 'MDL-35851-master' of git://github.com/damyon/moodle 2013-07-16 16:10:13 +10:00
Damyon Wiese
d33d712541 MDL-35851 lesson: removed expensive upgrade step. 
Just deal with the bad data when displaying the lesson instead.

Conflicts:

	mod/lesson/db/upgrade.php
 2013-07-16 14:05:07 +08:00
Damyon Wiese
d981272e64 Merge branch 'wip-mdl-40428' of git://github.com/rajeshtaneja/moodle 2013-07-16 13:33:27 +08:00
Damyon Wiese
539819dc40 Merge branch 'MDL-40195' of git://github.com/aolley/moodle 2013-07-16 13:28:52 +08:00
Damyon Wiese
6ec1f2f2eb Merge branch 'wip-MDL-40167-m26' of git://github.com/samhemelryk/moodle 2013-07-16 13:25:54 +08:00
Marina Glancy
cb8c7b9d56 MDL-39812 recompile less for bootstrapbase 2013-07-16 15:19:38 +10:00
Marina Glancy
e2abbde44e Merge branch 'MDL-39812_bootstrapbase' of git://github.com/rwijaya/moodle 2013-07-16 14:29:24 +10:00
Marina Glancy
792e6059be Merge branch 'wip-MDL-40426-master' of git://github.com/abgreeve/moodle 2013-07-16 13:48:27 +10:00
Damyon Wiese
8eb3e1f94f Merge branch 'w29_MDL-40558_m26_guestdelete' of https://github.com/skodak/moodle 2013-07-16 11:28:57 +08:00
Damyon Wiese
2f9aeafe5e Merge branch 'MDL-40524' of git://github.com/aolley/moodle 2013-07-16 11:24:06 +08:00
Marina Glancy
ff2ca3ef3d Merge branch 'MDL-13114-master' of git://github.com/FMCorz/moodle 2013-07-16 13:07:17 +10:00
Damyon Wiese
4d4fb80d8f Merge branch 'MDL-40538' of https://github.com/mr-russ/moodle 2013-07-16 11:02:54 +08:00
Marina Glancy
50d1d9949b Merge branch 'MDL-30740-master' of git://github.com/danpoltawski/moodle 2013-07-16 12:16:27 +10:00
Rossiani Wijaya
eebc821c83 MDL-35851 Lesson module: fix page order id for import questions. Add upgrade script to fix lesson pages corrupted links 2013-07-16 09:52:25 +08:00
Dan Poltawski
a10d6199c8 MDL-40680 store_memcached: fix serialiser options 
* Use correct lang string for SERIALIZER_IGBINARY
* Use PARAM_INT for the parameter
 2013-07-16 09:37:53 +08:00
Sam Hemelryk
4a749e93b4 MDL-40555 cache: implemented unit tests for default search functionality 2013-07-16 08:29:17 +08:00
Eloy Lafuente (stronk7)
e780e5cb8f Merge branch 'MDL-40112_master' of https://github.com/totara/openbadges 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-07-16 01:29:01 +02:00
Eloy Lafuente (stronk7)
adbdb9b5c7 Merge branch 'w29_MDL-40571_m26_adminblocks' of https://github.com/skodak/moodle 2013-07-16 00:26:44 +02:00
Eloy Lafuente (stronk7)
88e4c0848a Merge branch 'MDL-40412' of git://github.com/merrill-oakland/moodle 2013-07-15 22:07:47 +02:00
Eloy Lafuente (stronk7)
37aa0545a1 Merge branch 'wip-MDL-38747-master' of https://github.com/satrun77/moodle 2013-07-15 17:02:01 +02:00
Damyon Wiese
7ce7bb538c Revert "MDL-35131 Caching: Purge all will clear course modinfo cache - Thanks to Thomas for patch" 
This reverts commit 6ab62db65c.

This is breaking upgrades from 22 - purgeallcaches gets called during upgrade but
rebuild_course_caches is not a safe api to use in this case.
 2013-07-15 21:24:07 +08:00
Marina Glancy
9af02a3b36 MDL-40121 Added format_singleactivity in standard package 2013-07-15 21:42:04 +10:00
Marina Glancy
6619945b06 MDL-40121 Support old activities with subtypes 2013-07-15 21:42:04 +10:00
Marina Glancy
28c61e0aa2 MDL-40121 Added plugin format_singleactivity 2013-07-15 21:41:31 +10:00
Barbara Ramiro
dc97596615 MDL-40670 Theme: Rescale headings overriding bootstrap defaults 2013-07-15 18:47:38 +08:00
Dan Poltawski
f6ef724650 MDL-30740 skydrive: improve repo metadata 
* Add manage link
* Use realthumbnail for lazy loading images
* Add image height/width info
* Add author information to files
 2013-07-15 18:08:18 +08:00
Dan Poltawski
c893448b17 MDL-30740 skydrive: convert muc to defined cache 2013-07-15 18:08:17 +08:00
Dan Poltawski
562525dcc9 MDL-30740 Add repository_skydrive to standard plugins 2013-07-15 17:57:43 +08:00
Dan Poltawski
1757cc9d15 MDL-30740 skydrive: bump version for core inclusion 
Remove release name and maturity as these will now be inhereted from
core.
 2013-07-15 17:57:43 +08:00
Dan Poltawski
d4fd856b91 MDL-30740 skydrive: Add filepicker navigation bar 
In order not to get lost in the Sky.

We use a session cache to reduce repeated calls to the skydrive API,
storing the folder name each time we get a listing.

Original concept from Ruslan Kabalin, thanks!
 2013-07-15 17:57:42 +08:00
Ruslan Kabalin
1bb2f42130 MDL-30740 skydrive: show albums as essentially they are "folders" 
If you create a folder in SkyDrive and add image to it, it will be calssified
as album and, this will not be listed without this patch.
 2013-07-15 17:57:42 +08:00
Dan Poltawski
7446284108 MDL-30740 repository: Add Microsoft Skydrive plugin 
Thanks to Universidad Teconológica de Chile (INACAP) who funded this
work initially and LUNS who permitted this to be released open source so
I could continue to work on this.
 2013-07-15 17:57:42 +08:00
Adrian Greeve
7809d1557c MDL-40638 - Administration: Update of version number to avoid alternate name fields breaking before upgrade. 
With the alteration of the user table to include the new alternate name fields anyone
upgrading from one version to another will receive errors until they run the upgrade.
Forcing a redirect if major version upgrade will bypass this issue.
 2013-07-15 15:49:26 +08:00
Marina Glancy
73221dbdfe Merge branch 'MDL-28466-oldata-remove' of git://github.com/danpoltawski/moodle 2013-07-15 17:28:59 +10:00