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
65,172 Commits 36 Branches 519 Tags
Commit Graph

65172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damyon Wiese
b22292ed50 Merge branch 'MDL-42705-master-nomerge' of git://github.com/mouneyrac/moodle 2013-11-13 14:42:32 +08:00
Damyon Wiese
34b67813ec Merge branch 'MDL-42598' of git://github.com/timhunt/moodle 2013-11-13 13:43:52 +08:00
Damyon Wiese
df6be935e1 MDL-42684 TinyMCE: Fix bootstrap CSS for putting text editors below labels. 2013-11-13 13:26:36 +08:00
Damyon Wiese
2034716c16 Merge branch 'MDL-33536-master' of git://github.com/damyon/moodle 2013-11-13 13:10:42 +08:00
Damyon Wiese
db7092b076 MDL-42684 Forms: Display text editors and file pickers with the label above the field. 
This includes the front page description admin field.
 2013-11-13 12:52:00 +08:00
Marina Glancy
1d2a7ef54f Merge branch 'wip-mdl-42799' of https://github.com/rajeshtaneja/moodle 
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
 2013-11-13 15:43:44 +11:00
Damyon Wiese
f51d0384f7 Merge branch 'MDL-41797' of git://github.com/rwijaya/moodle 2013-11-13 11:50:36 +08:00
Marina Glancy
5268dbffef Merge branch 'MDL-42827-master' of git://github.com/andrewnicols/moodle 2013-11-13 13:28:46 +11:00
Damyon Wiese
2b997ab5dd MDL-33536 Navigation: Add missing require_once for safety. 2013-11-13 09:59:44 +08:00
rwijaya
80fd00729b MDL-41797 external tools module: fix heading levels. 
AMOS BEGIN
CPY [submissions, core_grades], [submissions, mod_lti]
AMOS END
 2013-11-13 09:52:32 +08:00
Eloy Lafuente (stronk7)
662c5263b0 Merge branch '42832-26' of git://github.com/samhemelryk/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-11-13 01:55:52 +01:00
Eloy Lafuente (stronk7)
5658129967 Merge branch 'MDL-42790' of git://github.com/timhunt/moodle 2013-11-13 01:12:27 +01:00
Eloy Lafuente (stronk7)
64dcfd6ea3 Merge branch 'MDL-42839-master' of git://github.com/sammarshallou/moodle 2013-11-13 01:09:49 +01:00
Marina Glancy
930fbd0505 Merge branch 'MDL-38574' of git://github.com/timhunt/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-11-13 11:05:25 +11:00
Eloy Lafuente (stronk7)
183f84b5c3 Merge branch 'wip_master_mdl-42723' of https://github.com/iarenaza/moodle 2013-11-13 01:03:09 +01:00
Eloy Lafuente (stronk7)
aa7bc816d9 Merge branch 'wip-MDL-42672-master' of git://github.com/marinaglancy/moodle 2013-11-12 20:07:05 +01:00
sam marshall
5c138b258d MDL-42839 MUC: Memcache server configuration too sensitive to whitespace 2013-11-12 12:33:36 +00:00
Tim Hunt
c1db10b6d5 MDL-38574 qtype chooser: quick fix to make it fit on-screen. 
MDL-32729 will provide a better fix for this, but we may as well apply
this quick fix on stable branches.
 2013-11-12 11:35:42 +00:00
Sam Hemelryk
c31fc5a099 Merge branch 'MDL-42812-r1' of git://github.com/abgreeve/moodle 2013-11-12 16:30:39 +08:00
Rajesh Taneja
baf881b803 MDL-42799 Assignment: Min. width/height for widget is set to 1 
It was possible for user to add widgets with width/height = 0
which were not displayed to user and doesn't have much meaning to it
This patch will set min. width/height to 1
 2013-11-12 16:17:40 +08:00
