Commits · c02816e4b80ee1f43171b0c3fea1852900fe2314 · mahara / mahara

29 Apr, 2011 5 commits
- Merge "Add export callback for image based artefacts (bug #753208)" · c02816e4
  Francois Marier authored Apr 29, 2011
  
  c02816e4
- Merge "mail/noreplyaddress: Added option in site options to set noreplyaddress" · 96d9283d
  Francois Marier authored Apr 29, 2011
  
  96d9283d
- Merge "description is lost when copying a view/page" · c532653d
  Francois Marier authored Apr 29, 2011
  
  c532653d
- remove special greetings (bug 758382) · 6575aab6
  Melissa Draper authored Apr 29, 2011
```
Change-Id: I18ed5c9964a234e4d1d7e55c02ef61308c88b894
Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>
```
  6575aab6
- mail/noreplyaddress: Added option in site options to set noreplyaddress · 92053f4c
  Hugh Davenport authored Apr 29, 2011
```
Option is greyed if specified in config.php

bug #738267

Change-Id: Ide6fc1a70d6536b4d8235a1c50800f12b0de7160
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>
```
  92053f4c
28 Apr, 2011 9 commits

Merge "type error in creatviewtemplateselect.html" · 25978130
Francois Marier authored Apr 29, 2011

25978130

type error in creatviewtemplateselect.html · 2a03b086

Hugh Davenport authored Apr 28, 2011



bug #770468

Change-Id: If59e7f141bd2a55a800ee01b3e8fd130b62a1c70
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>

2a03b086

Merge "change view to page in view.php" · 1082001c
Francois Marier authored Apr 28, 2011

1082001c

creativecommon: sanitise value of licensetype · 72d70bc1

Francois Marier authored Apr 27, 2011



This is not believed to be exploitable in any way, but for good
measure, let's restrict the links that can be included here.

Change-Id: I92da56601e8461bbae1e9eb8e2dc16ca8b9b64bf
Signed-off-by: Francois Marier <francois@catalyst.net.nz>

72d70bc1

Merge "change blog to journal in view.php" · 9fd9fee1
Francois Marier authored Apr 28, 2011

9fd9fee1

description is lost when copying a view/page · bd5329a7

Hugh Davenport authored Apr 28, 2011



bug #743461

Change-Id: Iefc4fe60acc9491f350c399510f7bdf7402c22ac
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>

bd5329a7

change view to page in view.php · 4feb505b

Hugh Davenport authored Apr 28, 2011



bug #771152

Change-Id: I9a2e3ca1590bea8ea1cb7da0f20553536ef38d4a
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>

4feb505b

change blog to journal in view.php · ce4f3615

Hugh Davenport authored Apr 28, 2011



bug #771144

Change-Id: I80575e49d1c99e2caa80b8403e6042e49ae4850e
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>

ce4f3615

grammar error in mygroups.html · 7328f045

Hugh Davenport authored Apr 28, 2011



bug #770496

Change-Id: I643397e49a5f55479f5e2410a06f6f78b3ff2800
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>

7328f045

27 Apr, 2011 9 commits
- Merge "Add '/index.html' to end of collection link urls (bug #753207)" · 6b1279f1
  Richard Mansfield authored Apr 28, 2011
  
  6b1279f1
- Merge "Remove unnecessary temporary variable in display_name()" · d6613b56
  Richard Mansfield authored Apr 28, 2011
  
  d6613b56
- Merge "Refactor display_name() to make owner optional" · dec9b6a5
  Richard Mansfield authored Apr 28, 2011
  
  dec9b6a5
