Commits · f268f560ba5a85126362a4a75500fe5134551a00 · mahara / mahara

22 Dec, 2009 1 commit
- Use correct theme display names on view theme dropdown for users in an institution · f268f560
  Richard Mansfield authored Dec 23, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  f268f560
21 Dec, 2009 4 commits
- Merge branch 'institution-themes' of http://git.luns.net.uk/mahara into institution-themes · 8be0121f
  Richard Mansfield authored Dec 22, 2009
  
  8be0121f
- Allow a theme to be completely disabled. · a6f8900f
  Andrew Robert Nicols authored Dec 21, 2009
```
To use, set the $theme->disabled flag to the theme's themeconfig.php

Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>
```
  a6f8900f
- Rename get_available_themes to get_user_accessible_themes to make it clearer · ce9a4769
  Andrew Robert Nicols authored Dec 21, 2009
```
Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>
```
  ce9a4769
- change get_institution_themes to use an array of institutions · 2ba26ce9
  Andrew Robert Nicols authored Dec 21, 2009
```
At the request of Richard Mansfield, I've changed the institution search to
support a theme accessible to multiple institutions.

Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>
```
  2ba26ce9
20 Dec, 2009 2 commits
- Add employer, institution address fields to forms · fd7ad9e9
  Richard Mansfield authored Dec 21, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  fd7ad9e9
- Add employer,institution address columns to resume tables · 0244adda
  Richard Mansfield authored Dec 21, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  0244adda
17 Dec, 2009 3 commits
- "Copy a view" page search fix. · 1ec0b3b3
  Ruslan Kabalin authored Dec 08, 2009
```
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
```
  1ec0b3b3
- Remove reference to nonexistent string · 74208655
  Richard Mansfield authored Dec 17, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  74208655
- Change some strings and links to make view editing/creation with small header less confusing · 1babfbae
  Richard Mansfield authored Dec 17, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  1babfbae