Adrian Greeve
f3fbb6137b MDL-42812 mod_quiz: Fixed up a syntax error for additional name fields. 2013-11-12 15:46:45 +08:00
Sam Hemelryk
aa861f6297 MDL-42832 course: management viewmode string improvements 2013-11-12 15:32:59 +08:00
Damyon Wiese
3ebaeb11b0 Merge branch '41392-26-r1' of git://github.com/samhemelryk/moodle 2013-11-12 15:11:25 +08:00
Jerome Mouneyrac
bb2f7c3ce9 MDL-42705 EditPDF: Progress bar styles in editpdf need to be moved to base theme. 2013-11-12 15:09:19 +08:00
Sam Hemelryk
a14515990c MDL-41392 course: management fixed skiplinks breaking clean columns 2013-11-12 14:26:39 +08:00
Damyon Wiese
a6b35417c0 Merge branch 'w46_MDL-42503_m26_stringfilters' of https://github.com/skodak/moodle 2013-11-12 14:22:28 +08:00
Jason Fowler
0b11609944 MDL-42684 TinyMCE: Correct widths on screens with narrow fieldsets 2013-11-12 14:10:01 +08:00
Sam Hemelryk
b8a598ad65 Merge branch 'wip-MDL-42762-master' of git://github.com/abgreeve/moodle 2013-11-12 13:53:08 +08:00
Sam Hemelryk
0ac5863d86 Merge branch 'wip-MDL-41158-master-two' of git://github.com/abgreeve/moodle 2013-11-12 13:20:12 +08:00
Marina Glancy
b6168f132b Merge branch 'MDL-42276_master' of https://github.com/markn86/moodle 2013-11-12 15:11:19 +11:00
Damyon Wiese
93e55a8bf9 MDL-42804 Database - SQL keywords should be uppercase. 2013-11-12 12:05:08 +08:00
rwijaya
94738ee7d6 MDL-42804 data_mod: fix alternate name warning for deleting an entry 2013-11-12 12:05:08 +08:00
Marina Glancy
b544b09636 Merge branch 'MDL-42824-master-int' of git://github.com/FMCorz/moodle 2013-11-12 15:00:57 +11:00
Marina Glancy
c7ef597040 Merge branch 'MDL-42540' of git://github.com/timhunt/moodle 2013-11-12 14:47:54 +11:00
Sam Hemelryk
6f4a169d8e Merge branch 'MDL-42215_lang' of https://github.com/andyjdavis/moodle 2013-11-12 11:34:39 +08:00
Adrian Greeve
e351bed5c1 MDL-42812 libraries: Update username_load_fields_from_object to add the prefix to everything. 2013-11-12 11:30:16 +08:00
Andrew Nicols
734b5b500e MDL-42810 ActionMenu: Hide the ActionMenu when clicking on primary links 2013-11-12 11:18:33 +08:00
Adrian Greeve
3263a3562d MDL-41158 mod_workshop: Workshop submission alternate name field fix. 2013-11-12 10:40:23 +08:00
Marina Glancy
57c9bdb250 Merge branch 'MDL-42809-master' of git://github.com/andrewnicols/moodle 2013-11-12 13:34:01 +11:00
Eloy Lafuente (stronk7)
201877b5d0 Merge branch 'MDL-42573-master' of git://github.com/danpoltawski/moodle 2013-11-12 03:27:22 +01:00
Andrew Nicols
1e98b1641a MDL-42827 JavaScript: Use a more specific selector for activity links 2013-11-12 10:25:52 +08:00
Adrian Greeve
29fa62cfd9 MDL-42812 libraries: Update username_load_fields_from_object to add the prefix to everything. 2013-11-12 10:17:59 +08:00
Mark Nelson
a2d3e3b6ca MDL-42276 core_group: added behat tests to automate group actions 
1. Added new step definitions to check if an element exists or does not exist in another.
2. Added new step definitions to check if an element is readonly or is not readonly.
3. Automated testing for MDLQA-1812 and MDLQA-1813.

Added behat test for deleting groups/groupings with and without the
'moodle/course:changeidnumber' capability.

4. Automated MDLQA-2105.

Added behat test for creating groups/groupings without the
'moodle/course:changeidnumber' capability.

5. Automated MDLQA-2238 and MDLQA-2335.

Added behat test for updating groups/groupings with and without the
'moodle/course:changeidnumber' capability.
 2013-11-11 18:06:50 -08:00
Damyon Wiese
fae2e1ffcc Merge branch '42806-26' of git://github.com/samhemelryk/moodle 2013-11-12 10:02:09 +08:00
Frederic Massart
eb59e0ed3b MDL-42824 backup: Typo in description of setting backup_general_questionbank 2013-11-12 08:51:44 +08:00
Marina Glancy
82b211b6d0 Merge branch 'MDL-41775_master' of git://github.com/grabs/moodle 2013-11-12 11:23:51 +11:00
Eloy Lafuente (stronk7)
5d875d18e0 Merge branch 'MDL-40481' of git://github.com/timhunt/moodle 2013-11-12 00:38:35 +01:00
Petr Škoda
b2ea179338 MDL-42503 treat $CFG->filterall as a real cache flag - verify during cache resets 2013-11-11 21:49:15 +01:00
Marina Glancy
c4ce365aa1 Merge branch '42805-26' of git://github.com/samhemelryk/moodle 2013-11-11 21:48:39 +11:00
Marina Glancy
3ea8c639c1 NOBUG: convert tabs to whitespaces 2013-11-11 21:34:48 +11:00