Commit graph

71042 commits

Author SHA1 Message Date
Sam Hemelryk
82d9aebc7d Merge branch 'MDL-3714-master' of git://github.com/andrewnicols/moodle 2014-10-08 09:39:01 +13:00
Mark Nielsen
292f663581 MDL-47569 backup: Do not close questions tag if never opened
This can happen when restoring quizzes that
do not have any questions.
2014-10-07 11:48:35 -07:00
Mark Nielsen
95dc1e42d5 MDL-47569 backup: Escape section summary for XML
This was causing the parsing of the XML
to fail because things like & were not
escaped.
2014-10-07 11:47:40 -07:00
Dan Poltawski
99675668b4 Merge branch 'MDL-45893-master-v3' of git://github.com/jethac/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-10-07 16:52:07 +01:00
Jetha Chan
854a647e62 MDL-45893 user_menu: responsive approach; fixed minor issues 2014-10-07 23:31:47 +08:00
sam marshall
c0d92241f1 MDL-47564 Availability: incorrect use of defined('PHP_UNIT') 2014-10-07 14:47:29 +01:00
Dan Poltawski
409318eeff Merge branch 'MDL-47518' of https://github.com/rlorenzo/moodle 2014-10-07 14:32:48 +01:00
Dan Poltawski
c31f7c58c1 Merge branch '46481-28' of git://github.com/samhemelryk/moodle 2014-10-07 14:25:06 +01:00
Marina Glancy
850ac50a87 Merge branch 'MDL-32870' of git://github.com/jmvedrine/moodle 2014-10-07 17:16:56 +08:00
Dan Poltawski
08abbd61c2 Merge branch 'wip-MDL-35618-master' of git://github.com/marinaglancy/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-10-07 09:24:39 +01:00
Frederic Massart
26331e3d17 MDL-46647 core_grades: Adding tests for fetch_all_helper() 2014-10-07 15:23:05 +08:00
Damyon Wiese
4a813f3959 Merge branch 'wip-MDL-36014-master' of git://github.com/marinaglancy/moodle
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
2014-10-07 12:34:34 +08:00
Sam Hemelryk
94cdabcdee Merge branch 'MDL-46284-master' of git://github.com/andrewnicols/moodle
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
2014-10-07 16:28:50 +13:00
Eloy Lafuente (stronk7)
eadcdee936 MDL-46647 grades: Fix fetch_all_helper() towards cross-db
That helper, used to fetch information from DB by all the grade_object
chidren classes was not behaving properly handling TEXT/CLOB columns.

Instead of creating a property within every class listing the
existing columns, it seems to be a better solution to instrospect
the database metadata (cached) to ensure the correct SQL is generated
in every case.
2014-10-07 10:44:08 +08:00
Marina Glancy
8dfd73e04a Merge branch 'MDL-38106-master' of git://github.com/danpoltawski/moodle 2014-10-07 10:25:29 +08:00
Sam Hemelryk
002ee6faab Merge branch 'MDL-36460-master' of git://github.com/andrewnicols/moodle 2014-10-07 15:16:54 +13:00
Marina Glancy
4e45c0319c MDL-31936 workshop: version bump 2014-10-07 10:15:54 +08:00
Marina Glancy
ae66542027 Merge branch 'MDL-31936-master-workshop-reset' of git://github.com/mudrd8mz/moodle 2014-10-07 10:08:48 +08:00
Andrew Nicols
27f7487f82 MDL-47197 core: Private files handler
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
2014-10-07 10:01:19 +08:00
Andrew Nicols
776b4acc81 MDL-46284 core: Add e-mail fetcher from IMAP
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
2014-10-07 10:01:19 +08:00
Andrew Nicols
91223df61b MDL-3714 mod_forum: Add an inbound message handler
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
2014-10-07 09:58:36 +08:00
Andrew Nicols
77c0a68db9 MDL-46284 core: Add e-mail fetcher from IMAP
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
2014-10-07 09:58:35 +08:00
Petr Skoda
41186f4f80 MDL-41593 admin: use default setting if preventexecpath active
This resolves problems when installing Moodle
and addons when preventexecpath active.

