Commit graph

66719 commits

Author SHA1 Message Date
Damyon Wiese
03b8d9e3c3 Merge branch 'wip-mdl-40919' of https://github.com/rajeshtaneja/moodle 2014-02-25 12:44:35 +08:00
Rajesh Taneja
e49b94c936 MDL-18633 admin: Added capability string for user:viewlastip 2014-02-25 12:30:45 +08:00
Dan Poltawski
a5fc3f08ed Merge branch '44185-27' of git://github.com/samhemelryk/moodle 2014-02-25 11:22:24 +08:00
Damyon Wiese
494afb8180 Merge branch '44315-27' of git://github.com/samhemelryk/moodle 2014-02-25 11:09:53 +08:00
Damyon Wiese
a18c3591c6 MDL-40619 mod_quiz: Remove commented non-js behat scenario 2014-02-25 11:02:03 +08:00
Damyon Wiese
fce9daa806 Merge branch 'wip-MDL-40619-master' of git://github.com/marinaglancy/moodle 2014-02-25 10:53:09 +08:00
Dan Poltawski
3d4cec649a Merge branch 'MDL-40916_master' of https://github.com/markn86/moodle 2014-02-25 10:47:20 +08:00
Damyon Wiese
63e604f8b1 Merge branch 'w08_MDL-42889_m27_vir' of https://github.com/skodak/moodle 2014-02-25 10:32:44 +08:00
Dan Poltawski
e78e671f29 Merge branch 'MDL-43405_master' of https://github.com/markn86/moodle 2014-02-25 10:30:35 +08:00
Damyon Wiese
b33fbd428e Merge branch 'MDL-42923' of git://github.com/jleyva/moodle
Conflicts:
	version.php
