mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-09 18:30:03 +01:00
Code Issues Projects Releases Wiki Activity
65,699 Commits 36 Branches 523 Tags
Commit Graph

65699 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Hemelryk
2b88fa0c90 Merge branch 'MDL-25473-master' of git://github.com/phalacee/moodle 2013-12-17 08:54:33 +13:00
Sam Hemelryk
bb4551334f Merge branch 'MDL-34321-master' of git://github.com/phalacee/moodle 2013-12-17 08:48:08 +13:00
Sam Hemelryk
2b08f90aca Merge branch 'MDL-36984-master' of git://github.com/phalacee/moodle 2013-12-17 08:45:05 +13:00
Sam Hemelryk
0359fe71e2 Merge branch 'w51_MDL-43268_m27_filternotice' of https://github.com/skodak/moodle 2013-12-17 08:25:08 +13:00
Andrew Nicols
052d64a478 MDL-43322 JavaScript: Correct cache-base entry in base rollup 2013-12-16 16:59:11 +08:00
Andrew Nicols
9a45ac14f0 MDL-43322 JavaScript: Include moodle-core-popuphelp in the mcore rollup 
moodle-core-popuphelp is used on every page in Moodle, so it should be
included in the rollup by default to save a request each time.
 2013-12-16 16:14:26 +13:00
Sam Hemelryk
21ad9a7921 Merge branch 'MDL-43240-master' of git://github.com/andrewnicols/moodle 2013-12-16 16:03:09 +13:00
Sam Hemelryk
9f5b319345 Merge branch 'MDL-34432-master' of git://github.com/damyon/moodle 2013-12-16 15:46:56 +13:00
Sam Hemelryk
d431ff1f51 Merge branch 'wip-mdl-21180' of https://github.com/rajeshtaneja/moodle 2013-12-16 15:44:15 +13:00
Sam Hemelryk
d842685028 Merge branch 'MDL-43062-master-nomerge' of git://github.com/mouneyrac/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-12-16 15:40:40 +13:00
Damyon Wiese
c7a7368958 MDL-34432: Allow comment inline (stripping embedded images version) 2013-12-16 10:38:23 +08:00
Rajesh Taneja
134c514be0 MDL-21180 Gradebook: Consistent handling of change in aggregation 
Change from/to GRADE_AGGREGATE_WEIGHTED_MEAN and GRADE_AGGREGATE_EXTRACREDIT_MEAN was only
handled prior to this patch. GRADE_AGGREGATE_SUM and GRADE_AGGREGATE_WEIGHTED_MEAN2 also
behave similar and should be handled same way
 2013-12-16 09:57:42 +08:00
Marina Glancy
2a73cfb011 Merge branch 'MDL-37972-master' of git://github.com/phalacee/moodle 2013-12-16 12:27:38 +11:00
Sam Hemelryk
3c3eed7e01 Merge branch 'wip-MDL-43348_master' of git://github.com/gjb2048/moodle 2013-12-16 14:10:15 +13:00
Sam Hemelryk
3b94d80c20 Merge branch 'MDL-40096-master' of git://github.com/damyon/moodle 2013-12-16 13:52:16 +13:00
Sam Hemelryk
c57864b76f Merge branch 'MDL-42965_master' of https://github.com/totara/openbadges 2013-12-16 13:47:57 +13:00
Sam Hemelryk
db23e92670 Merge branch 'MDL-40436-master' of git://github.com/FMCorz/moodle 2013-12-16 11:31:29 +13:00
Sam Hemelryk
2244289809 Merge branch 'w51_MDL-42931_m27_env27' of https://github.com/skodak/moodle 2013-12-16 11:18:02 +13:00
Sam Hemelryk
063baa62b5 Merge branch 'MDL-42085-master' of git://github.com/mouneyrac/moodle 2013-12-16 11:11:38 +13:00
Sam Hemelryk
6015500d5b Merge branch 'MDL-43326-master' of git://github.com/damyon/moodle 2013-12-16 09:46:47 +13:00
Petr Škoda
dbe0203ba8 MDL-42931 fix hardcoded PHP version tests for 2.7 2013-12-13 14:04:24 +08:00
Petr Škoda
d1a628e5fd MDL-42931 set new requirements for 2.7 2013-12-13 14:04:24 +08:00
Petr Škoda
ed67f462fe MDL-43268 fix filter notice when not in debug mode 2013-12-13 13:57:59 +08:00
Jerome Mouneyrac
41c2a197ba MDL-43062 course: Content of label is left-aligned, regardless of alignment chosen 2013-12-13 13:27:26 +08:00
Sam Hemelryk
2f4e0db7c3 weekly release 2.7dev 2013-12-13 16:59:10 +13:00
Sam Hemelryk
61b46e4c4d Merge branch 'install_master' of git://git.moodle.org/moodle-install 2013-12-13 16:59:08 +13:00
AMOS bot
184d614f26 Automatically generated installer lang files 2013-12-13 00:42:11 +00:00
Tim Lock
9f1d04920a MDL-33925: auth_imap: add self-signed cert support 2013-12-12 12:52:51 +01:00
David Monllao
fff500c727 MDL-42625 behat: Wrapping select an option extra actions in a try & catch 
To select an option is specially painful, every browser
behaves differently and phantomjs just joined the party
throwing "Element does not exist in cache" random
exceptions that we need to catch.
 2013-12-12 12:16:45 +01:00
