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

71213 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Hemelryk
0d23255b89 Merge branch 'MDL-48179-master' of https://github.com/sammarshallou/moodle 2014-11-17 12:48:04 +13:00
Sam Hemelryk
b83a0323da Merge branch 'MDL-48196-master' of git://github.com/andrewnicols/moodle 2014-11-17 12:34:02 +13:00
Sam Hemelryk
2928dfd8a0 Merge branch 'master_MDL-47993' of https://github.com/totara/moodle 2014-11-17 12:21:16 +13:00
Sam Hemelryk
57fa596e0f Merge branch 'MDL-43628' of https://github.com/scyrma/moodle 2014-11-17 11:44:57 +13:00
Sam Hemelryk
76555946a9 Merge branch 'MDL-35638-master' of git://github.com/ankitagarwal/moodle 2014-11-17 10:34:10 +13:00
Sam Hemelryk
fea4baf826 Merge branch 'MDL-47590' of git://github.com/timhunt/moodle 2014-11-17 10:34:09 +13:00
Sam Hemelryk
6d97620481 Merge branch 'MDL-44657-master' of git://github.com/FMCorz/moodle 2014-11-17 10:34:09 +13:00
Matteo Scaramuccia
bb8ed60a3c MDL-48023 Files API: Theme files must be cache-able by shared proxies. 
The profile image AKA user icon will be cache-able by shared proxies too,
under its specific accessibility constraints/conditions.
 2014-11-16 09:53:27 +01:00
Pierre Pichet
b8393a77c3 MDL-48042 Questions: Reset Calculated qtype comments on datasets 
Reset back the modifications of Calculated qtype comments on datasets
    done by MDL-47224

Signed-off-by: Pierre Pichet <pichet.pierre@uqam.ca>
 2014-11-15 16:17:15 -05:00
Mary Evans
31b569ab18 MDL-48199 theme_bootstrapbase: Page padding left is wrong when in RTL 2014-11-14 18:52:28 +00:00
sam marshall
94b084fb02 MDL-48179 Backup progress: Can time out when compressing large backup 2014-11-14 18:29:30 +00:00
Daniel Thies
9b9a3abf9b MDL-48064 atto_editor: Check if activeElement is child node in isActive 2014-11-14 11:49:15 -06:00
Tim Hunt
ba145a9e4e MDL-47590 question backup: include response file only with userdata 2014-11-14 16:21:18 +00:00
Ankit Agarwal
74b28381c6 MDL-48171 gradebook: Use proper apis to get item name 2014-11-14 13:25:04 +05:30
Sam Hemelryk
2ff98fb6e4 MDL-48206 block_comments: textarea width 100% 2014-11-14 11:40:33 +13:00
Sam Hemelryk
aac8dfa8b6 MDL-48070 navigation: optimised the login page 
The navigation and settings no longer get initialised on the login
page by default, this is achieved by calling to ignore the active
page on the navbar.
It is safe because the login page is not represented in either the
navigation or the settings.

This change saves a few MB or ram and a couple of database queries
 2014-11-14 11:40:25 +13:00
Sam Hemelryk
701772c0e8 MDL-47434 format_topics: section 0 navigation tweak 
Section 0 is now only shown in the navigation block if it contains
activities.
If there are no activities then the section is removed.
This mimicks the display on the course page.
 2014-11-14 11:40:17 +13:00
Sam Hemelryk
f9745259b7 MDL-47434 format_weeks: section 0 navigation tweak 
Section 0 is now only shown in the navigation block if it contains
activities.
If there are no activities then the section is removed.
This mimicks the display on the course page.
 2014-11-14 11:40:17 +13:00
Oleg Demeshev
741063b41c MDL-47993 calendar: Fix ical import Microsoft calendar issue 2014-11-14 10:32:54 +13:00
Eloy Lafuente (stronk7)
c106341098 weekly release 2.9dev 2014-11-13 12:14:36 +01:00
Eloy Lafuente (stronk7)
a5c69c900c Merge branch 'MDL-48214-master-enfix' of git://github.com/mudrd8mz/moodle 2014-11-13 11:55:15 +01:00
Helen Foster
ed10b1d94d MDL-48214 Merge English strings from the en_fix language pack 2014-11-13 11:29:08 +01:00
Paul Holden
68ef378b1b MDL-44657 forms: Form identifiers should only contain basic characters 2014-11-13 16:20:28 +08:00
Rajesh Taneja
bd2183cd16 MDL-46865 report_log: Fixed showuser and showcourse in report log 2014-11-13 15:19:24 +08:00
John Okely
180acd64e9 MDL-47700 Grades: Fix incorrect config for overview report showrank 2014-11-13 14:26:31 +08:00
Tim Lock
d0fabf1193 MDL-47700 Grades: Sitewide overview report isn't visible in some cases 
Showing a overview report rank sitewide isn't visible to student in same cases
 2014-11-13 13:25:31 +08:00
