Commits · 3da69efbb35473b7220f2a3f0b6cb0cf6611d9bd · mahara / mahara

02 May, 2011 7 commits
- Merge "Remove vertical space from descriptions in tag search results list (bug #681211)" · 3da69efb
  Richard Mansfield authored May 02, 2011
  
  3da69efb
- Merge "Upgrade jQuery from 1.3.2 to 1.5.2" · bd1ed37a
  Francois Marier authored May 02, 2011
  
  bd1ed37a
- Merge "Fix warning when registering an account" · 78a81da4
  Richard Mansfield authored May 02, 2011
  
  78a81da4
- Merge "Fix artefact fixer methods (bug #772976)" · 7e530034
  Francois Marier authored May 02, 2011
  
  7e530034
- Merge "add prompt to try again later (bug #771157)" · 3c937b9e
  Francois Marier authored May 02, 2011
  
  3c937b9e
- Merge "Add sorting for spam traps (bug #702264)" · f5a920e6
  Francois Marier authored May 02, 2011
  
  f5a920e6
- Remove vertical space from descriptions in tag search results list (bug #681211) · e44bbbe9
  Richard Mansfield authored May 02, 2011
```
Change-Id: I946d2b084d2292141b0e9ffdc8b5dd1c956e6d45
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  e44bbbe9
01 May, 2011 2 commits

Add sorting for spam traps (bug #702264) · 964fbbb7

Melissa Draper authored May 02, 2011



Change-Id: I88deb431234cc70e7d5b79d0ba2c8bd3c20ac48d
Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>

964fbbb7

Upgrade jQuery from 1.3.2 to 1.5.2 · acffc8a1

Darryl Hamilton authored May 02, 2011



Change-Id: Ie794ff5881fbc4e8701d41376835bd8413114fc0
Signed-off-by: Darryl Hamilton <darrylh@catalyst.net.nz>

acffc8a1

29 Apr, 2011 10 commits

Fix artefact fixer methods (bug #772976) · 23bf93fb

Darryl Hamilton authored Apr 29, 2011



Change-Id: I1153b94bd7a24f3b0e5696bde0a81aebd5746322
Signed-off-by: Darryl Hamilton <darrylh@catalyst.net.nz>

23bf93fb

add prompt to try again later (bug #771157) · e4f8133f

Melissa Draper authored Apr 29, 2011



Change-Id: I060e5d45d334391bee09f1dd1e239e5a278453fe
Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>

e4f8133f

Merge changes I8575a507,I9b7277d7,I5dd34049,I0ecb1970,I385b7d17,I5e36183b,Ief0446a1 · 7f0b0d08

Francois Marier authored Apr 29, 2011

* changes:
  Updating XML Feed Parser README.Mahara with changes and commit IDs
  Use XPath to find <link> elements (ignore atom:link) (bug #750815) (cherry picked from commit e662d5d9)
  Patching XML Feed Reader 1.0.4 - adding $suppressWarnings fix (bug #750815) (cherry picked from commit 48b8953c)
  Patch from 1.0.3 to 1.0.4 (Bug #750815)
  Upgrade Image_Canvas - 0.3.2 to 0.3.3 (bug #750815)
  Upgrade Archive_Tar - 1.3.3 to 1.3.7 (bug #750815)
  Upgrade PEAR.php - 1.9.0 to 1.9.2 (bug #750815)

7f0b0d08

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
Updating XML Feed Parser README.Mahara with changes and commit IDs · c5172f50
Darryl Hamilton authored Apr 29, 2011
```
Change-Id: I8575a507b4ce7a204047993104892d9c311a0787
Signed-off-by: Darryl Hamilton <darrylh@catalyst.net.nz>
```
c5172f50

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

Fix warning when registering an account · 3cee55f8

Francois Marier authored Apr 29, 2011



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

3cee55f8

28 Apr, 2011 15 commits

Use XPath to find <link> elements (ignore atom:link) (bug #750815) · 64fd0805

Darryl Hamilton authored Apr 29, 2011

(cherry picked from commit e662d5d9

)

Change-Id: I9b7277d7776278a93d90063b5877209244387102
Signed-off-by: Darryl Hamilton <darrylh@catalyst.net.nz>

64fd0805

Patching XML Feed Reader 1.0.4 - adding $suppressWarnings fix (bug #750815) · 86876df5

Darryl Hamilton authored Apr 29, 2011

(cherry picked from commit 48b8953c

)

Change-Id: I5dd34049292c7624220312d44496d64bc4cb4980
Signed-off-by: Darryl Hamilton <darrylh@catalyst.net.nz>

86876df5

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

25978130

Patch from 1.0.3 to 1.0.4 (Bug #750815) · b039286b

Darryl Hamilton authored Apr 29, 2011



Change-Id: I0ecb1970326b48c48a53b71d3c1f238053d80b56
Signed-off-by: Darryl Hamilton <darrylh@catalyst.net.nz>

b039286b

Upgrade Image_Canvas - 0.3.2 to 0.3.3 (bug #750815) · 6d51c6a2

Darryl Hamilton authored Apr 29, 2011



Change-Id: I385b7d17490d18bd5efa9bc314ad84fa0b9ec483
Signed-off-by: Darryl Hamilton <darrylh@catalyst.net.nz>

6d51c6a2

Upgrade Archive_Tar - 1.3.3 to 1.3.7 (bug #750815) · 0e525f94

Darryl Hamilton authored Apr 29, 2011



Change-Id: I5e36183b7683337c3725e609ddfe062fa4208b73
Signed-off-by: Darryl Hamilton <darrylh@catalyst.net.nz>

0e525f94

Upgrade PEAR.php - 1.9.0 to 1.9.2 (bug #750815) · 7762f41a

Darryl Hamilton authored Apr 29, 2011



Change-Id: Ief0446a1167899b094d3d9510099e28cfafa8915
Signed-off-by: Darryl Hamilton <darrylh@catalyst.net.nz>

7762f41a

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 6 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