lp:~robbyoconnor/sahana-eden/sahana-eden-trunk

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:sahana-eden at revision 1610

Fran Boon: Needs Fixing on 2010-12-23

Diff: 366 lines (+148/-48)

9 files modified

controllers/admin.py (+9/-2)
languages/es.py (+14/-0)
views/admin/user_create.html (+3/-0)
views/admin/user_create_form.html (+35/-0)
views/admin/user_list_create.html (+3/-0)
views/admin/user_update.html (+2/-1)
views/admin/user_update_form.html (+36/-0)
views/auth/_register.html (+1/-45)
views/auth/validation.js (+45/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1586. By Robert O'Connor on 2010-12-24

merge from trunk

1585. By Robert O'Connor on 2010-12-24

merge from trunk

1584. By Robert O'Connor on 2010-12-23

back out the impact type change until the User UI update code is merged

1583. By Robert O'Connor on 2010-12-23

merge with trunk

1582. By Robert O'Connor on 2010-12-23

Great Work by Yuri Stuken to make the Create/Update User UI match the registration UI

1581. By Robert O'Connor on 2010-12-21

Fix for bug #815 to make the menu boxes properly adjust its size based on language selection by David Czech (Kapace_)

1580. By Robert O'Connor on 2010-12-21

merge with trunk

1579. By Robert O'Connor on 2010-12-21

merge with trunk

1578. By Robert O'Connor on 2010-12-21

Fix for bug #826 Cannot Add new Need Type by Natan Yellin

1577. By Robert O'Connor on 2010-12-20

merge from trunk