lp:~ideamonk/sahana-eden/vita

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:sahana-eden at revision 2439

Fran Boon: Pending requested 2011-06-27

Diff: 786 lines (+539/-65)

10 files modified

controllers/org.py (+10/-19)
models/00_db.py (+1/-0)
models/00_settings.py (+3/-2)
modules/s3/s3aaa.py (+23/-16)
modules/s3/s3widgets.py (+88/-18)
static/scripts/S3/s3.rolesets.js (+43/-8)
static/scripts/S3/ui.multiselect.js (+336/-0)
static/scripts/tools/sahana.css.cfg (+1/-1)
static/scripts/tools/sahana.js.cfg (+3/-1)
static/styles/S3/ui.multiselect.css (+31/-0)

api

Merged into lp:sahana-eden/vita at revision 1694

nursix: Pending requested 2011-06-14

Diff: 5357 lines (+2366/-1476) (has conflicts)

40 files modified

VERSION (+3/-0)
controllers/admin.py (+8/-2)
controllers/cr.py (+2/-2)
controllers/hms.py (+1/-1)
controllers/inv.py (+1/-1)
controllers/org.py (+9/-48)
deployment-templates/models/000_config.py (+23/-24)
models/00_db.py (+1/-0)
models/00_settings.py (+12/-11)
models/00_tables.py (+1/-1)
models/03_gis.py (+32/-22)
models/04_pr.py (+4/-4)
models/05_org.py (+4/-6)
models/06_hrm.py (+17/-16)
models/07_cr.py (+2/-3)
models/08_assess.py (+5/-5)
models/09_project.py (+4/-7)
models/doc.py (+3/-5)
models/event.py (+1/-1)
models/scenario.py (+1/-1)
models/survey.py (+1/-2)
models/vol.py (+1/-1)
models/zz_last.py (+5/-1)
models/zzz_1st_roles.py (+190/-34)
modules/s3/s3aaa.py (+537/-291)
modules/s3/s3cfg.py (+1/-8)
modules/s3/s3gis.py (+63/-67)
modules/s3/s3widgets.py (+654/-575)
static/scripts/S3/S3.min.js (+347/-308)
static/scripts/S3/s3.gis.js (+11/-8)
static/scripts/S3/s3.gis.layers.js (+2/-1)
static/scripts/S3/s3.gis.min.js (+2/-2)
static/scripts/S3/s3.rolesets.js (+43/-8)
static/scripts/S3/ui.multiselect.js (+336/-0)
static/scripts/tools/sahana.css.cfg (+1/-1)
static/scripts/tools/sahana.js.cfg (+5/-1)
static/styles/S3/sahana.min.css (+1/-1)
static/styles/S3/ui.multiselect.css (+31/-0)
views/admin/index.html (+1/-1)
views/gis/location_create.html (+0/-6)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1752. By Abhishek Mishra on 2011-07-15

merge trunk

1751. By Abhishek Mishra on 2011-07-14

merged trunk

1750. By Abhishek Mishra on 2011-07-11

merged trunk

1749. By Abhishek Mishra on 2011-07-08

merged trunk, resolve conflicts

1748. By Abhishek Mishra on 2011-07-08

plusone progress

1747. By Abhishek Mishra on 2011-07-06

merged trunk

1746. By Abhishek Mishra on 2011-07-06

testing leftover

1745. By Abhishek Mishra on 2011-07-05

merged trunk ..

1744. By Abhishek Mishra on 2011-07-05

spent too much time with controller based tests, todo: trace once more with eclipse to figure out what's missing for, _formkey?

1743. By Abhishek Mishra on 2011-07-04

added test_create_record_roles