Commits · 1d3049d2ebf65eead1c934c446cbd07d5c3f89ee · mahara / mahara

07 Apr, 2010 3 commits

Francois Marier authored Apr 07, 2010



The Leap2A specification has rebranded and thus we should reflect that
change in the next Mahara release.

I also updated a few URLs.
Signed-off-by: Francois Marier <francois@catalyst.net.nz>

1d3049d2

Installation page: reformat and reword · cd63276d

Francois Marier authored Apr 07, 2010

Move the copyright statement next to the permission statement (as per
http://www.fsf.org/licensing/education/licenses/gpl-howto.html

).

Rename the "I agree" button since technically users/admins don't have
to agree to the GPL before they install Mahara or use it.
Signed-off-by: Francois Marier <francois@catalyst.net.nz>

cd63276d

prevent views from taking on an impossible number of columns · ec7d19fd

Evan Goldenberg authored Apr 07, 2010

This stems from an issue where a user's profile view somehow ended up
with numcolumns set to 6 in the database. The root cause of the problem
is unknown, but this should prevent views from entering a broken state.
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>

ec7d19fd

06 Apr, 2010 3 commits
- Merge commit 'mahara-security/master' · 24bc4d44
  Richard Mansfield authored Apr 06, 2010
  
  24bc4d44
- add missing closing tag in blog template · 0e8c9a17
  Evan Goldenberg authored Apr 06, 2010
```
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>
```
  0e8c9a17
- don't force the profile icon to be 50x50 · 40893d4e
  Evan Goldenberg authored Apr 06, 2010
```
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>
```
  40893d4e
28 Mar, 2010 1 commit
- Use require_once() not require() in more places where local/lib.php may have already included libs · bd294fdc
  Richard Mansfield authored Mar 29, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  bd294fdc
25 Mar, 2010 1 commit
- Use require_once() not require() in places where local/lib.php may have already included some libs · 95f8ff65
  Richard Mansfield authored Mar 25, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  95f8ff65
24 Mar, 2010 3 commits
- copy a file to stop 404 errors · c3a944ca
  Evan Goldenberg authored Mar 24, 2010
```
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>
(cherry picked from commit fb3c0d27a53a5ef258ad127d8e9c500a70a55714)
```
  c3a944ca
- Merge branch 'master' of git@gitorious.org:mahara/mahara · 9aea196e
  Piers Harding authored Mar 24, 2010
  
  9aea196e
- auth/saml: fix problem with distinction of users between authinstances. · 635ab613
  Piers Harding authored Mar 24, 2010
  
  635ab613
23 Mar, 2010 3 commits
- Find by realname bug fix · eca7bfa6
  Ruslan Kabalin authored Mar 24, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  eca7bfa6
- cast properly... · 32f72753
  Evan Goldenberg authored Mar 23, 2010
```
The last commit fixed postgres but broke mysql. Woops.
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>
```
  32f72753
- explicitly cast text to integer to prevent postgres errors · e0e29ebe
  Evan Goldenberg authored Mar 23, 2010
```
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>
```
  e0e29ebe
22 Mar, 2010 2 commits
- Leap2A: intermin fix for #544160 - don't delete blogs if they have posts. · 8c5a6fdd
  Penny Leach authored Mar 22, 2010
```
Signed-off-by: Penny Leach <penny@mjollnir.org>
```
  8c5a6fdd
- Remove unused artefact methods · 168ffe41
  Richard Mansfield authored Mar 22, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  168ffe41
21 Mar, 2010 2 commits
- leap2a: improved the detection of reimporting contactinformation artefacts · de49a95f
  Penny Leach authored Mar 21, 2010
```
Signed-off-by: Penny Leach <penny@mjollnir.org>
```
  de49a95f
- leap2a: made the blog plugin look for attachments when importing a catchall... · aca3ae41
  Penny Leach authored Mar 21, 2010
```
leap2a: made the blog plugin look for attachments when importing a catchall entry as well as a full blog
Signed-off-by: Penny Leach <penny@mjollnir.org>
```
  aca3ae41
18 Mar, 2010 3 commits
- Fix enabling of email on account settings page at admin level · afe3e75c
  Andrew Robert Nicols authored Mar 18, 2010