Gareth J Barnard
fde0b8cd1b MDL-43348 theme: html <nav> element on the wrong content. 2013-12-12 11:07:03 +00:00
Jerome Mouneyrac
571906e3f7 MDL-42085 Enrol: Always apply enrolment duration. 
Before the fix, the startdates and duration fields were integrated to HTML code only
when the user clicked on the collapsible region to see them.
It was wrong because their values were not sent by the form
if ever the user didn't expand this Enrolment options region.
 2013-12-12 16:04:52 +08:00
Frederic Massart
67850301d0 MDL-40436 block_course_list: Fix bad context resolution 
We were trying to get the course context of a remote course
from a completely unrelated ID. It would sometimes work if the
ID was matching the one of a local course. In other places
we are not trying to find a context for the remote course, we
simply use the $PAGE context in format_string. So the usage
of the context has been removed here too.
 2013-12-12 09:04:19 +01:00
Jason Fowler
082ad25776 MDL-36984 Assign: Add redirect after saving grades 2013-12-12 14:19:26 +08:00
Marina Glancy
bdd5a6c5c2 Merge branch 'MDL-42625_master-failures-fix' of git://github.com/dmonllao/moodle 2013-12-12 16:49:56 +11:00
David Monllao
fb99ef1ded MDL-42625 behat: Fixing failures 
* Expanding fieldsets before setting the course format
* Ensure editors are loaded moved to expand_all_fieldsets
* Return true rather than false when JS is disabled and
  non-allowed steps should continue without throwing an
  exception.
* Submit create user form after editing it
 2013-12-12 13:41:07 +08:00
Marina Glancy
10484ad5e4 Merge branch 'mucupdates27' of https://github.com/skodak/moodle 2013-12-12 15:39:14 +11:00
Petr Škoda
cac367e4a4 MDL-42973 fix MUC caching issue when fetching available updates 2013-12-12 11:43:35 +08:00
Jason Fowler
871015414d MDL-34321 Assignment2.2 - Fixing submission count 2013-12-12 10:35:41 +08:00
Rajesh Taneja
2270661e51 MDL-40058 mod_wiki: trigger event on page map view 2013-12-12 13:08:18 +11:00
Eloy Lafuente (stronk7)
32a8bcc4a7 MDL-31410 paypal: fix problem on notifications 
This commit fixes a PHP warning about using a
unititialised variable and also the problems when
notifications are enabled and there is not yet a
teacher in the course, defaulting to admin for student
notifications and preventing teacher notifications to happen.
 2013-12-12 02:27:53 +01:00
Eloy Lafuente (stronk7)
d47d52d531 Merge branch 'w50_MDL-31410_m27_paypalipn' of https://github.com/skodak/moodle 2013-12-12 01:09:02 +01:00
Sam Hemelryk
623d49dde4 Merge branch 'MDL-43232-master-1' of git://github.com/andrewnicols/moodle 2013-12-12 09:13:42 +13:00
David Monllao
c5a1015338 MDL-42625 behat: Fixing ExpectationException::__construct() call 
Also adding an extra checking to the selector to
ensure it is no updating the list of files.
 2013-12-11 17:02:46 +08:00
Andrew Nicols
44b724c374 MDL-43232 JavaScript: Correct typo when cancelling the confirmcancel 2013-12-11 13:29:46 +08:00
Damyon Wiese
e9fe65d575 MDL-43326 Assign: Start new attempt from previous missing sesskey 2013-12-11 13:07:52 +08:00
Rajesh Taneja
0e72987517 MDL-40058 mod_wiki: modified wiki_restore_page api to accept version and context 2013-12-11 13:53:04 +11:00
Rajesh Taneja
e94f6c6572 MDL-40058 Events: added unit test 2013-12-11 13:53:04 +11:00
Rajesh Taneja
86b0e3b308 MDL-40058 Events: Replaced add_to_log for page comments to event 2013-12-11 13:53:00 +11:00
Rajesh Taneja
8b43cf225f MDL-40058 mod_wiki: Replaced add_to_log for page version viewed to event 2013-12-11 13:53:00 +11:00
Rajesh Taneja
a8481a66fe MDL-40058 mod_wiki: Replaced add_to_log for page created to event 2013-12-11 13:53:00 +11:00