Commit graph

3425 commits

Author SHA1 Message Date
gustav_delius
e132d90e02 merged Enrique's correction from stable 2005-06-04 22:14:08 +00:00
ecastrolt
9f701b4c5e *** empty log message *** 2005-06-04 21:14:57 +00:00
defacer
491cc6d617 Merging from STABLE:
Fixing all Tidy warnings in this page. This has to be A Good Thing.
2005-06-04 17:53:36 +00:00
stronk7
92b90adf53 Changed name of the container category a bit and avoided one notice.
Merged from MOODLE_15_STABLE
2005-06-04 15:42:01 +00:00
gustav_delius
7bbe08a267 Merged from stable 2005-06-04 09:58:35 +00:00
defacer
731df4595c Merging from STABLE:
Fix for bug 3316: Now students which have attempted the quiz but have
since been unenrolled from the course are shown with a dimmed style.

Also merging Gustav's nicer error messages (the MERGED tag wasn't up to date)
2005-06-04 00:21:00 +00:00
stronk7
b2abce7ccf Added support for forum->trackingtype
Merged from MOODLE_15_STABLE
2005-06-03 17:37:11 +00:00
stronk7
8f999b78dc Bump!
Deletion (or move to site course) of orphan categories
executed in the upgrade process. Now we shouldn't have
such orphans anymore! B-)

Part of bug 2459
(http://moodle.org/bugs/bug.php?op=show&bugid=2459)

Important NOTE: In the upgrade code for postgreSQL I've included
                some steps that weren't up to date. They seem to
                standard SQL code but they should be tested
                properly.... hope all works!

Merged from MOODLE_15_STABLE
2005-06-03 12:53:58 +00:00
stronk7
465ce22cf0 Deletion (or move to site course) of orphan categories
executed in the upgrade process. Now we shouldn't have
such orphans anymore! B-)

