72228 Commits

Author SHA1 Message Date
David Monllao
36977d39d0 Merge branch 'MDL-40776_master' of git://github.com/s-cenni/moodle 2015-02-16 10:35:06 +08:00
David Monllao
608132d7e4 MDL-47172 print_overview: Fixing indentation 2015-02-16 09:38:05 +08:00
Ankit Agarwal
81251186e7 MDL-47172 print_overview: Add more unit tests 2015-02-13 11:12:13 +05:30
Ankit Agarwal
a7366bc858 MDL-47172 print_overview: Show assignments only when needed
The intended behaviour is not to display this notification when:-
1) The assignment is closed.
2) User is a student and has a valid submission in place.
3) User is a teacher and there is nothing to grade.

Beisdes the above changes the patch also includes minor other fixes such as:-
1) Fixed phpdocs
2) Fixed inconsistent return value.
3) Fixed unit tests that had arguments in wrong order.
2015-02-13 11:12:12 +05:30
David Monllao
7357af2b0c weekly release 2.9dev 2015-02-12 15:30:03 +08:00
David Monllao
0471328c70 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-02-12 15:30:01 +08:00
David Monllao
5bb0ee2a7a MDL-43535 webservices: Adding missing deprecated WS
- enrol_manual needs a version bump to execute
  external_update_descriptions()
- core_user_get_users_by_id() is now also marked
  as deprecated
2015-02-12 10:13:36 +08:00
Sara Cenni
54867385b2 MDL-40776 grade: fix query for report outcomes
Add a missing space to the query for report outcomes to avoid error with Oracle.
2015-02-11 14:14:02 +01:00
Rajesh Taneja
c44da97711 MDL-36296 block_navigation: navigate to course before following activity
Activity name is wrapped and chrome driver can't click on it
So navigate to course where it is visible in full
2015-02-11 09:32:28 +00:00
David Monllao
d3dac40019 MDL-48894 core_registration: Fixing version value 2015-02-11 16:18:06 +08:00
Andrew Davis
fe391a4e0c MDL-48894 core_registration: minor string tweak 2015-02-11 14:28:46 +08:00
David Monllao
d0676138b2 Merge branch 'MDL-48894_registration' of git://github.com/andyjdavis/moodle 2015-02-11 09:11:06 +08:00
Marina Glancy
6a2c10a89d MDL-49003 login: prevent signup when user is logged in 2015-02-11 00:03:44 +01:00
gthomas2
78c36b065f MDL-46763 core: Change icon processing to retain source format 2015-02-10 23:55:57 +01:00
Andrew Davis
806c06fc7b MDL-48894 core_registration: make it more obvious if site is registered 2015-02-10 21:12:10 +01:00
AMOS bot
4834fcb875 Automatically generated installer lang files 2015-02-11 00:04:09 +08:00
Eloy Lafuente (stronk7)
3b77006451 Merge branch 'MDL-49036-master' of git://github.com/jleyva/moodle
Conflicts:
	version.php
2015-02-10 13:29:10 +01:00
Eloy Lafuente (stronk7)
438193ef45 Merge branch 'MDL-48910_block_my' of https://github.com/andyjdavis/moodle 2015-02-10 13:14:59 +01:00
Eloy Lafuente (stronk7)
83ab09a001 Merge branch 'MDL-49058-master' of git://github.com/jethac/moodle 2015-02-10 13:09:38 +01:00
David Monllao
c365148292 MDL-48679 gradebook: Fixing trailing whitespace 2015-02-10 17:48:57 +08:00
David Monllao
b300c1deba Merge branch 'MDL-48679-master' of git://github.com/lameze/moodle 2015-02-10 17:45:22 +08:00
Simey Lameze
e82aa04399 MDL-48679 gradebook: fix grade publishing feature 2015-02-10 17:39:52 +08:00
Dan Poltawski
53018f5fc4 Merge branch 'm29_MDL-49052' of https://github.com/totara/moodle 2015-02-10 09:24:42 +00:00
Dan Poltawski
bb2b3dea79 Merge branch 'wip-mdl-49081' of https://github.com/rajeshtaneja/moodle 2015-02-10 09:08:31 +00:00
Juan Leyva
126470f3c8 MDL-49036 webservices: gradereport_user_get_grades_table ws tests 2015-02-10 09:41:28 +01:00
Jetha Chan
3451a51cdf MDL-37477 output: Add support for table captions
Conflicts:
	lib/upgrade.txt
	theme/bootstrapbase/style/moodle.css