16 Dec, 2009 2 commits
- Reload user institutions from db on institutional admin pages (bug #494484 -... · 6c531e5a
  Richard Mansfield authored Dec 17, 2009
```
Reload user institutions from db on institutional admin pages (bug #494484 - thanks to Ruslan Kabalin)

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  6c531e5a
- Fix fieldset display in block configuration · f4544c13
  Richard Mansfield authored Dec 16, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  f4544c13
15 Dec, 2009 4 commits

Check user is not deleted on form submission (bug #494484) · 92c7ba51
Richard Mansfield authored Dec 16, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
92c7ba51
Make more room for rss feed data in mysql · 50329033
Richard Mansfield authored Dec 16, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
50329033

Prioritisation of per-institution themes · c340aa22

Andrew Robert Nicols authored Nov 27, 2009

If a user is a member of multiple institutions, they would have typically
received the theme for the last institution (as returned in an unsorted
order from lib/user.php->load_user_institutions).

This patch introduces a check to determine the user's authentication
instance and the institution associated with that instance.
If a theme is set for that institution, this is used in priority.

Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>

c340aa22

Improvements to per-institution theme selection · 01c43b82

Andrew Robert Nicols authored Dec 15, 2009

To allow an institution to have multiple themes available to it, this
change introduces a check on an optional theme parameter
$theme->institution. Only themes where $theme->institution matches the name
of the institution given, or where the value is not set are returned.

This change allows for multiple themes to be made available to an
institution.

The following behaviours should be seen:
* admin/users/institutions.php now only shows themes which are sitewide, or
  intended for the specified institution;
* admin/site/options.php shows all themes on the system (not just sitewide
  themes); and
* view/blocks.php lists all themes for all institutions a user belongs to,
  plus sitewide themes. This changes the behaviour introduced in
  4e0132ac

 which restricted available view
  themes to the currently set themes of each institution. However, I feel
  that this change offers more possibilities as institutions will be able
  to have a series of themes available for views; in addition to their
  primary Mahara theme.

Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>

01c43b82

14 Dec, 2009 4 commits
- institution admin page was throwing errors when changing the 'mahara' institution · 320bdce4
  Andrew Robert Nicols authored Dec 14, 2009
```
An attempt was made to set the 'expiry' field for No Institution (mahara).
Moved the setter into an existing check for $institution != 'mahara' to fix
this.

Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>
```
  320bdce4
- Explicitly specify 'table' pieform renderer on profile form · e5c96d75
  Richard Mansfield authored Dec 15, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  e5c96d75
- Turn permission checkboxes off when switching from editing one file to another · 25a76b5e
  Richard Mansfield authored Dec 14, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  25a76b5e
- Fix group file permission stuff for dwoo which won't iterate over objects (bug #496298) · 1d44ff71
  Richard Mansfield authored Dec 14, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  1d44ff71
11 Dec, 2009 2 commits
- Pushed this patch prematurely by mistake (see bug #495064) · 8550401c
  Richard Mansfield authored Dec 11, 2009
```
Revert "Prevent users from self deleting if they didn't authenticate from an internal auth mechanism"

This reverts commit 5a595f72.
```
  8550401c
- Ensure zip archive is reopened before extracting (bug #495230) · b8788052
  Richard Mansfield authored Dec 11, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  b8788052
10 Dec, 2009 7 commits
- Prevent users from self deleting if they didn't authenticate from an internal auth mechanism · 5a595f72
  Andrew Robert Nicols authored Dec 10, 2009
```
Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>
```
  5a595f72
- Forum view template $subscribe variable fix (it was undefined for non-members of the group). · dc58830b
  Ruslan Kabalin authored Dec 10, 2009
```
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
```
  dc58830b
- Make upgrade footer readable in default theme · f9272696
  Richard Mansfield authored Dec 10, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  f9272696
- Fix display of microheader for logged out users · f0abf438
  Richard Mansfield authored Dec 10, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  f0abf438
- Replace missing edit icons · 69aa288a
  Richard Mansfield authored Dec 10, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  69aa288a
- More fixes to view microheader links · b5994232
  Richard Mansfield authored Dec 10, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  b5994232
- More useful nav on view microheader; fix display of profile view title · 75434fad
  Richard Mansfield authored Dec 10, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  75434fad
09 Dec, 2009 3 commits
- Allow a theme to specify that it is only available as a view theme to members... · 4e0132ac
  Richard Mansfield authored Dec 09, 2009
```
Allow a theme to specify that it is only available as a view theme to members of institutions for which the theme is the default institution theme

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  4e0132ac
- Merge commit 'origin/master' into view-themes · 064d794d
  Richard Mansfield authored Dec 09, 2009
  
  064d794d
- When an admin adds themselves to an institution on admin/user/edit, update immediately · a7c2a1dc
  Richard Mansfield authored Dec 09, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  a7c2a1dc
08 Dec, 2009 5 commits
- Add mailssent, mailsbounced columns on new installs and increase length · 03fa3dad
  Richard Mansfield authored Dec 09, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  03fa3dad
- Users allowed multiple institutions by default · d416c08c
  Richard Mansfield authored Dec 09, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  d416c08c
- Add label to view theme selector · c67817a1
  Richard Mansfield authored Dec 09, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  c67817a1
- Merge commit 'origin/master' into view-themes · c7b21be1
  Richard Mansfield authored Dec 09, 2009
```
Conflicts:

	htdocs/lib/db/upgrade.php
	htdocs/lib/version.php
```
  c7b21be1
- Fix for broken upgrade which attempted to fix an earlier broken upgrade · 4961460a
  Richard Mansfield authored Dec 08, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  4961460a
07 Dec, 2009 3 commits
- group/members: Add a note about visiting user profile pages to invite/add users to the group · 8d950b40
  Francois Marier authored Dec 08, 2009
```
Signed-off-by: Francois Marier <francois@catalyst.net.nz>
```
  8d950b40
- Prevent users from being promoted to admin of "standard.controlled" or "course" grouptypes · 2f14fc60
  Ruslan Kabalin authored Dec 07, 2009
```
(LP: #492009)

Signed-off-by: Francois Marier <francois@catalyst.net.nz>
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
```
  2f14fc60
- This was meant to be only in the git.mahara.org repo · f79aceef
  Francois Marier authored Dec 07, 2009
  
  f79aceef