- Add export callback for image based artefacts (bug #753208) · d9bc1c52
  Darryl Hamilton authored Apr 27, 2011
```
Change-Id: I15f97c229bfe3e9a18cdffe4202acbb635286056
Signed-off-by: Darryl Hamilton <darrylh@catalyst.net.nz>
```
  d9bc1c52
- Add '/index.html' to end of collection link urls (bug #753207) · 16baf04b
  Darryl Hamilton authored Apr 27, 2011
```
Change-Id: Ia127f9c4f537478dd84f98bdaedda4320861b773
Signed-off-by: Darryl Hamilton <darrylh@catalyst.net.nz>
```
  16baf04b
- Merge "Catch broken/incorrect theme config (bug #744591)" · fb37e77e
  Francois Marier authored Apr 27, 2011
  
  fb37e77e
- Remove unnecessary temporary variable in display_name() · 9af776c6
  Francois Marier authored Apr 27, 2011
```
Now that it's only used once, there's no need for a temp variable.

Change-Id: Idf0d3f57fda658f67730a2e2b6b50a318184f1fb
Signed-off-by: Francois Marier <francois@catalyst.net.nz>
```
  9af776c6
- Refactor display_name() to make owner optional · e778c279
  Francois Marier authored Apr 27, 2011
```
This also allows third parties to get to the owner link directly.

Change-Id: I318b252152d74d1b5480dc82afebc41cd6106c42
Signed-off-by: Francois Marier <francois@catalyst.net.nz>
```
  e778c279
- Catch broken/incorrect theme config (bug #744591) · 8ca45190
  Darryl Hamilton authored Apr 26, 2011
```
Change-Id: I25214a83290a1948a6cedcadb5937fa6fcdbaff6
Signed-off-by: Darryl Hamilton <darrylh@catalyst.net.nz>
```
  8ca45190
26 Apr, 2011 1 commit

Fix string duplication is smtpsecure help file (bug #768466) · cd1f13f1

Ruslan Kabalin authored Apr 26, 2011



Change-Id: I28374746b3b54788054eb1173544840f8e8a65e6
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>

cd1f13f1

25 Apr, 2011 2 commits
- Merge "Add trailing slash autocorrection for wwwroot (bug #745426)" · 1466e7da
  Francois Marier authored Apr 26, 2011
  
  1466e7da
- Add trailing slash autocorrection for wwwroot (bug #745426) · 577019db
  Darryl Hamilton authored Apr 21, 2011
```
Change-Id: I9c04ac01f65c983a54015e370fd592b8a4bfc147
Signed-off-by: Darryl Hamilton <darrylh@catalyst.net.nz>
```
  577019db
24 Apr, 2011 1 commit
- Merge "Add a line in the logs for each plugin installed Reduce log noise from... · f9b061dd
  Francois Marier authored Apr 24, 2011
```
Merge "Add a line in the logs for each plugin installed Reduce log noise from html filter & mime type messages"
```
  f9b061dd
21 Apr, 2011 9 commits
- Merge "Remove old comment (untrue due to fix for bug #662424)" · e93ee084
  Ruslan Kabalin authored Apr 21, 2011
  
  e93ee084
- Merge "Stop shipping a .htaccess file (Bug #766800)" · 4528f5fb
  Andrew Robert Nicols authored Apr 21, 2011
  
  4528f5fb
- Merge "Add an interface for email settings configuration." · 35a357c4
  Ruslan Kabalin authored Apr 21, 2011
  
  35a357c4
- Remove old comment (untrue due to fix for bug #662424) · 6570f004
  Richard Mansfield authored Apr 21, 2011
```
Change-Id: I894c1c2b7859bd198a5a89218ceabea0cd547b7a
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  6570f004
- Merge "Set the mime type/extension on saved files (Bug #735884)" · 5a3a449a
  Francois Marier authored Apr 21, 2011
  
  5a3a449a
- Merge "Fix for password setting in csv user upload (bug #767974)" · 981f593e
  Francois Marier authored Apr 21, 2011
  
  981f593e
- Merge "Add admin option to change a users username (Bug #633273)" · 5b067df7
  Richard Mansfield authored Apr 21, 2011
  
  5b067df7
- Add admin option to change a users username (Bug #633273) · 1179587f
  Darryl Hamilton authored Apr 20, 2011
```
Change-Id: Ie203de378ddb3af9248c7dcf17cd304c7775abe0
Signed-off-by: Darryl Hamilton <darrylh@catalyst.net.nz>
```
  1179587f
- Fix for password setting in csv user upload (bug #767974) · 7c90aa74
  Richard Mansfield authored Apr 21, 2011
```
Change-Id: I6a6e00c3d58c12520f17fc05b9f0086c0d42ddb9
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  7c90aa74
20 Apr, 2011 4 commits
- Merge "Update wording when deleting a view (bug #605705)" · e7c44a14
  Richard Mansfield authored Apr 21, 2011
  
  e7c44a14
- Add an interface for email settings configuration. · 18062f22
  Ruslan Kabalin authored Apr 14, 2011
```
Change-Id: I4b6646fd89e410e71d75c0bbd6b0e40caa30ceb5
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
```
  18062f22
- Add a line in the logs for each plugin installed · 9b5aab02
  Richard Mansfield authored Apr 20, 2011
```
Reduce log noise from html filter & mime type messages

Change-Id: I58c7abd79b9db737cff95f8eeb10c36d691d8860
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  9b5aab02
- Set the mime type/extension on saved files (Bug #735884) · 8f07b41a
  Darryl Hamilton authored Apr 20, 2011
```
Change-Id: Ic1db3529aa7d03aeecd4e1b3a59365221e8e1a8d
Signed-off-by: Darryl Hamilton <darrylh@catalyst.net.nz>
```
  8f07b41a