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

17388 commits

Author SHA1 Message Date
Andrew Nicols
104d698ffd MDL-43105 JavaScript: Use the correct versions of our rollups 2013-11-28 12:31:51 +08:00
Damyon Wiese
b170380a8e MDL-42930 Release upgrade line: Fix ordering for tinymce 2013-11-20 11:47:35 +08:00
Marina Glancy
a99e1ad9ec Merge branch 'MDL-42767-master' of git://github.com/ankitagarwal/moodle 2013-11-20 13:20:17 +11:00
Ankit Agarwal
cc49a6f7eb MDL-42767 notes: Delete notes on a course delete 2013-11-19 16:32:19 +08:00
Sam Hemelryk
8b5e008bc2 Merge branch 'MDL-42553_master' of https://github.com/markn86/moodle 2013-11-19 14:31:51 +13:00
Sam Hemelryk
d7a0da37d9 Merge branch 'wip-MDL-42852_master' of git://github.com/gjb2048/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-11-19 11:42:25 +13:00
Damyon Wiese
79149e85fb Merge branch 'MDL-42808-master' of git://github.com/FMCorz/moodle 2013-11-18 15:26:52 +08:00
Damyon Wiese
7f2c374dcd Merge branch 'MDL-42582-master' of git://github.com/sammarshallou/moodle 2013-11-18 14:55:18 +08:00
Dan Poltawski
b6813d8f6a Merge branch 'MDL-42884_master' of https://github.com/markn86/moodle 2013-11-18 14:41:06 +08:00
Damyon Wiese
47578dbff4 MDL-42930 Add 2.6.0 upgrade line 2013-11-18 11:47:17 +08:00
Gareth J Barnard
b3eadf7050 MDL-42852 lib: Blocks disappear in Clean in RTL. 2013-11-17 13:33:30 +00:00
sam marshall
597ac7e5d2 MDL-42582 Availability: Restriction display incorrect for multi-para Labels 
When a label has multiple paragraphs, its name (converted to plain text)
contains a line feed. Due to an error in regular expressions that don't
accept the line feed, this caused incorrect display on the course page
when that label is shown as a requirement for accessing another activity.
 2013-11-15 12:45:32 +00:00
Marina Glancy
2b6344c1d0 Merge branch 'MDL-42887-master' of git://github.com/damyon/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-11-15 17:27:50 +11:00
Damyon Wiese
d8383b247e MDL-42887 Forms: Collapse all field elements below their labels on screens less than 1180px 
Includes css fixes to make the question type edit screens look OK with this change.
 2013-11-15 13:40:27 +08:00
Mark Nelson
88a31771a6 MDL-42553 core_calendar: third party calendar types can now be uninstalled 2013-11-14 17:20:01 -08:00
Eloy Lafuente (stronk7)
9a36c7d95c Merge branch 'MDL-42447_master' of git://github.com/dmonllao/moodle 2013-11-15 02:11:27 +01:00
David Monllao
58a3a34e38 MDL-42447 performance: New var to add perf. info to redirections 2013-11-15 09:10:22 +08:00
Damyon Wiese
f2f23af955 Merge branch 'MDL-42711-master' of git://github.com/nebgor/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-11-14 17:18:44 +08:00
Mark Nelson
d498c973c4 MDL-42884 core_user: fixed issue when deleting users with invalid emails throws invalidusername exception 2013-11-13 16:11:27 -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
2b997ab5dd MDL-33536 Navigation: Add missing require_once for safety. 2013-11-13 09:59:44 +08: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
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
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
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
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
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
40dd8899ab Merge branch 'MDL-42081-phpunitfix' of git://github.com/mouneyrac/moodle 2013-11-11 20:55:19 +11:00
Sam Hemelryk
d0647301a0 MDL-41392 course: management accessibility tweaking 2013-11-11 17:09:44 +08:00
Sam Hemelryk
9b22eeff5d MDL-42806 dock: check title exists before using it 2013-11-11 16:51:06 +08:00
Sam Hemelryk
4b6d9ea248 MDL-42805 dock: fixed {} appearing in undock icon title 2013-11-11 16:26:12 +08:00
Jerome Mouneyrac
316283c72b MDL-42081 fix file_storage phpunit tests following adding new stamp files on fresh install 2013-11-11 16:01:32 +08:00
Andrew Nicols
04653aa010 MDL-42809 ActionMenu: Increase specifity of hide on select selector 2013-11-11 15:33:30 +08:00
Frederic Massart
7c9753a713 MDL-42808 library: Google API was resetting the timezone 2013-11-11 15:25:00 +08:00
Sam Hemelryk
0fd6069ecd Merge branch 'wip-MDL-40612-master-one' of git://github.com/abgreeve/moodle 2013-11-11 13:10:44 +08:00
Adrian Greeve
5b1944bbba MDL-40612 libraries: Tidy up and improvement of the code for additional name fields. 
Includes an update to get_all_user_name_fields() and the inclusion of set_user_name_object()
 2013-11-11 11:01:14 +08:00
Adrian Greeve
f490f988b7 MDL-40612 libraries: Unit test expansion for get_all_user_name_fields() 
and the inclusion of tests for set_user_name_object()
 2013-11-11 10:52:24 +08:00
Damyon Wiese
bbdb369868 Merge branch 'wip-mdl-42754' of https://github.com/rajeshtaneja/moodle 2013-11-11 10:41:40 +08:00
Damyon Wiese
d5c0f0453c Merge branch 'MDL-39923_master' of https://github.com/totara/openbadges 
Conflicts:
	version.php
 2013-11-11 10:17:07 +08:00
Damyon Wiese
e3552170da Merge branch 'MDL-42772-master' of git://github.com/FMCorz/moodle 2013-11-08 16:15:17 +08:00
David Mudrák
069c29b987 MDLSITE-2455 Do not throw coding exception when the activity is not found 
Under certain conditions, coding exception is thrown when fetching items from
the navigation bar. The patch prevents them. See more details in the tracker.
 2013-11-08 16:08:39 +08:00