Part of bug 2459
(http://moodle.org/bugs/bug.php?op=show&bugid=2459)

Important NOTE: In the upgrade code for postgreSQL I've included
                some steps that weren't up to date. They seem to
                standard SQL code but they should be tested
                properly.... hope all works!

Merged from MOODLE_15_STABLE
2005-06-03 12:52:22 +00:00
moodler
2bf5b5d4fc Merged fixes from stable 2005-06-03 12:22:54 +00:00
moodler
7d45304236 Removing Attendance from main tree (it's now in contrib/attendance) 2005-06-02 14:18:43 +00:00
gustav_delius
ebbb178e35 tiny tweaks 2005-06-01 19:02:07 +00:00
mindforge
1732e1a00f Added multianswer explanation. 2005-06-01 13:03:12 +00:00
moodler
5a82dafa75 Merging fixes from MOODLE_15_STABLE 2005-06-01 08:15:21 +00:00
gustav_delius
6851e7cd4a merged fix of bug 3377 2005-06-01 06:44:35 +00:00
mindforge
b27d7b3b6b Documentation about response storage and the beginning of a glossary for quiz specific terminology. 2005-05-31 23:10:18 +00:00
moodler
736f191c1d Added event handling to new assignment. Whopos! 2005-05-31 23:00:20 +00:00
stronk7
9ea6ac5105 Complete refactor of quiz_delete_course()
Now this function works following this:
- Iterate over every quiz category in the course (following parent-child relationships).
- If the category is being used*, move it to site level (under a container category) and
      mark it as published.
- If the category isn't being used, remove** it completely (questions, instances...) and
      re-parent its child categories.
- Feedback is shown in a table detailing all the changes performed.

* One category is being used if it has one question that is being used in any quiz,
  independently of its publish status.
** Removal of categories (and associated questions) has benn improved but, it won't
  be perfect until bug 3366 was solved.

Tested against some large courses with reused questions and multiple levels of
categories. Seems to work but

PLEASE TEST IT AND SEND ANY FEEDBACK TO BUG 2459
(http://moodle.org/bugs/bug.php?op=show&bugid=2459)

Exactly this function is going to be used in the upgrade script to solve
the orphan categories issue and it must work perfectly!

Merged from MOODLE_15_STABLE
2005-05-31 22:35:04 +00:00
stronk7
3686d611d9 Simplify the quizzes_category_used() function.
I was using the $excluded parameter to avoid
loops between categories. A->B->A. Think we can
assume such loops won't exist, so I've deleted
the $excluded use.

Merged from MOODLE_15_STABLE
2005-05-31 16:33:18 +00:00
thepurpleblob
18c89ac630 merged from STABLE 2005-05-31 15:19:00 +00:00
thepurpleblob
3754d9b724 Merged changes from STABLE 2005-05-31 14:22:26 +00:00
thepurpleblob
55631ee73a Merged from STABLE 2005-05-31 13:35:15 +00:00
thepurpleblob
8cedc8a7f5 Merged changes from STABLE 2005-05-31 10:12:13 +00:00
stronk7
ca653ec706 Added the sort_categories_by_tree() function that
returns an ordered array of categories following
the parent-child relationships. It doesn't forget
any category and returns all the categories passed
although their parent were incorrect. Try to build
as much tree structure as possible.

Merged from MOODLE_15_STABLE
2005-05-30 23:59:42 +00:00
gbateson
53ed0d14c8 size of top frame, if any, set using $CFG->resource_framesize 2005-05-30 23:13:56 +00:00
gbateson
96a4f85bd3 Additional explanation for quiz module add-in in Moodle 1.4.5 2005-05-30 23:06:05 +00:00
stronk7
b5b6aa75a1 Now the quizzes_category_used() function supports searching
for uses recursively plus an array of excluded categories.

Needed to solve bug 2459...in progress.

Merged from MOODLE_15_STABLE
2005-05-30 22:29:47 +00:00
ecastrolt
083fc55c3e *** empty log message *** 2005-05-29 23:53:50 +00:00
stronk7
0ca4fa367c Added the quizzes_category_used() to detect the list of
quizzes that are using questions from one category.

It relies in the quizzes_question_used() function. Will
be use in the 'orphan_categories' bug (#2459)

(http://moodle.org/bugs/bug.php?op=show&bugid=2459)

Merged from MOODLE_15_STABLE

With some previously unmerged changes added too!! Please check them
Gustav!!
2005-05-29 19:02:51 +00:00
moodler
a8d7ea4df3 Merged search results fix from stable 2005-05-29 04:05:53 +00:00
michaelpenne
2a6f9ad5c9 forgot to escape some " 2005-05-27 22:28:55 +00:00
michaelpenne
6c643a1dcc added an alt tag for images (nothing meaningful though) 2005-05-27 22:14:28 +00:00
michaelpenne
669b0fab9a strips end lines properly now. Directory fixes for book imports 2005-05-27 20:50:55 +00:00
moodler
8213916d2b Merged extra style from stable 2005-05-27 14:58:15 +00:00
bobopinna
b5151f3399 Added AICC API support 2005-05-27 09:05:04 +00:00
michaelpenne
a2714c13f3 now creates lesson directory in moddata for the images. also supports the different slasharguments for files 2005-05-26 23:41:50 +00:00
michaelpenne
7abd498b12 more flexible to catch more content for importing 2005-05-26 21:38:54 +00:00
moodler
b3d8e59a29 Add a little robustness to the listing (old assignment types etc) 2005-05-26 15:24:33 +00:00
bobopinna
d475f685c2 Fixed some bugs - Now AICC launching seems to work. 2005-05-26 09:48:45 +00:00
gustav_delius
5ecf32ebf2 update of versioning doc 2005-05-26 07:54:48 +00:00
gustav_delius
a2bb02cce2 updates to versioning documentation 2005-05-25 22:23:17 +00:00
defacer
46bba3597c Merging bugfix for 3334 (if at first you don't succeed edition) 2005-05-25 17:57:53 +00:00
mindforge
1e726a9645 Versioning documentation continued. Issues raised inside the document. 2005-05-25 17:48:23 +00:00
defacer
a058decd5e Merging fix for bug 3334 from 1.5 STABLE branch. 2005-05-25 14:38:06 +00:00
gustav_delius
c724f48209 updated database creation by exporting from my database that was created by updating from 1.4. Merge from 1.5 2005-05-25 06:15:21 +00:00
michaelpenne
cfcdb4b56e added a > to a table tag 2005-05-24 21:21:21 +00:00
michaelpenne
9f10d4d184 changed an include from lib.php to locallib.php and converted some numbers to constants 2005-05-24 21:02:16 +00:00
michaelpenne
be154395e8 when editing a lesson for the first time, added a link to importppt.php in the list of options 2005-05-24 20:28:20 +00:00
michaelpenne
8707ce6910 new import script to import powerpoint slides (exported as html) 2005-05-24 20:26:21 +00:00
gustav_delius
ee68029a88 merged fix for bug 3329 2005-05-24 16:11:55 +00:00