moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 02:46:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
65727 commits 37 branches 544 tags 1.3 GiB
Commit graph

17563 commits

Author SHA1 Message Date
Sam Hemelryk
37f59a68bd Merge branch 'MDL-41359-master' of https://github.com/mr-russ/moodle 2013-12-18 10:08:33 +13:00
Sam Hemelryk
bf6529bbd4 Merge branch 'MDL-43234-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
 2013-12-18 09:53:02 +13:00
Sam Hemelryk
233e6b985b Merge branch 'MDL-43259-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/upgrade.txt
 2013-12-17 16:32:35 +13:00
Sam Hemelryk
ca3b2c9bcc Merge branch 'MDL-38832-master' of git://github.com/danpoltawski/moodle 2013-12-17 16:20:34 +13:00
Sam Hemelryk
9d771f9529 Merge branch 'MDL-39725_analyze' of https://github.com/mr-russ/moodle 
Conflicts:
	lib/dml/moodle_database.php
 2013-12-17 09:31:19 +13:00
Sam Hemelryk
2b88fa0c90 Merge branch 'MDL-25473-master' of git://github.com/phalacee/moodle 2013-12-17 08:54:33 +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
Sam Hemelryk
21ad9a7921 Merge branch 'MDL-43240-master' of git://github.com/andrewnicols/moodle 2013-12-16 16:03:09 +13:00
Sam Hemelryk
d431ff1f51 Merge branch 'wip-mdl-21180' of https://github.com/rajeshtaneja/moodle 2013-12-16 15:44:15 +13: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
Sam Hemelryk
c57864b76f Merge branch 'MDL-42965_master' of https://github.com/totara/openbadges 2013-12-16 13:47:57 +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
ed67f462fe MDL-43268 fix filter notice when not in debug mode 2013-12-13 13:57:59 +08: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
Dan Poltawski
1f1a8f03d8 MDL-38832 course: remove unused constants 2013-12-12 16:44:20 +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
Petr Škoda
cac367e4a4 MDL-42973 fix MUC caching issue when fetching available updates 2013-12-12 11:43:35 +08:00
Andrew Nicols
5947ab3333 MDL-43259 JavaScript: Stop using deprecated lightbox config setting when instantiating dialogues 2013-12-11 16:56:49 +08:00
Rajesh Taneja
86b0e3b308 MDL-40058 Events: Replaced add_to_log for page comments to event 2013-12-11 13:53:00 +11:00
Sam Hemelryk
445e63ecd8 Merge branch 'wip-MDL-43218-master' of git://github.com/marinaglancy/moodle 2013-12-11 15:32:29 +13:00
Marina Glancy
0967e635ac MDL-43218 blog: prepare the blog navigation only when needed 2013-12-11 13:27:38 +11:00
Simon Coggins
24f4bfcfcf MDL-43218 navigation: Remove link to blogs when they are disabled 2013-12-11 12:59:28 +11:00
Sam Hemelryk
1092f63a80 Merge branch 'MDL-38775-master' of git://github.com/andrewnicols/moodle 2013-12-11 12:25:16 +13:00
Sam Hemelryk
5cc0c2c41d Merge branch 'MDL-38776-master' of git://github.com/andrewnicols/moodle 2013-12-11 12:25:14 +13:00
Eloy Lafuente (stronk7)
ebc77165a4 Merge branch 'MDL-42625_master' of git://github.com/dmonllao/moodle 2013-12-10 23:29:06 +01:00
Sam Hemelryk
df1498f711 Merge branch 'MDL-42796-master' of git://github.com/andrewnicols/moodle 2013-12-11 11:13:32 +13:00
Sam Hemelryk
87176b481e Merge branch 'MDL-43252-master' of git://github.com/sammarshallou/moodle 2013-12-11 11:03:39 +13:00
Sam Hemelryk
3f35f367cb Merge branch 'w50_MDL-31625_m27_replace' of https://github.com/skodak/moodle 2013-12-11 10:50:07 +13:00
Eloy Lafuente (stronk7)
7f34773665 Merge branch 'wip-MDL-43150-master' of git://github.com/marinaglancy/moodle 2013-12-10 22:47:15 +01:00
Sam Hemelryk
ebb9daa5e1 Merge branch 'MDL-42959-master' of git://github.com/andrewnicols/moodle 2013-12-11 10:34:17 +13:00
Sam Hemelryk
b6df1b3ab3 Merge branch 'MDL-40517-master' of git://github.com/danpoltawski/moodle 2013-12-11 10:32:06 +13:00
Eloy Lafuente (stronk7)
5cf182e39d Merge branch 'wip-MDL-42174-master' of git://github.com/marinaglancy/moodle 2013-12-10 22:06:39 +01:00
Russell Smith
cc67c6db61 MDL-39725 database: Apply database statistics update to daily stats 2013-12-10 20:33:01 +11:00
Russell Smith
8343b340c4 MDL-39725 database: Include stats collections in unit tests 2013-12-10 20:32:56 +11:00
Russell Smith
814c9438a0 MDL-39725 database: Add statistics collection functions 2013-12-10 20:31:47 +11:00
Marina Glancy
e762d5a7f2 Merge branch 'm27_MDL-43082_IE9_Compat_View_SVG_Say_No' of https://github.com/scara/moodle 2013-12-10 14:47:08 +11:00
Marina Glancy
a98bdfa668 Merge branch 'MDL-37517-master' of git://github.com/danpoltawski/moodle 2013-12-10 14:29:22 +11:00
Jason Fowler
c476e67839 MDL-25473 mediaplayer - prevent embedded videos from looping 2013-12-10 10:49:44 +08:00
Marina Glancy
907b98204b MDL-43044 fix trailing whitespace 2013-12-10 11:52:42 +11:00
Marina Glancy
013620aad3 Merge branch 'MDL-43044-master' of git://github.com/ankitagarwal/moodle 2013-12-10 11:40:54 +11:00
Sam Hemelryk
fd0281dfc3 Merge branch 'MDL-43104-master' of git://github.com/andrewnicols/moodle 2013-12-10 10:27:45 +13:00
Sam Hemelryk
176521e560 Merge branch 'MDL-38774-master' of git://github.com/andrewnicols/moodle 2013-12-10 09:25:51 +13:00
Sam Hemelryk
830299fe4f Merge branch 'm27_MDL-43159_Wrong_Naming_Convention_For_Variable' of https://github.com/scara/moodle 2013-12-10 09:21:10 +13:00
Sam Hemelryk
822f529014 Merge branch 'MDL-43152-master' of git://github.com/andrewnicols/moodle 2013-12-10 08:43:50 +13:00
Sam Hemelryk
e3f7ac09e7 Merge branch 'MDL-43087a' of https://github.com/srynot4sale/moodle 
Conflicts:
	config-dist.php
 2013-12-10 08:36:39 +13:00
sam marshall
4c31243fc7 MDL-43252 Group menu in wrong order when groupings used 2013-12-09 13:02:12 +00:00
Marina Glancy
95971ae99e Merge branch 'wip-MDL-43175-master' of git://github.com/abgreeve/moodle 2013-12-09 18:54:53 +11:00
Marina Glancy
895d3050e0 Merge branch 'wip-mdl-43224' of https://github.com/rajeshtaneja/moodle 2013-12-09 18:45:27 +11:00
Marina Glancy
645cd2fe77 Merge branch 'w50_MDL-42973_m27_addonupd' of https://github.com/skodak/moodle 2013-12-09 18:26:39 +11:00