mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-03 15:29:08 +01:00
Code Issues Projects Releases Wiki Activity
60,632 Commits 36 Branches 523 Tags
Commit Graph

60632 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Dan Poltawski
6c9e174cc8 MDL-37762 course: fix category url 2013-04-15 09:29:06 +01:00
Dan Poltawski
ed9a90c018 Merge branch 'MDL-38980_master' of git://github.com/lazydaisy/moodle 2013-04-15 09:05:25 +01:00
Dan Poltawski
118f39de13 Merge branch 'MDL-39010_master' of git://github.com/lazydaisy/moodle 2013-04-15 08:58:30 +01:00
Dan Poltawski
a7eac88f94 Merge branch 'MDL-39000-master' of git://github.com/sammarshallou/moodle 2013-04-15 08:29:56 +01:00
Dan Poltawski
3cdea44a87 Merge branch 'MDL-38011' of git://github.com/srynot4sale/moodle 2013-04-15 07:58:53 +01:00
Dan Poltawski
5795bc60c9 Merge branch 'MDL-38716-master-int' of git://github.com/FMCorz/moodle 2013-04-15 07:35:14 +01:00
Damyon Wiese
5f022c5799 Merge branch 'MDL-39068' of git://github.com/stronk7/moodle 2013-04-15 14:24:52 +08:00
Damyon Wiese
823efcedcc MDL-37762 navbar - fold some long lines in previous patch 2013-04-15 13:32:07 +08:00
Damyon Wiese
23718dade9 Merge branch 'wip-MDL-37762-m25' of https://github.com/samhemelryk/moodle 2013-04-15 13:30:28 +08:00
Damyon Wiese
8b5f2be25d MDL-38904 Theme - JS improvements for bootstrap. 
Fix minor whitespace issue in thirdparty lib (will remove exclusion for it from ci).
Update yui-gallery modules location in readme.
Remove code-coverage files.
 2013-04-15 12:17:00 +08:00
Damyon Wiese
171c3d6c3c Merge branch 'MDL-38904-m' of git://github.com/andrewnicols/moodle 2013-04-15 11:57:38 +08:00
Frederic Massart
87c1c82286 MDL-38716 accessibility: ARIA attributes and roles defined on form actions 2013-04-15 11:46:05 +08:00
Damyon Wiese
ab707e3df8 MDL-39021 Theme - Fix phpdoc @package tags for simple theme 2013-04-15 11:23:17 +08:00
Mary Evans
59e31add66 MDL-39021 Themes - Add a new simple theme based on bootstrap. 
Credits to:
Mary Evans <lazydaisy@visible-expression.co.uk> and
David Scotson <david.scotson@glasgow.ac.uk>
 2013-04-15 11:15:59 +08:00
Damyon Wiese
ca17a1242a Merge branch 'w15_MDL-35434_m25_storedfilesetting' of git://github.com/skodak/moodle.git 2013-04-15 11:01:52 +08:00
Petr Škoda
fe7b75f85c MDL-35434 add support for theme setting files 
This patch is based on work by Gareth J Barnard, Pau Ferrer Ocaña (crazyserver) and others.
 2013-04-15 10:58:00 +08:00
Petr Škoda
6ddc9278ff MDL-35434 new stored file config setting 2013-04-15 10:57:47 +08:00
Marina Glancy
2fada29001 MDL-38309 Added comments on overwriting functions in themes 
Defined function tabree() as final so themes do not override it by mistake.
Added comments to other similar shortcut functions that themes should not override them (can not declare them final
for backward compartibility)
 2013-04-15 12:13:14 +10:00
Marina Glancy
a5f82c5b21 MDL-38309 Substitute usage of print_tabs() with renderable tabtree 2013-04-15 12:13:13 +10:00
Marina Glancy
c269b9d16f MDL-38309 move HTML generation from print_tabs() to renderer 
- created renderable object tabtree that represents the tree of tabs, extends tabobject
- created core_renderer::tabtree(), and supporting core_renderer::render_tabtree(), core_renderer::render_tabobject()
- change print_tabs() to use renderer function, deprecate supporting not needed functions
 2013-04-15 12:13:03 +10:00