60355 Commits

Author SHA1 Message Date
Dan Poltawski
534ee16ec0 MDL-35603 backup: fix coding style issues 2013-04-02 14:30:50 +08:00
Dan Poltawski
92d1453bcb Merge branch 'MDL-35603-import-limit' of git://github.com/rlorenzo/moodle 2013-04-02 14:25:35 +08:00
David Monllao
bdf808de30 MDL-38687 behat: New test
According to MDLQA-4590, an admin
can restore a course back up with
it's settings retained.
2013-04-02 14:14:01 +08:00
David Monllao
44d5af386c MDL-38687 behat: Add activity step modification
We are only supposed to look for
the activity name in @class=typename
2013-04-02 14:13:57 +08:00
Damyon Wiese
95bef9d170 MDL-36804 Assign: Fix undeclared global $USER and undefined variable $userid 2013-04-02 13:44:25 +08:00
Damyon Wiese
3a9dc7f22f MDL-36804 Assign submission history - One language string change. 2013-04-02 13:37:51 +08:00
Damyon Wiese
7b647abcb8 MDL-36804 Assignment submisison history - fix width column
Fix the width of the left column in the history and submission tables so
they all line up on the page.
2013-04-02 13:37:51 +08:00
Damyon Wiese
a13fbf5fe8 MDL-36804 Assignment - Make sure webservice only returns the last submission/grade. 2013-04-02 13:37:51 +08:00
Damyon Wiese
df211804f1 MDL-36804 mod_assign - allow students to resubmit work and display a submission + grading history
This is based on work by Davo Smith with input from Fernando Oliveira (Thanks guys!).
2013-04-02 13:37:51 +08:00
Damyon Wiese
bf6c1d0997 Merge branch 'MDL-38713-master' of git://github.com/danpoltawski/moodle 2013-04-02 13:23:00 +08:00
David Monllao
6cf9a42f6f MDL-38690 behat: New test
According to MDLQA-327, a teacher can
import data from another course.
2013-04-02 13:00:30 +08:00
Damyon Wiese
9ab0aece49 Merge branch 'MDL-38700-master' of git://github.com/danpoltawski/moodle
Conflicts:
	course/tests/courselib_test.php
2013-04-02 12:48:08 +08:00
David Monllao
2cca40c82b MDL-38785 behat: Steps definitions to add and delete comments 2013-04-02 12:07:19 +08:00
David Monllao
1fb1ccd545 MDL-38785 behat: New tests
According to MDLQA-943, users can
add comments via a comments block
2013-04-02 12:07:19 +08:00
Dan Poltawski
08e5aed273 Merge branch 'MDL-38825' of git://github.com/stronk7/moodle 2013-04-02 11:49:24 +08:00
David Monllao
739ac54ab0 MDL-38622 behat: New tests
Navigation works correctly in paged
mode, according to MDLQA-1633, MDLQA-1639,
MDLQA-1645, MDLQA-1646, MDLQA-1647,
MDLQA-1648, MDLQA-1649, MDLQA-1651,
MDLQA-1652, MDLQA-1653, MDLQA-1654
and MDLQA-1655.
2013-04-02 11:47:26 +08:00
Dan Poltawski
bf9613dd41 Merge branch 'MDL-38538_clean' of git://github.com/timhunt/moodle 2013-04-02 11:27:32 +08:00
Dan Poltawski
cbaeabbe47 Merge branch 'MDL-38702_master' of git://github.com/lazydaisy/moodle 2013-04-02 10:04:26 +08:00
Eloy Lafuente (stronk7)
a5efbe6161 Merge branch 'MDL-38814_master' of git://github.com/dmonllao/moodle 2013-04-02 03:30:30 +02:00
Eloy Lafuente (stronk7)
51cae58998 Merge branch 'MDL-38689_master' of git://github.com/dmonllao/moodle 2013-04-02 02:41:44 +02:00
Eloy Lafuente (stronk7)
d6dc3019b6 Merge branch 'MDL-38686_master' of git://github.com/dmonllao/moodle 2013-04-02 02:41:33 +02:00
Eloy Lafuente (stronk7)
1c49f7ad19 Merge branch 'MDL-38688_master' of git://github.com/dmonllao/moodle 2013-04-02 02:41:25 +02:00
Eloy Lafuente (stronk7)
49b902f858 MDL-38621 behat: whitespace fix 2013-04-02 02:28:40 +02:00
Eloy Lafuente (stronk7)
342c3f3e6c Merge branch 'MDL-38621_master' of git://github.com/dmonllao/moodle 2013-04-02 02:27:10 +02:00
Eloy Lafuente (stronk7)
3e27548431 Merge branch 'MDL-38620_master' of git://github.com/dmonllao/moodle 2013-04-02 02:26:54 +02:00
Marina Glancy
d1f8c1bd62 MDL-38708 Added course overview files (most often images) to courses 2013-04-02 11:08:21 +11:00
Marina Glancy
ddbf9b6bd2 MDL-37009 Display course info as a page instead of popup 2013-04-02 10:58:24 +11:00
Marina Glancy
09ae7ee031 MDL-37009 Deprecated all courses display functions that are not used any more
print_my_moodle(), print_remote_course(),
  print_remote_host(), print_whole_category_list(), print_category_info(), get_course_category_tree(),
  print_courses(), print_course(), get_category_courses_array(), get_category_courses_array_recursively()