Please note the admin_setting_configfile is still
incorrectly restricted - this will be resolved by
MDL-40949.
2014-10-07 11:30:08 +13:00
Tim Hunt
24cfc09881 MDL-47556 quiz: autosave should default to on for new installs 2014-10-06 23:17:25 +01:00
Sam Hemelryk
3ba4e595fb Merge branch 'MDL-46295-master' of git://github.com/damyon/moodle 2014-10-07 10:36:48 +13:00
David Mudrák
16d364b560 MDL-31936 workshop: Improve unit tests for the course reset support 2014-10-06 23:32:32 +02:00
Sam Hemelryk
f46606936a Merge branch 'MDL-46978' of https://github.com/danielneis/moodle 2014-10-07 10:26:05 +13:00
Dan Poltawski
15b57a34df MDL-46576 grade: fix trailing whitespace 2014-10-06 18:11:25 +01:00
Dan Poltawski
f5bacd6539 Merge branch 'wip-MDL-46576-master' of git://github.com/abgreeve/moodle
Conflicts:
	lib/upgrade.txt
    lib/db/upgrade.php
	version.php
2014-10-06 18:06:13 +01:00
Dan Poltawski
fb991204a9 Merge branch 'MDL-46054-master' of git://github.com/jleyva/moodle 2014-10-06 16:01:26 +01:00
Tim Hunt
4d1fcfdf8a MDL-47547 quiz editing: minor fixes following MDL-47547
* Remove unnecessary skip links.
* Disable shortforms for form in pop-ups.
* Remove some CSS that was hurting display of the add menu.
2014-10-06 15:44:21 +01:00
Dan Poltawski
106486c7ad MDL-38106 lesson: don't require intro when upgraded 2014-10-06 14:54:53 +01:00
Dan Poltawski
9c054ebbe3 Merge branch 'MDL-45504' of git://github.com/stronk7/moodle 2014-10-06 14:00:20 +01:00
Dan Poltawski
816d082241 MDL-43089 question: fix shifter build issues 2014-10-06 13:53:26 +01:00
Marina Glancy
b79d2e2c08 Merge branch 'wip_MDL-47538_m28_phpunitseq' of git://github.com/skodak/moodle 2014-10-06 20:40:13 +08:00
Marina Glancy
2891651959 Merge branch 'MDL-46210-master' of git://github.com/danpoltawski/moodle 2014-10-06 20:39:09 +08:00
Marina Glancy
e286185334 Merge branch 'MDL-47221-master' of git://github.com/danpoltawski/moodle 2014-10-06 20:38:29 +08:00
Dan Poltawski
0892a5d65f MDL-43089 question: fix whitespace 2014-10-06 12:56:45 +01:00
Dan Poltawski
84f9d6f3df Merge branch 'MDL-43089-behat-fixup' of https://github.com/timhunt/moodle 2014-10-06 12:49:55 +01:00
Dan Poltawski
2eb24eb85a Merge branch 'MDL-43089' of git://github.com/mkassaei/moodle 2014-10-06 12:11:33 +01:00
Dan Poltawski
d79fd5cd29 Merge branch 'MDL-47426' of git://github.com/timhunt/moodle 2014-10-06 08:54:09 +01:00
Gregory Faller
452beca98d MDL-46712: Center EditPDF window on browser resize / zoom 2014-10-06 14:44:51 +08:00
Petr Skoda
ddffa9d6d3 MDL-47538 phpunit: fix invalid PHPUNIT_SEQUENCE_START constant 2014-10-06 17:31:15 +13:00
Andrew Nicols
f67b5c995e MDL-47183: viewhiddenactivities should use the module context
Thanks to Paulo Matos for the forum part of this change.
2014-10-06 12:21:49 +08:00
Marina Glancy
9b65d0dd62 MDL-36014 cohorts: specify exact cohort names in unittest 2014-10-06 09:50:29 +08:00
Marina Glancy
d512e5f833 MDL-40351 block_course_overview: minor corrections 2014-10-06 09:36:58 +08:00
Julien Boulen
076109dfbe MDL-40351 Blocks, My home: Course Categories on the My Home Page 2014-10-06 09:32:13 +08:00
Adrian Greeve
1464bcc8ed MDL-46547 gradebook: Update to print_grade_page_head
Upgrade to print_grade_page_head to include help messages in the
title of the page.
2014-10-06 09:14:04 +08:00
Adrian Greeve
aa60bda9f4 MDL-46547 gradebook: grade import plugin for drag and drop.
This allows information to be dragged and dropped directly into a
form to be imported into the gradebook.
2014-10-06 09:14:04 +08:00
Adrian Greeve
c3ba8429e1 MDL-46547 gradebook: Unit tests for new class importing csv files. 2014-10-06 09:14:04 +08:00