```
I'd made a call to $user->get when $user is a StdClass object.
Corrected to use $user->email and $user->id
```
  afe3e75c
- Add proper accesskeys to main-nav and sub-nav · cfc69466
  Andrew Robert Nicols authored Mar 18, 2010
  
  cfc69466
- Corrected keyboard navigations javascript · fcd314f8
  Andrew Robert Nicols authored Mar 17, 2010
```
* gg now goes to mygroups.php
* go removed (formerly group/owned.php)
* gv goes to views page
* g/ correctly goes to the search box (incorrect search field id)
```
  fcd314f8
16 Mar, 2010 8 commits
- Fix tag search results table display for safari (bug #533831) · b72d567b
  Richard Mansfield authored Mar 17, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  b72d567b
- Leap2A: fixed a regression I introduced in queued (cron) mnet imports · 0e642c2f
  Penny Leach authored Mar 16, 2010
```
This appears to have been broken in
2eeaf6de

 but it seems very strange to me
(a year ago)
Signed-off-by: Penny Leach <penny@mjollnir.org>
```
  0e642c2f
- Add empty default my goals strings to language pack, so they can be overridden... · becdc553
  Richard Mansfield authored Mar 16, 2010
```
Add empty default my goals strings to language pack, so they can be overridden by local customisations
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  becdc553
- Allow language strings to be empty · 8de1ba51
  Richard Mansfield authored Mar 16, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  8de1ba51
- Remove unused string · a6a1932f
  Richard Mansfield authored Mar 16, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  a6a1932f
- Fix broken anonymous feedback on views with secret url access · c1e41116
  Richard Mansfield authored Mar 16, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  c1e41116
- Show secret url access on my views page to avoid misleading 'only you can see this view' message · dbfd7999
  Richard Mansfield authored Mar 16, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  dbfd7999
- Ignore exceptions thrown by smarty() calls in the middle of exception... · ffb060c5
  Richard Mansfield authored Mar 16, 2010
```
Ignore exceptions thrown by smarty() calls in the middle of exception handling. Avoids some 'exception thrown without a stack frame' errors.
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  ffb060c5
15 Mar, 2010 2 commits

stop help icons for wysiwyg editors from appearing below the editor · c599126a

Evan Goldenberg authored Mar 15, 2010


Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>
(cherry picked from commit 193240b77e295b83caf933be16d9f3518ebdf65e)

Conflicts:

	htdocs/theme/raw/static/style/style.css
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>

c599126a

List views in alphabetical order on html export summary page (bug #533851) · 9b32e4e5
Richard Mansfield authored Mar 15, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
9b32e4e5

14 Mar, 2010 5 commits
- Avoid log warning caused by calling array_combine on empty arrays · ef813fe7
  Richard Mansfield authored Mar 15, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  ef813fe7
- In html export, only rewrite view links for views that are included in the export file · 78b2ddef
  Richard Mansfield authored Mar 15, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  78b2ddef
- Don't remove host part from links in tinymce (bug #533848) · 2432f934
  Richard Mansfield authored Mar 15, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  2432f934
- Merge branch 'master' of git@gitorious.org:mahara/mahara · 82b9ba15
  Piers Harding authored Mar 15, 2010
  
  82b9ba15
- Allow the trial of an individual auth instance to fail gracefully · b57da3b2
  Piers Harding authored Mar 15, 2010
```
so that others in the chain can still be tried (bug #536959)
Signed-off-by: Piers Harding <piers@catalyst.net.nz>
```
  b57da3b2
12 Mar, 2010 1 commit
- Add pagination to my friends block · 99842fe0
  Richard Mansfield authored Mar 12, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  99842fe0
11 Mar, 2010 3 commits
- fix an exception that was getting a language string from the wrong place · 29417a6f
  Evan Goldenberg authored Mar 12, 2010
```
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>
(cherry picked from commit 91ca5e74d354e48c64bec8928bd41fb660dcf6eb)
```
  29417a6f
- Don't query user records individually in my friends block · 16b30537
  Richard Mansfield authored Mar 11, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  16b30537
- Get profile icons with user records on group members page & online users · e0a74760
  Richard Mansfield authored Mar 11, 2010
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  e0a74760