2013-04-02 10:58:24 +11:00
Marina Glancy
99a364564f MDL-37009 Use new renderers for frontpage course and category listings 2013-04-02 10:58:23 +11:00
Marina Glancy
f53703b7be MDL-37009 new course listings: changes to canvas and other themes:
canvas-based themes: formal_white, magazine, splash
2013-04-02 10:58:18 +11:00
Marina Glancy
202f73f3b4 MDL-37009 new course listings: changes to base, standard and afterburner themes 2013-04-02 10:54:50 +11:00
Marina Glancy
9e76429dad MDL-37009 Display list of tagged courses using new renderer 2013-04-02 10:54:50 +11:00
Marina Glancy
6004700329 MDL-37009 Display course search results using new renderer methods 2013-04-02 10:54:49 +11:00
Marina Glancy
837d548eb2 MDL-37009 moved editing functionality from course/search.php to course/manage.php 2013-04-02 10:54:49 +11:00
Marina Glancy
8e57a6df6d MDL-37009 Display courses and categories tree on /course/index.php using new renderer
Also /course/category.php
2013-04-02 10:54:49 +11:00
Marina Glancy
9176cdb632 MDL-37009 Added function core_course_renderer::courses_list() similar to print_courses() 2013-04-02 10:54:49 +11:00
Marina Glancy
e2d70cca57 MDL-37009 Display single course info box using new course listings renderer
Header is removed from /course/info.php because it is now part of renderer function
2013-04-02 10:54:49 +11:00
Marina Glancy
43e389eabf MDL-37009 Created functions in core_course_renderer to display courses and categories listings 2013-04-02 10:54:48 +11:00
Marina Glancy
a8d683ca8e MDL-37009 function print_course_search() is moved to deprecatedlib.php 2013-04-02 10:54:48 +11:00
Marina Glancy
f4b571ab2b MDL-37009 function print_course_search() is moved to course renderer 2013-04-02 10:54:48 +11:00
Eloy Lafuente (stronk7)
12879418e9 Merge branch 'MDL-38823_master' of git://github.com/dmonllao/moodle
Conflicts:
	mod/forum/tests/behat/behat_mod_forum.php
2013-04-02 01:47:40 +02:00
Eloy Lafuente (stronk7)
23726a43d4 Merge branch 'MDL-38805_master' of git://github.com/dmonllao/moodle 2013-04-02 01:45:43 +02:00
Eloy Lafuente (stronk7)
cd4c7e9af4 Merge branch 'MDL-38804_master' of git://github.com/dmonllao/moodle 2013-04-02 01:44:59 +02:00
Eloy Lafuente (stronk7)
0f8fd3a7eb Merge branch 'MDL-38477_master' of git://github.com/dmonllao/moodle 2013-04-02 01:06:18 +02:00
Eloy Lafuente (stronk7)
2bb24f16e0 Merge branch 'MDL-38476_master' of git://github.com/dmonllao/moodle 2013-04-02 01:06:05 +02:00
Eloy Lafuente (stronk7)
55a2081d28 Merge branch 'MDL-38475_master' of git://github.com/dmonllao/moodle 2013-04-02 01:04:44 +02:00
Eloy Lafuente (stronk7)
c1bccc8ef5 Merge branch 'MDL-38439_master' of git://github.com/dmonllao/moodle 2013-04-02 01:04:31 +02:00
Eloy Lafuente (stronk7)
9f0700fb6c Merge branch 'MDL-38437_master' of git://github.com/dmonllao/moodle 2013-04-02 01:03:26 +02:00
Eloy Lafuente (stronk7)
62eb5c466e MDL-38547 behat: coding style fixes. 2013-04-01 22:40:50 +02:00
Eloy Lafuente (stronk7)
54e48dc32d Merge branch 'MDL-38547_master' of git://github.com/dmonllao/moodle 2013-04-01 22:32:06 +02:00