mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
60,668 Commits 36 Branches 519 Tags
Commit Graph

60668 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
c6101ef441 Merge branch 'MDL-39087-plugins-uninstall' of git://github.com/mudrd8mz/moodle 2013-04-17 12:09:20 +01:00
Eloy Lafuente (stronk7)
b279f33410 Merge branch 'MDL-38956_master' of git://github.com/dmonllao/moodle 2013-04-17 12:50:50 +02:00
Yuliya Bozhko
9b0f001445 MDL-39049 Badges: Fix error when awarding a badge from recipients page 2013-04-17 17:03:19 +08:00
Eloy Lafuente (stronk7)
9b81eef05d Merge branch 'w15_MDL-39052_m25_csvtemp' of git://github.com/skodak/moodle 2013-04-17 02:43:49 +02:00
Eloy Lafuente (stronk7)
d10d607e8c Merge branch 'MDL-39151-master' of git://github.com/FMCorz/moodle 2013-04-17 02:01:16 +02:00
Eloy Lafuente (stronk7)
a821c10b86 Merge branch 'w15_MDL-39069_m25_helpwindow' of git://github.com/skodak/moodle 2013-04-17 01:55:45 +02:00
Eloy Lafuente (stronk7)
4ec465b155 Merge branch 'MDL-38100-master' of git://github.com/FMCorz/moodle 2013-04-17 01:40:51 +02:00
Eloy Lafuente (stronk7)
e377d86765 Merge branch 'MDL-39066-master' of git://github.com/ankitagarwal/moodle 2013-04-17 01:36:43 +02:00
Eloy Lafuente (stronk7)
9004d7a51c Merge branch 'wip-MDL-39145-m25' of git://github.com/marinaglancy/moodle 2013-04-17 01:27:39 +02:00
Eloy Lafuente (stronk7)
91560510dc Merge branch 'w15_MDL-39129_m25_afterburner' of git://github.com/skodak/moodle 2013-04-17 01:06:17 +02:00
Eloy Lafuente (stronk7)
359c1d4756 Merge branch 'w15_MDL-39075_m25_userdesc' of git://github.com/skodak/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-04-17 01:04:09 +02:00
Eloy Lafuente (stronk7)
3536896e25 Merge branch 'wip-MDL-39111-m25' of git://github.com/marinaglancy/moodle 2013-04-16 23:50:19 +02:00
Dan Poltawski
b90bd21c5f Merge branch 'MDL-27814-master' of git://github.com/ankitagarwal/moodle 
Conflicts:
	lib/deprecatedlib.php
 2013-04-16 14:47:14 +01:00
Frederic Massart
fb5544d2cd MDL-38100 repository_googledocs: Proper Google Drive icon 2013-04-16 20:49:42 +08:00
Dan Poltawski
dfd24d622f Merge branch 'MDL-39140_m25' of git://github.com/sbourget/moodle 2013-04-16 13:46:51 +01:00
Dan Poltawski
bc02f33809 Merge branch 'wip-mdl-39116' of git://github.com/rajeshtaneja/moodle 2013-04-16 13:42:01 +01:00
Dan Poltawski
342b1901ac Merge branch 'MDL-39029' of git://github.com/jacks92/moodle 2013-04-16 13:30:10 +01:00
Dan Poltawski
f7f1465f91 Merge branch 'm25_MDL-38678_SCORM_RTE_not_required_for_SCO_Assets' of https://github.com/scara/moodle 2013-04-16 13:26:34 +01:00
Petr Škoda
e88419a2fd MDL-39069 open new window for help when JS disabled 2013-04-16 14:12:31 +02:00
Dan Poltawski
05e1747dfe Merge branch 'MDL-39080_master' of git://github.com/kordan/moodle 2013-04-16 12:44:42 +01:00
Dan Poltawski
7e43a15ffe MDL-39063 badges: fix whitespace errors 2013-04-16 12:11:30 +01:00
Dan Poltawski
19226a309f Merge branch 'MDL-39063' of github.com:totara/openbadges 
Conflicts:
	admin/settings/badges.php
	lib/db/upgrade.php
	version.php
 2013-04-16 12:00:46 +01:00
Damyon Wiese
d523d161fe Merge branch 'wip-MDL-39064-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	theme/bootstrap/style/generated.css
 2013-04-16 16:56:09 +08:00