Andrew Nicols
14ecbb2ee8 MDL-48196 phpunit: Set e-mail address for admin user at installation 2014-11-13 08:47:43 +08:00
Eugene Venter
8309373cbf MDL-48204 mod_wiki: admin.php - fix syntax error 2014-11-13 00:46:43 +01:00
Tim Hunt
06cf0b75ec MDL-48146 quiz settings: fix non-percent feedback boundaries 2014-11-12 15:45:26 +00:00
Dan Poltawski
2ee5b9cdc6 weekly release 2.9dev 2014-11-12 11:33:20 +00:00
Dan Poltawski
271045e5d4 MDL-48174 tool_langimport: info about skipped update 
So admins can work out why the task might not be having an effect.
 2014-11-12 11:24:21 +00:00
Dan Poltawski
bfa16aa2fa Merge branch 'wip-mdl-48174' of https://github.com/rajeshtaneja/moodle 2014-11-12 11:03:43 +00:00
David Monllao
800fa051b0 MDL-30968 mod_forum: No picture link to group when no groups mode 2014-11-12 11:53:14 +08:00
Andrew Nicols
a9edd8a671 MDL-48194 testing: Adjust naming of testsuites in phpunit.xml 
This will make it easier to run phpunit for a specific component by making
all testsuite names consistent, guessable, and in-line with the naming of
the parameter (testsuite vs. test suite).
 2014-11-12 11:46:03 +08:00
Adam Olley
09869dd583 MDL-42756 dock: Trigger actionmenu enhance when showing dock panel 
Additionally fixes the styling for the actionmenu icon size in
bootstrapbase'd themes.
 2014-11-12 14:10:07 +10:30
Sam Hemelryk
8aff36d0c8 Merge branch 'MDL-47391_master' of github.com:ninelanterns/moodle 2014-11-12 12:33:25 +13:00
Sam Hemelryk
785887fd0f Merge branch 'MDL-39692-master' of git://github.com/FMCorz/moodle 2014-11-12 09:41:58 +13:00
Yuliya Bozhko
ae17e383ef MDL-48115 badges: Fix strtoupper() output in badges 
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
 2014-11-12 09:25:58 +13:00
Sam Hemelryk
06a26e54e5 Merge branch 'MDL-30968-master-forum-group-link' of https://github.com/amandadoughty/moodle 2014-11-12 08:58:52 +13:00
Dan Poltawski
73f755a799 MDL-47502 statslib tests: improve test 
While integrating I noticed some problems which already existed in this
test:
* The enrolment data generator was not used
* The student roleid was hardocded
* The role assignment was at site level..
 2014-11-11 19:25:49 +00:00
Eugene Venter
ba923f4f9a MDL-47502 test_statslib_cron_daily: fix provider 
Fiddling with the database in the data provider causes "out of sync"
errors when running suite tests.
 2014-11-11 19:12:51 +00:00
Dan Poltawski
3194ca4b02 Merge branch 'MDL-47975-master' of git://github.com/damyon/moodle 2014-11-11 19:05:45 +00:00
Dan Poltawski
e0fa3e952b Merge branch 'MDL-48093-master' of https://github.com/sammarshallou/moodle 2014-11-11 18:59:55 +00:00
Dan Poltawski
4bd5445447 Merge branch 'MDL-48168' of git://github.com/timhunt/moodle 2014-11-11 18:48:39 +00:00
Tim Hunt
bae1d7d9e8 MDL-47618 quiz statistics: fatal error with groups. 
The problem was that the names of query placeholders were changing. The
fix was to do things ourself, rather than using get_in_or_equal.
 2014-11-11 18:01:35 +00:00
Dan Poltawski
20ac3aa5e5 Merge branch 'MDL-39376-master' of git://github.com/FMCorz/moodle 2014-11-11 17:21:09 +00:00
Dan Poltawski
cae0c46b9b Merge branch 'MDL-48156-master-pluginisenabled' of git://github.com/mudrd8mz/moodle 2014-11-11 17:16:00 +00:00
Tim Hunt
de10b7c239 MDL-47648 admin unit tests: fix file perms on mimetex.exe 
This was causing the
core_admintree_testcase::test_admin_setting_configexecutable unit test
to fail.
 2014-11-11 14:02:54 +00:00
Rajesh Taneja
ac19f245bf MDL-48174 core_lang: support for ->skiplangupgrade in lang cron task 
Similar to upgrade_language_pack(), update_langpacks_task should
respect skiplangupgrade config. Also, this should be added to behat
whitelist, so it can be disabled during on-sync period, when lang
pack for master is not available.
 2014-11-11 16:52:20 +08:00
Dan Poltawski
c69183a40f Merge branch 'MDL-48144' of git://github.com/stronk7/moodle 2014-11-11 08:07:19 +00:00