2190 Commits

Author SHA1 Message Date
moodler
36d9d5f70e Merged fixes from stable 2004-08-30 06:29:54 +00:00
moodler
cb99babcdd Merged new string from stable 2004-08-30 04:23:04 +00:00
moodler
d8f912d56c Fixed Gustav's typo in the version ... bug 1841 2004-08-30 02:56:55 +00:00
stronk7
00083db4ea Check that glossary is correct before edit categories.
Bug 1838
(http://moodle.org/bugs/bug.php?op=show&bugid=1838)

Merged from MOODLE_14_STABLE
2004-08-29 23:28:57 +00:00
stronk7
8a2fe40709 strip_tags() to some parameters. Thanks skodak.
Bug 1836
(http://moodle.org/bugs/bug.php?op=show&bugid=1836)

Merged from MOODLE_14_STABLE
2004-08-29 22:57:41 +00:00
stronk7
92a9d64495 Typo. Thanks to skodak.
Bug 1839
(http://moodle.org/bugs/bug.php?op=show&bugid=1839)

Merged from MOODLE_14_STABLE
2004-08-29 22:04:20 +00:00
gustav_delius
7b5944cdb3 Can now force subscribe INITIALLY, implementing suggestion by Howard in bug 1084 2004-08-29 19:17:27 +00:00
gustav_delius
709f0ec8d5 Can now force subscribe INITIALLY, implementing suggestion by Howard in bug 1084 2004-08-29 18:20:13 +00:00
gustav_delius
222ac91bc9 removed unnecessary calls to get_site() 2004-08-29 14:15:40 +00:00
moodler
86507185ac Merged help button fix from stable 2004-08-29 07:38:48 +00:00
stronk7
6a32aef521 Define a bit better the 'automatic link' feature at glossary and entry levels.
Bug 1745
(http://moodle.org/bugs/bug.php?op=show&bugid=1745)

Merged from MOODLE_14_STABLE
2004-08-29 00:14:21 +00:00
stronk7
1cc2152658 If we are updating an entry, compare current session user with
existing entry user to avoid some potential problems if secureforms=off
Perhaps too much security? Anyway thanks to skodak

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

Merged from MOODLE_14_STABLE
2004-08-28 23:22:34 +00:00
stronk7
c16caf5bc9 Avoid one notice
Merged from MOODLE_14_STABLE
2004-08-28 20:00:35 +00:00
stronk7
f15b491efb HTML editor (format popup) display wrong in glossary comments
Bug 1826
(http://moodle.org/bugs/bug.php?op=show&bugid=1826)

Merged from MOODLE_14_STABLE
2004-08-28 19:48:56 +00:00
stronk7
59c265b390 Now students cannot add/edit/delete entries if glossary->studentcanpost = 0
using manual URLs.

Merged from MOODLE_14_STABLE
2004-08-28 19:15:52 +00:00
stronk7
944d82d4d3 - students cannot add/edit/delete comments if it isn't allowed
- students can view comments if they exist
- teachers bypass the commentsallowed field always (this can be useful to create glossaries with public comments from the teacher).
- buttons are showed correctly.

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

Merged from MOODLE_14_STABLE
2004-08-28 18:34:10 +00:00
moodler
339352427c Merged new settings from stable 2004-08-28 17:20:55 +00:00
stronk7
864616e5f5 Merged from MOODLE_14_STABLE 2004-08-28 11:25:39 +00:00
stronk7
cf1ab7c300 Now action is checked and defaults to edit.
Thanks skodak!

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

Merged from MOODLE_14_STABLE
2004-08-28 11:13:48 +00:00
stronk7
516c7276e5 Now maxeditingtime for entries work againt timecreated instead of timemodified.
Thanks skodak!

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

Merged from MOODLE_14_STABLE
2004-08-28 10:56:42 +00:00
moodler
782e1aa6ef Fix bug 1787 where clean_text is applied on input with slashes added 2004-08-28 07:56:42 +00:00
moodler
006d723195 Merged from stable 2004-08-28 05:17:13 +00:00
stronk7
3a512f86c7 Some important changes arrive:
- 'editalways' applied to comments.
   - some minor notices out.
   - security bug solved:
      + users cannot edit any comment now.
      + users cannot delete any comment now.
      + users cannot edit any entry now.
      + users cannot delete any antry now.

Thanks to skodak, discovering the bug!!!

Merged from MOODLE_14_STABLE
2004-08-28 00:28:56 +00:00
stronk7
b5937aac55 Init 2 arrays
Merged from MOODLE_14_STABLE
2004-08-27 17:21:42 +00:00
stronk7
7275671a60 Now, terms being defined in URLs aren't broken by the <nolink> tag.
Bug 1790
(http://moodle.org/bugs/bug.php?op=show&bugid=1790)

Merged from MOODLE_14_STABLE
2004-08-27 16:49:52 +00:00
moodler
f79fface79 Merged changes from STABLE to add new collapsible sections to mod edit forms 2004-08-27 09:50:11 +00:00
stronk7
193a26447b Error when sending a delete-entry action to logs... 2004-08-27 09:13:32 +00:00
moodler
43b46f0c0c Tidied up file resource with hidden form sections 2004-08-27 08:53:48 +00:00
moodler
fcb8e1a4eb Replacing the examples.txt that Howard deleted accidentally ;-) 2004-08-27 04:41:42 +00:00
stronk7
122579aacd Another duplicated tag....now it's really well-formed :-)
Meged from MOODLE_14_STABLE
2004-08-27 00:59:07 +00:00
stronk7
5c9b8beb86 Found it!!!!
A missing </select> was the cause to the wrong display under Safari!!!

Merged from MOODLE_14_STABLE
2004-08-27 00:52:08 +00:00
stronk7
d564a85c57 Solved some inconsistencies when using the HTML editor and the
format menu!!

Merged from MOODLE_14_STABLE
2004-08-27 00:07:46 +00:00
gustav_delius
c83712b3de fixed my own typo, bug 1798 2004-08-26 22:22:56 +00:00
stronk7
7567ff7b06 Notice out.
Merged from MOODLE_14_STABLE
2004-08-26 21:39:18 +00:00
paca70
5586395f75 Postgresql wants 'as' be used. 2004-08-26 18:50:08 +00:00
moodler
1290953e40 Merged changes from stable 2004-08-26 15:23:07 +00:00
moodler
359f27588b Merged from stable 2004-08-26 15:21:57 +00:00
moodler
2b08c2ab0d Merged from stable 2004-08-26 14:47:52 +00:00
moodler
ac00b904da Merged changes from stable 2004-08-26 14:21:26 +00:00
moodler
3fbffafb8b Merged updates from stable 2004-08-26 13:01:36 +00:00
stronk7
2e506e609b Notice out.
Merged from 14_STABLE
2004-08-26 11:18:28 +00:00
stronk7
c4e86f0895 Merged from 14_STABLE
Bug 1788
(http://moodle.org/bugs/bug.php?op=show&bugid=1788)
2004-08-26 10:58:49 +00:00
defacer
0469cccfe2 Merging latest changes from MOODLE_14_STABLE 2004-08-26 10:44:32 +00:00
defacer
e2b5964ee0 Merging latest changes from MOODLE_14_STABLE. 2004-08-25 11:00:27 +00:00
defacer
96a391a5fd Merging MOODLE_14_STABLE changes. 2004-08-25 10:52:56 +00:00
defacer
6fb2f8230e Manually committing a copy from the 14_STABLE branch to sort out a tagging
problem I talked with Gustav about yesterday.
2004-08-25 10:46:34 +00:00
bobopinna
d64bc8aea6 Patched a problem with asset resources 2004-08-25 08:34:52 +00:00
stronk7
32ce883ee6 Don't clean posted text on input (will be cleaned on output).
Merged from MOODLE_14_STABLE
2004-08-24 22:59:54 +00:00
stronk7
2603b5b30a one more warning out
Merged from MOODLE_14_STABLE
2004-08-24 20:59:54 +00:00
stronk7
e11a8fe93d Avoid some warnings
Bug 1729
(http://moodle.org/bugs/bug.php?op=show&bugid=1729)

Merged from MOODLE_14_STABLE
2004-08-24 20:40:49 +00:00