Damyon Wiese
5073388e74 Merge branch 'wip-MDL-38592-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-04-16 16:03:33 +08:00
Damyon Wiese
6a508eaccf Merge branch 'w15_MDL-34674_m25_spell' of git://github.com/skodak/moodle 2013-04-16 15:56:10 +08:00
Daniel Neis Araujo
58f739c5fd MDL-38136: fix user_get_user_details doesn't return idnumber (thanks to Antonio Carlos Mariani) 2013-04-16 15:50:13 +08:00
Petr Škoda
667447d129 MDL-39052 create temp files only in Moodle temp folder 2013-04-16 09:38:28 +02:00
Ankit Agarwal
a915104b4d MDL-39066 blogs: Add missing setType calls in blogs 2013-04-16 15:11:51 +08:00
Frederic Massart
5ab1b98274 MDL-39151 repository: Do not filter repository listing on manage pages 2013-04-16 14:43:51 +08:00
Petr Škoda
ca117d1e5b MDL-34674 add CTRL+right click hint to tinymce context menus 2013-04-16 08:37:21 +02:00
Damyon Wiese
e0cded5d44 Merge branch 'wip-MDL-38055-m25' of git://github.com/samhemelryk/moodle 2013-04-16 14:32:53 +08:00
Marina Glancy
0fd2635038 MDL-38592 Settings for courses lists on front page are made more user friendly 
- 'List of courses' is split into 'List of courses' (available) and 'Enrolled courses', CFG->disablemycourses is deprecated;
- CFG->frontpageloggedin by default shows list of available courses;
- There is separate item to display course search box
- CFG->maxcoursesincombo is deprecated
- CFG->maxcategorydepth changed default value to 2 since we have AJAX loading now
- FRONTPAGECOURSELIMIT is transformed to CFG->frontpagecourselimit

c
 2013-04-16 15:00:55 +10:00
Marina Glancy
f6812f575f MDL-39111 check repository instance context instead of repository usage context (following MDL-34346) 2013-04-16 13:28:42 +10:00
Marina Glancy
b1c2fc65e4 MDL-39145 add text in upgrade.txt about functions deprecated in MDL-37085 2013-04-16 11:50:19 +10:00
Eloy Lafuente (stronk7)
e32a8ae832 Merge branch 'w15_MDL-39132_m25_badgesettings' of git://github.com/skodak/moodle 2013-04-16 02:07:15 +02:00
Eloy Lafuente (stronk7)
718995ee30 Merge branch 'wip-MDL-39127-m25-integration' of git://github.com/samhemelryk/moodle 2013-04-16 01:24:33 +02:00
Eloy Lafuente (stronk7)
4af6e51309 Merge branch 'master_MDL-37844' of git://github.com/danmarsden/moodle 2013-04-16 01:14:06 +02:00
Sam Hemelryk
2fb77a96b3 MDL-39127 navigation: fixed loading of categories for navbar 2013-04-16 11:02:06 +12:00
Yuliya Bozhko
e280531436 MDL-39063 badges: Improve external backpack usability and workflow 2013-04-16 10:47:40 +12:00
Stephen Bourget
01b3704f1b MDL-39140 mod_folder: Fix missing call to setType() 2013-04-15 17:59:25 -04:00
Dan Poltawski
9aae7551ec Merge branch 'MDL-38880' of git://github.com/jmvedrine/moodle 2013-04-15 16:25:06 +01:00
Dan Poltawski
e5e5097081 NOBUG - reduce whitespace errors a little 2013-04-15 13:29:14 +01:00
Dan Poltawski
e34b27bae7 MDL-39047 - theme: fix various whitespace problems 2013-04-15 13:19:56 +01:00
Petr Škoda
f2770bfe1a MDL-39132 always include badge settings, hide the pages when disabled 2013-04-15 13:21:39 +02:00
Dan Poltawski
34ddaf7146 Merge branch 'MDL-39047_master' of https://github.com/markn86/moodle 2013-04-15 12:15:24 +01:00
Rajesh Taneja
0434840004 MDL-39116 Course: Pluginname strings will be set in M.str for all modules supporting Dnd 
Currently, if new activity/resource is created by DnD and M.str doesn't have pluginname string
it show wrong string, so loading pluginnames for all modules which support DnD
 2013-04-15 17:42:24 +08:00
Mark Nelson
12cb45f199 MDL-39047 forms: set the z-index of the calendar pop-up so that it renders above the filemanager 2013-04-15 17:37:41 +08:00
Dan Poltawski
3d7414b399 MDL-38309 fix whitespace issues 2013-04-15 10:26:53 +01:00
Dan Poltawski
7e155b96fb Merge branch 'wip-MDL-38309-m25' of git://github.com/marinaglancy/moodle 2013-04-15 10:24:20 +01:00
Petr Škoda
1fbdfa49fc MDL-39129 convert afterburner to new theme setting file 
This patch is based on work by Gareth J Barnard, Pau Ferrer Ocaña (crazyserver) and others.
 2013-04-15 11:16:26 +02:00