mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-06-04 15:15:25 +02:00
Code Issues Projects Releases Wiki Activity
62,375 Commits 37 Branches 536 Tags
Commit Graph

62375 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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 6ab62db65ca1719acdbf13d74756d20dbd987d1b.

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
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
Damyon Wiese
44b3927b70 MDL-39563: Change to use $CFG consistently 2013-07-15 15:01:39 +08:00
Damyon Wiese
4d4b938fa3 Merge branch 'MDL-39563' of git://github.com/jleyva/moodle 2013-07-15 14:54:20 +08:00
Dan Poltawski
c2ca2d8e91 MDL-28466 remove the enrol_authorize data 
If there are no records, remove the plugin
 2013-07-15 14:48:23 +08:00
Damyon Wiese
d7bf5fd1f7 Merge branch 'MDL-40440-m' of git://github.com/andrewnicols/moodle 2013-07-15 14:42:10 +08:00
Marina Glancy
5710055d41 Merge branch 'MDL-40633' of git://github.com/timhunt/moodle 2013-07-15 14:41:55 +10:00
Damyon Wiese
fff9752d2a Merge branch 'wip-mdl-35131' of git://github.com/rajeshtaneja/moodle 2013-07-15 11:54:24 +08:00
Frederic Massart
c122e7845d MDL-13114 tool_uploadcourse: Adding to standard plugins 2013-07-15 11:45:34 +08:00
Damyon Wiese
c49fea3be5 Merge branch 'w29_MDL-40435_m26_componentpermissions' of https://github.com/skodak/moodle 2013-07-15 11:25:37 +08:00
Marina Glancy
3fd0ea3c1e Merge branch 'MDL-28466-master' of git://github.com/danpoltawski/moodle 2013-07-15 13:07:37 +10:00
Damyon Wiese
527b24b104 Merge branch 'w29_MDL-40475_m26_componentcache' of https://github.com/skodak/moodle 2013-07-15 10:58:03 +08:00
Marina Glancy
918cc26541 Merge branch 'wip-MDL-39062-m26' of git://github.com/samhemelryk/moodle 2013-07-15 12:40:46 +10:00
Marina Glancy
78eca0fc3c Merge branch 'wip-MDL-40650-master' of git://github.com/abgreeve/moodle 2013-07-15 12:25:23 +10:00
Dan Poltawski
fdb0dfe7c0 MDL-28466 pluginlib: Add enrol_authorize as standard deleted plugin 
This means we won't bother our users about it in the plugin list

thanks Marina for picking it up!
 2013-07-15 10:25:22 +08:00
Dan Poltawski
317638a3d6 MDL-28466 remove enrol_authorize from standard list of plugins 2013-07-15 10:25:22 +08:00