Dave Cooper
7193ea2cd2
MDL-49845 profile: changed 'My preferences' display logic
2015-05-04 14:02:17 +08:00
Dave Cooper
c1f97c777f
MDL-49845 blog: Fixed navigation logic for blog
2015-05-04 14:02:16 +08:00
Dave Cooper
298c9da5f1
MDL-49845 navigation: Fix breadcrumbs for links in my profile.
2015-05-04 14:02:16 +08:00
Andrew Nicols
6df7f2008b
Merge branch 'MDL-49987-master' of git://github.com/damyon/moodle
...
Conflicts:
lib/db/upgrade.php
version.php
2015-05-04 13:40:57 +08:00
Andrew Nicols
6e9abef568
Merge branch 'MDL-49983-master' of git://github.com/xow/moodle
2015-05-04 12:39:48 +08:00
John Okely
4887d15228
MDL-49983 navigation: Remove 'my' from user context navigation
2015-05-04 12:38:50 +08:00
Andrew Nicols
23c4c76ff9
Merge branch 'wip-MDL-49846-master-v2' of git://github.com/abgreeve/moodle
2015-05-04 12:31:20 +08:00
Adrian Greeve
19452c99d7
MDL-49846 tool_monitor: Subscription page now filters on site events.
2015-05-04 12:29:54 +08:00
David Monllao
44e2802555
Merge branch 'MDL-49923-master' of git://github.com/FMCorz/moodle
2015-05-04 11:14:45 +08:00
Ankit Agarwal
5e4438b5c3
MDL-48002 inbound: Update fixtures to add client info
2015-05-04 08:00:01 +05:30
Ankit Agarwal
0174fa9bc0
MDL-48002 inbound: add tests for evolution
2015-05-04 08:00:01 +05:30
Andrew Nicols
a8a742cb50
MDL-48002 inbound Unit tests from fixtures for quoted text
2015-05-04 08:00:01 +05:30
Ankit Agarwal
aef3c18b76
MDL-48002 inbound: Remove quoted text from forum emails
2015-05-04 08:00:00 +05:30
Andrew Nicols
b861cc96f7
Merge branch 'wip-MDL-50066-master' of git://github.com/marinaglancy/moodle
2015-05-04 09:07:26 +08:00
Damyon Wiese
3c568cd3db
MDL-49987 upgrade: Make sure messages is in the user menu
...
Because we have removed messages from the navigation tree,
it is important that it exists in the user menu. That is the default
behaviour, but if sites previously removed it, we need to make sure it
is inserted back.
2015-05-03 21:47:20 +08:00
Frederic Massart
a75dbde04c
MDL-49923 theme_clean: Removed nested H1 tags due to new full_header()
2015-05-01 18:25:38 +08:00
David Monllao
24a2babdd3
on-demand release 2.9beta+
2015-05-01 16:51:51 +08:00
David Monllao
dc9b229d7a
MDL-49232 enrol_self: Adapting unit test to new can_self_enrol() output
2015-05-01 15:43:09 +08:00
David Monllao
84d83fe7e1
Merge branch 'MDL-49998' of git://github.com/stronk7/moodle
2015-05-01 15:05:42 +08:00
David Monllao
600596fd6a
Merge branch 'MDL-49840-master' of git://github.com/andrewnicols/moodle
2015-05-01 11:05:59 +08:00
Andrew Nicols
04cb1103a6
Merge branch 'MDL-49232_master' of git://github.com/markn86/moodle
2015-05-01 09:27:11 +08:00
Dan Poltawski
864275788c
Merge branch 'MDL-50028' of git://github.com/timhunt/moodle
2015-04-30 16:06:58 +01:00
Eloy Lafuente (stronk7)
46686eafeb
MDL-49998 editpdf: Clean code to make it more readable.
...
There was a big proliferation and reuse of $pdf variable
that was making the code hard to read/review. This commit
does change nothing but makes it more readable.
Also adds a couple of Close() calls, not strictly needed
because they don't have opened files. But think it makes
really clearer the scope of every variable. And, for sure
it frees some resources. That cannot be bad.
2015-04-30 10:55:08 +02:00
Rajesh Taneja
7fb84d75ee
MDL-50042 behat: Use double quotes to avoid symfony adding it
2015-04-30 16:42:11 +08:00
Marina Glancy
2960eb4dd2
MDL-50066 strings: unable to deprecate string from moodle.php
2015-04-30 16:14:53 +08:00
Andrew Nicols
f4b2a38728
Merge branch 'MDL-49986-master' of git://github.com/FMCorz/moodle
2015-04-30 15:39:13 +08:00
Andrew Nicols
e841d654aa
Merge branch 'MDL-49583' of https://github.com/NeillM/moodle
2015-04-30 15:00:25 +08:00
Andrew Nicols
237ce46b3f
Merge branch 'MDL-50038-master' of git://github.com/FMCorz/moodle
2015-04-30 14:55:48 +08:00
David Monllao
d567320928
Merge branch 'MDL-49281-master' of git://github.com/mastnym/moodle
2015-04-30 14:53:52 +08:00
David Monllao
388b0beec1
MDL-49637 mod_assign: Fixing behat test
...
The participant number is dynamically generated so it is not possible to
match known values.
Match on the submission text instead.
2015-04-30 14:03:50 +08:00
Martin Mastny
5c3b5143dc
MDL-49281 grades: Calculation settings upgraded
2015-04-30 13:42:19 +08:00
Frederic Massart
d71feab8ae
MDL-49986 messages: Contacts in contact list should not be bold
2015-04-30 12:40:03 +08:00
Andrew Nicols
c80270fe89
Merge branch 'MDL-50033-master-enfix' of git://github.com/mudrd8mz/moodle
2015-04-30 10:47:33 +08:00
Andrew Nicols
3056a260f6
Merge branch 'MDL-49932_master' of git://github.com/markn86/moodle
2015-04-30 10:25:27 +08:00
Andrew Nicols
e89c5c203c
MDL-49232 enrol_self: Add behat test for non-guest self-enrolment
2015-04-29 18:04:29 -07:00
Mark Nelson
9c54a0abad
MDL-49232 enrol_self: display continue button
2015-04-29 18:04:28 -07:00
Mark Nelson
3b318d3e69
MDL-49932 core_install: removed upgrade step changing 'defaulthomepage'
...
The upgrade step was changing any site that had the setting
'defaulthomepage' set to HOMEPAGE_SITE to HOMEPAGE_MY. We can
not make the assumption that users want this setting changed.
2015-04-29 15:30:45 -07:00
David Mudrák
3759e7ae96
MDL-50033 lang: Update Behat scenarios to use the new strings
2015-04-29 23:15:44 +02:00
Helen Foster
0634dc3b76
MDL-50033 lang: Merge English strings from the en_fix language pack
2015-04-29 21:43:00 +02:00
Frederic Massart
94e6f38fa6
MDL-50038 my: Redirect admin users to the notifications page when needed
2015-04-29 18:56:56 +08:00
Dan Poltawski
f60ea7d7df
Merge branch 'MDL-50041-master' of git://github.com/FMCorz/moodle
2015-04-29 11:53:47 +01:00
Frederic Massart
cda2a8273a
MDL-50041 gdlib: Badges need PNG files from process_new_icon()
2015-04-29 18:50:20 +08:00
Adrian Greeve
dc769673fa
MDL-49843 navigation: Fixed fatal error when viewing reports.
2015-04-29 11:28:55 +01:00
Neill Magill
ccd3dd5bc9
MDL-49583 enrol: enrol/index.php page doesn't handle direct access well
...
Before this patch if a user who is not logged in to Moodle accesses the
enrol/index.php page directly they were redirected to the Moodle front
page after login, rather than back to a page that would allow them to
self enrol, if it is enabled on the course.
This change will cause a user who directly accesses the page to be
redirected back to it after they have logged in, unless the course has guest
access enabled.
Thanks to Marina Glancy for suggesting the use of get_referer()
2015-04-29 09:22:14 +01:00
Andrew Nicols
3db610583e
Merge branch 'MDL-49928-master' of git://github.com/ankitagarwal/moodle
2015-04-29 13:40:44 +08:00
David Monllao
2296285748
Merge branch 'MDL-50026' of git://github.com/timhunt/moodle
2015-04-29 13:25:02 +08:00
Ankit Agarwal
b647db20e1
MDL-49928 userprofile: Reorder blocks
2015-04-29 10:15:00 +05:30
Andrew Nicols
2fac3c3c5f
Merge branch 'wip-MDL-49888-master' of git://github.com/abgreeve/moodle
2015-04-29 12:18:52 +08:00
David Monllao
5c012a7426
Merge branch 'MDL-49637' of git://github.com/NeillM/moodle
2015-04-29 12:04:43 +08:00
Eloy Lafuente (stronk7)
a916d557cf
MDL-49998 unit tests: Close the pdf objects when needed.
...
When a pdf object is instantiated and any file is loaded
with set_pdf() or load_pdf(), the files remain open until
the pdf is saved with pdf_save() or outputted with Output()..
In that cases is needed to perform an explicit Close() in
order to free resources, parsers and, ultimately, fclose()
the files.
Note that only the uses detected in the editpdf unit tests have
been fixed. I'd recommend to analyse every instance of the tcpdf
libs.
Also, there was one incorrecly reused pdf instance in then
generate_combined_pdf_for_attempt() method. Apparently it was not
leading to problems, but better use a separate instance (#246 ).
2015-04-28 19:46:50 +02:00
