lp:~sahana-eden-vms/sahana-eden/vms

Created by zubair assad on 2010-06-02 and last modified on 2010-08-17
Get this branch:
bzr branch lp:~sahana-eden-vms/sahana-eden/vms
Members of Sahana Eden VMS can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Sahana Eden VMS
Project:
Sahana-Eden
Status:
Merged

Recent revisions

792. By Patricia Tressel <Patricia Tressel@phobos> on 2010-08-17

Merge from trunk. Temporarily omit Dominic's changes to models/vol.py as they go with changes in controllers/vol.py that are not present. These will be recovered and merged later.

791. By Patricia Tressel <Patricia Tressel@phobos> on 2010-08-17

Change single quotes to double, minor formatting.

790. By Patricia Tressel <Patricia Tressel@phobos> on 2010-08-16

For no good reason except tradition, add a reusable field for the skill types table. Tweak some labels.

788. By zubair assad on 2010-08-15

messaging

787. By Patricia Tressel <Patricia Tressel@phobos> on 2010-08-15

Merge from trunk, except for models/vol.py.

786. By zubair assad on 2010-08-11

Mapping Members of a Team aka Group

785. By Patricia Tressel <Patricia Tressel@phobos> on 2010-08-05

Fix view_map queries: AND -> &. Remove useless _nexts.

784. By Patricia Tressel <Patricia Tressel@phobos> on 2010-07-30

Merge from trunk.
Two conflicts resolved with change to trunk:
00_utils.py shn_rheader_tabs:
  Don't put _next into jr.request.vars where some downstream use might find it.
01_crud.py shn_read:
  Put vars in delete, edit, and redirect urls.

783. By Patricia Tressel <Patricia Tressel@phobos> on 2010-07-30

Switch prefixes back to vol for person component tables defined in vol.
As per Dominic, jr.request.vars is a Storage, not a dict.
If user passes _next into shn_rheader_tabs, keep it.
Don't nest _next.
Remove extra _next.
Don't use a dot in a vars key.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:sahana-eden
This branch contains Public information 
Everyone can see this information.