2014-02-25 10:26:22 +08:00
Dan Poltawski
305b15f4ab Merge branch 'MDL-43478-master-v4' of git://github.com/jamiepratt/moodle 2014-02-25 09:27:35 +08:00
Damyon Wiese
8442725219 MDL-38903: Version bump for lang strings 2014-02-25 09:25:43 +08:00
Damyon Wiese
ed24890b68 Merge branch 'MDL-38903-master' of git://github.com/phalacee/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-02-25 09:21:30 +08:00
Jason Fowler
88d366e595 MDL-38903 File picker: making upload form with more semantic HTML 2014-02-25 07:51:53 +08:00
Damyon Wiese
237243db02 Merge branch 'MDL-43837_master' of git://github.com/dmonllao/moodle 2014-02-24 16:56:05 +08:00
Andrew Nicols
29ee3cf789 MDL-44101 Javascript: Apply widget-focusonclose to some core dialogues
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
2014-02-24 16:31:55 +08:00
Andrew Nicols
7ae6ce009e MDL-44101 Javascript: Introduce a module to focus after widget close
This module supports focusing on a specified Node, or attempting to
determine the Node which caused the displayed the Widget to return focus to
that location.
2014-02-24 16:31:09 +08:00
Damyon Wiese
dea614e493 Merge branch 'MDL-44108_master' of git://github.com/dmonllao/moodle 2014-02-24 15:42:32 +08:00
Damyon Wiese
8c3966773b Merge branch 'MDL-44111_master' of git://github.com/dmonllao/moodle 2014-02-24 15:39:32 +08:00
Damyon Wiese
ccc2966709 Merge branch 'wip-MDL-44139-master' of git://github.com/ds125v/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-02-24 15:28:51 +08:00
Damyon Wiese
6258e288ae Merge branch '44159-27' of git://github.com/samhemelryk/moodle 2014-02-24 15:26:05 +08:00
Damyon Wiese
28a03399b3 Merge branch 'wip-MDL-44168-master' of git://github.com/ds125v/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-02-24 15:20:49 +08:00
Damyon Wiese
956c7f2c39 Merge branch '41175-27' of git://github.com/samhemelryk/moodle 2014-02-24 15:15:00 +08:00
Damyon Wiese
5bc18d295a Merge branch '41176-27' of git://github.com/samhemelryk/moodle 2014-02-24 15:13:00 +08:00
Damyon Wiese
801e26ed64 Merge branch '41177-27' of git://github.com/samhemelryk/moodle 2014-02-24 15:10:53 +08:00
Damyon Wiese
9383bef658 Merge branch '41178-27' of git://github.com/samhemelryk/moodle 2014-02-24 15:08:33 +08:00
Rajesh Taneja
9e176aa2f5 MDL-40919 mod_survey: replaced add_to_log with events 2014-02-24 15:00:00 +08:00
Damyon Wiese
18bc3faef9 Merge branch '41179-27' of git://github.com/samhemelryk/moodle 2014-02-24 14:51:08 +08:00
Damyon Wiese
5c47971b4a Merge branch '44182-27' of git://github.com/samhemelryk/moodle 2014-02-24 14:49:10 +08:00
Damyon Wiese
b68658325b Merge branch '44183-27' of git://github.com/samhemelryk/moodle 2014-02-24 14:46:16 +08:00
Damyon Wiese
f08c69aba2 Merge branch 'MDL-44214-master' of git://github.com/andrewnicols/moodle 2014-02-24 14:41:29 +08:00
Damyon Wiese
2926b25492 Merge branch 'MDL-44247-master' of git://github.com/FMCorz/moodle 2014-02-24 14:32:49 +08:00
Damyon Wiese
8da433f045 MDL-44264 Badges: Cleanup imports in previous commit. 2014-02-24 13:48:18 +08:00
Damyon Wiese
9a85b4e053 Merge branch 'MDL-44264' of https://github.com/merrill-oakland/moodle 2014-02-24 13:40:47 +08:00
Damyon Wiese
e848a930d2 Merge branch '44279-27' of git://github.com/samhemelryk/moodle 2014-02-24 13:37:52 +08:00
Damyon Wiese
e3eaf61db1 Merge branch 'MDL-44286_master' of git://github.com/dmonllao/moodle 2014-02-24 13:29:58 +08:00
Damyon Wiese
13c12da2e5 Merge branch 'MDL-44288' of git://github.com/timhunt/moodle 2014-02-24 13:27:12 +08:00
Damyon Wiese
b80210fcd2 MDL-18633 User: Fixed calls to html_writer on user/profile page. 2014-02-24 13:19:17 +08:00
Damyon Wiese
164ad1a30a Merge branch 'MDL-18633' of https://github.com/danielneis/moodle 2014-02-24 13:16:41 +08:00
Damyon Wiese
1ed6bd87a2 Merge branch 'MDL-44006-m' of https://github.com/micaherne/moodle 2014-02-24 12:30:55 +08:00
Damyon Wiese
25de7d88e7 Merge branch 'MDL-44269_master' of git://github.com/lazydaisy/moodle 2014-02-24 11:42:51 +08:00
Damyon Wiese
aeacaa141e Merge branch '44217-27' of git://github.com/samhemelryk/moodle 2014-02-24 11:13:38 +08:00
Damyon Wiese
0721fb9113 Merge branch 'MDL-34319_master' of https://github.com/markn86/moodle 2014-02-24 11:08:03 +08:00
Sam Hemelryk
24c7fd007a MDL-44217 theme_bootstrapbase: darkend link colour by 5% for accessibility 2014-02-24 16:07:02 +13:00
Damyon Wiese
89ede7e12d Merge branch 'MDL-41767-master' of git://github.com/FMCorz/moodle 2014-02-24 09:57:15 +08:00
David Monllao
74c78e7483 MDL-43837 behat: Adding reduced timeouts
There are steps where we want to check that
"something" does not appear in the page
or does not exist. We still have to spin
but we don't need to spin for 6 seconds.
2014-02-24 09:43:24 +08:00
Sam Hemelryk
9bcde27f66 MDL-44185 course: fixed @package typo in report/lib.php 2014-02-24 09:26:59 +13:00
Sam Hemelryk
2ef8ff9e05 MDL-44315 phpdoc: fixed up typos and made up tags 2014-02-24 09:13:31 +13:00
James Pratt
99caa248a8 MDL-43478 quiz responses report : display last / first / all tries
when using multiple try question behaviour
2014-02-23 13:39:08 +07:00
Juan Leyva
cb9d825754 MDL-42923 Add renamed web services to the Mobile app service
Keep the deprecated ones for backwards compatibility
2014-02-21 15:26:45 +01:00