2015-02-10 16:15:49 +08:00
David Monllao
6c33ed43cf MDL-48805 theme: Fixing trailing whitespace 2015-02-10 15:47:41 +08:00
David Monllao
fa42965c2a Merge branch 'm29_MDL-48805' of git://github.com/totara/moodle 2015-02-10 15:26:49 +08:00
Andrew Davis
b6d7cff65f MDL-48910 core_block: user_can_addto() respects applicable formats 2015-02-10 08:07:23 +01:00
David Monllao
0e8182e8f8 Merge branch 'MDL-48822-master' of git://github.com/andrewnicols/moodle 2015-02-10 14:10:28 +08:00
Marina Glancy
330e51fa14 MDL-10405 course: CSS classname correction 2015-02-10 13:05:51 +08:00
Simey Lameze
58ccdcd2ac MDL-48679 gradebook: helper methods for grade publishing 2015-02-10 12:46:40 +08:00
David Monllao
6e47fb1da3 Merge branch 'MDL-49024_master' of git://github.com/nadavkav/moodle 2015-02-10 12:32:23 +08:00
David Monllao
912ec5c7c2 Merge branch 'm29_MDL-49064' of git://github.com/totara/moodle 2015-02-10 11:56:52 +08:00
David Monllao
4c75cc3278 Merge branch 'MDL-48937-master' of git://github.com/FMCorz/moodle 2015-02-10 11:41:42 +08:00
David Monllao
4b408c3afe Merge branch 'MDL-48960-master' of git://github.com/danpoltawski/moodle 2015-02-10 11:12:18 +08:00
David Monllao
12b20241ec Merge branch 'wip-mdl-49113' of git://github.com/rajeshtaneja/moodle 2015-02-10 10:35:00 +08:00
David Monllao
04b732ede7 Merge branch 'master_MDL-48803' of git://github.com/greg-or/moodle-mod_assign 2015-02-10 10:00:23 +08:00
David Monllao
f01845c2a6 Merge branch 'MDL-48212-master' of git://github.com/ankitagarwal/moodle 2015-02-10 08:54:13 +08:00
Eloy Lafuente (stronk7)
21c7e25a94 Merge branch 'MDL-48889-master' of git://github.com/jethac/moodle 2015-02-10 01:36:27 +01:00
Eloy Lafuente (stronk7)
b7164a5c21 Merge branch 'MDL-48964' of git://github.com/jmvedrine/moodle 2015-02-10 01:09:38 +01:00
Eloy Lafuente (stronk7)
8bcc97f056 Merge branch 'MDL-49073-master' of git://github.com/jethac/moodle 2015-02-10 01:04:38 +01:00
Dan Poltawski
c874c3c455 Merge branch 'MDL-48544-master' of git://github.com/andrewnicols/moodle 2015-02-09 22:42:01 +00:00
Dan Poltawski
8edac41831 Merge branch 'MDL-43535_master' of git://github.com/dmonllao/moodle 2015-02-09 22:39:36 +00:00
Eloy Lafuente (stronk7)
f73632e089 Merge branch 'wip_MDL-49125_m29_install' of https://github.com/skodak/moodle 2015-02-09 20:01:24 +01:00
Eloy Lafuente (stronk7)
e7b63ac788 Merge branch 'MDL-49006' of git://github.com/timhunt/moodle 2015-02-09 19:32:40 +01:00
Eloy Lafuente (stronk7)
bd308dd09f Merge branch '36296-29' of git://github.com/samhemelryk/moodle 2015-02-09 18:09:15 +01:00
Dan Poltawski
4dae1afb58 Merge branch 'MDL-33648' of git://github.com/jmvedrine/moodle 2015-02-09 15:03:58 +00:00
Eloy Lafuente (stronk7)
4c55046399 Merge branch 'MDL-48357-master' of git://github.com/jleyva/moodle 2015-02-09 15:51:58 +01:00
Dan Poltawski
720931fd0e Merge branch 'wip-MDL-47558-master' of git://github.com/marinaglancy/moodle 2015-02-09 14:49:03 +00:00