Commits · 96c074561d0c9bfb32178f3201f01227057872e2 · mahara / mahara

19 Apr, 2010 1 commit

Merge commit 'origin/master' into stats · 96c07456

Richard Mansfield authored Apr 19, 2010

Conflicts:

	htdocs/admin/index.php
	htdocs/lib/db/install.xml
	htdocs/lib/db/upgrade.php
	htdocs/lib/version.php
	htdocs/lib/view.php

96c07456

18 Apr, 2010 2 commits
- Allow for a general form error to be set rather than using empty string errors... · 052acd58
  Richard Mansfield authored Apr 19, 2010
```
Allow for a general form error to be set rather than using empty string errors on the submit element
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  052acd58
- Add comment to explain antispam form tricks · 93241e73
  Richard Mansfield authored Apr 19, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  93241e73
16 Apr, 2010 5 commits
- Move feedback activity type to comment plugin before installing the plugin · 3d161f36
  Richard Mansfield authored Apr 16, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  3d161f36
- Allow dataroot language pack directories to have any name · 06bbbac3
  Richard Mansfield authored Apr 16, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  06bbbac3
- More respectable version numbers · a148ca29
  Richard Mansfield authored Apr 16, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  a148ca29
- Check content for spam on anonymous feedback · 6565d5c0
  Richard Mansfield authored Apr 16, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  6565d5c0
- Allow spam score threshold to be passed for each form rather than defined on the page · 8b9ae69b
  Richard Mansfield authored Apr 16, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  8b9ae69b
15 Apr, 2010 8 commits
- Merge commit 'origin/master' into feedback · e75240bf
  Richard Mansfield authored Apr 16, 2010
  
  e75240bf
- Add comment to explain feedback js hack · 968411f1
  Richard Mansfield authored Apr 16, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  968411f1
- Move make public button to the right of feedback list & change styling · b037c37b
  Richard Mansfield authored Apr 16, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  b037c37b
- Import leap comments even when nothing is found to link them to · 05a3f76a
  Richard Mansfield authored Apr 15, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  05a3f76a
- Don't export deleted comments · 232d7fd0
  Richard Mansfield authored Apr 15, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  232d7fd0
- Don't show feedback heading unless the view already has comments or comments are allowed · e444f0df
  Richard Mansfield authored Apr 15, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  e444f0df
- Don't ignore delay,admin settings on new plugin activity types · 148fd405
  Richard Mansfield authored Apr 15, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  148fd405
- Move feedback activity type to comment artefact in new installs · 7963fb74
  Richard Mansfield authored Apr 15, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  7963fb74
14 Apr, 2010 4 commits
- Use less clashy names for internal pieforms elements · 81b32be1
  Richard Mansfield authored Apr 15, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  81b32be1
- Hash field names for anonymous add feedback form · 13268049
  Richard Mansfield authored Apr 14, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  13268049
- Move some of the antispam form stuff into pieforms for easier reuse · 6435d79c
  Richard Mansfield authored Apr 14, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  6435d79c
- Remove commented out line · 8c2ee780
  Richard Mansfield authored Apr 14, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  8c2ee780
13 Apr, 2010 1 commit
- Don't try to detach files using old feedback tables when deleting · 31ae2650
  Richard Mansfield authored Apr 13, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  31ae2650
12 Apr, 2010 12 commits

Remove old template & edit a few language strings for consistency · ee615bbf
Richard Mansfield authored Apr 13, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
ee615bbf
Fix feedback notification parameters on edit comment page · cc3390d4
Richard Mansfield authored Apr 13, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
cc3390d4
Remove unused json script & language strings for feedback · 615869f0
Richard Mansfield authored Apr 13, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
615869f0

Added "decline" link to profile verification email to pervent someone's email · 1d6f8211

Ruslan Kabalin authored Apr 12, 2010


 address locking (bug #490629).
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Signed-off-by: Francois Marier <francois@catalyst.net.nz>

1d6f8211

set menu item text based on whether or not multiple blogs are enabled · 242606f6
Evan Goldenberg authored Apr 12, 2010
```
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>
```
242606f6

Merge commit 'origin/master' into feedback · 042a900b

Richard Mansfield authored Apr 12, 2010

Conflicts:

	htdocs/admin/site/options.php
	htdocs/lang/en.utf8/admin.php
	htdocs/lib/db/upgrade.php
	htdocs/lib/version.php
	htdocs/view/artefact.php
	htdocs/view/view.php

042a900b

Leap import of comments · ece186f9
Richard Mansfield authored Apr 12, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
ece186f9

Revert "usability: always show list of blogs, even if there is only one" · fd4ee3c2

Evan Goldenberg authored Apr 12, 2010

Since the vast majority of users will only ever use one blog, always
showing the list of blogs replaces one usability issue with another. This
commit attempts to rectify things by disabling multiple blogs for
user's who only have one blog (everyone by default!) but adding an
account preference to enable multiple blogs.

 - Users with more than one blog always see the list of blogs,
   regardless of the new setting's value
 - Users with only one blog who have not enabled multiple blogs are
   taken directly to their blog, and have no direct way of adding a new
   blog
 - Users with only one blog who have enabled multiple blogs see the list
   of blogs (the assumption is that if they were clever enough to enable
   the option, this should not confuse them)

This reverts commit f257176e

.
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>

fd4ee3c2

replace a database upgrade that changed captcha settings · fb17f587

Evan Goldenberg authored Apr 12, 2010



This was removed as part of preparation for anti-spam, but it was later
decided that old upgrades should always be left untouched. Instead, this
commit adds an additional upgrade that removes the relevant settings
from the database.
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>

fb17f587

refactor antispam database upgrade into an independent function · 9a27c8b6
Evan Goldenberg authored Apr 12, 2010
```
Also, call that function when Mahara is installed.
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>
```
9a27c8b6
add the submittedtime column to the database schema used when installing · 2947d111
Evan Goldenberg authored Apr 12, 2010
```
mahara
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>
```
2947d111
Warn rather than dying horribly when mime_content_type function is unavailable · 68e6df82
Richard Mansfield authored Apr 12, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
68e6df82

09 Apr, 2010 3 commits
- Leap export for comments · 58792a9d
  Richard Mansfield authored Apr 09, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  58792a9d
- Give import plugins an opportunity to set up relationships to entries imported as mahara views · b779fb0f
  Richard Mansfield authored Apr 09, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  b779fb0f
- Remove unused template · f7d1ce5a
  Richard Mansfield authored Apr 09, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  f7d1ce5a
08 Apr, 2010 4 commits

use language strings for spam trap names (bug #557873) · 17b3010e
Evan Goldenberg authored Apr 08, 2010
```
Signed-off-by: Evan Goldenberg <evangoldenberg@gmail.com>
```
17b3010e

artefact/resume: rename artefact from Resumé to Résumé · fab9968f

Francois Marier authored Apr 08, 2010



According to most dictionaries, all three forms are acceptable:
- Resume
- Resumé
- Résumé

If we're gonna use accents though, might as well use all of them and match
the original French word it's derived from.
Signed-off-by: Francois Marier <francois@catalyst.net.nz>
Signed-off-by: Penny Leach <penny@mjollnir.org>

fab9968f

usability: show terms and conditions directly on registration page · 4043b646
Evan Goldenberg authored Mar 10, 2010
```
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>
Signed-off-by: Francois Marier <francois@catalyst.net.nz>
```
4043b646
show date and time of view submission (bug #547981) · 67e87a54
Evan Goldenberg authored Apr 08, 2010
```
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>
```
67e87a54