← Back to branch summary

~ptressel/sahana-eden/devel

~ptressel/sahana-eden/devel

Viewing all changes in revision 2266.

Committer: Pat Tressel
Date: 2011-06-03 10:10:05 UTC
mfrom: (2264.1.47 eden)
Revision ID: ptressel@myuw.net-20110603101005-2fquq0ucfcsu42k2

Merge from trunk.

files added:
controllers/climate.py

static/formats/s3csv/inv_stock_posn.xsl

static/img/BFTBmenu_back.png

static/img/BFTBmenu_hilight.png

static/img/BFTBmenu_side.png

static/scripts/S3/s3.dataTables.min.js

static/scripts/S3/s3.hrm.js

static/scripts/S3/s3.select_person.min.js

tests/unit

tests/unit/s3pdfTest.py

views/admin/settings.html

views/climate

views/climate/index.html

views/inv/warehouse_upload_csv.html

views/org/organisation_human_resource_list_create.html

files removed:
static/http-proxy.py

static/scripts/S3/s3.locationsearch.widget.js

files renamed:
models/zzz_last.py => models/zz_last.py

static/scripts/S3/S3.dataTables.js => static/scripts/S3/s3.dataTables.js

files modified:
VERSION

controllers/admin.py

controllers/appadmin.py

controllers/assess.py

controllers/asset.py

controllers/budget.py

controllers/building.py

controllers/cr.py

controllers/default.py

controllers/delphi.py

controllers/doc.py

controllers/dvi.py

controllers/event.py

controllers/gis.py

controllers/hms.py

controllers/hrm.py

controllers/impact.py

controllers/importer.py

controllers/inv.py

controllers/irs.py

controllers/mpr.py

controllers/msg.py

controllers/org.py

controllers/pr.py

controllers/project.py

controllers/req.py

controllers/scenario.py

controllers/supply.py

controllers/survey.py

controllers/sync.py

controllers/ticket.py

controllers/vol.py

controllers/xforms.py

deployment-templates/models/000_config.py

models/00_db.py

models/00_settings.py

models/00_tables.py

models/00_utils.py

models/01_menu.py

models/02_pr.py

models/03_gis.py

models/03_sit.py

models/04_pr.py

models/05_irs.py

models/05_org.py

models/06_hms.py

models/06_hrm.py

models/06_supply.py

models/07_cr.py

models/07_req.py

models/08_assess.py

models/08_inv.py

models/09_project.py

models/asset.py

models/budget.py

models/building.py

models/delphi.py

models/doc.py

models/dvi.py

models/event.py

models/impact.py

models/msg.py

models/scenario.py

models/survey.py

models/sync.py

models/ticket.py

models/vol.py

models/zzz_1st_roles.py

models/zzz_1st_run.py

modules/s3/s3aaa.py

modules/s3/s3cfg.py

modules/s3/s3crud.py

modules/s3/s3export.py

modules/s3/s3gis.py

modules/s3/s3import.py

modules/s3/s3model.py

modules/s3/s3pdf.py

modules/s3/s3rest.py

modules/s3/s3search.py

modules/s3/s3task.py

modules/s3/s3tools.py

modules/s3/s3utils.py

modules/s3/s3validators.py

modules/s3/s3widgets.py

modules/s3/s3xml.py

private/import/countries.csv

static/favicon.ico *

static/fonts/setfonts.py

static/formats/s3csv/hrm_import.xsl

static/formats/s3csv/inv_warehouse.xsl

static/img/S3menu_side.png

static/img/arrow_blue_right.png

static/scripts/S3/S3.js

static/scripts/S3/S3.min.js

static/scripts/S3/jquery.ui.datepicker.js

static/scripts/S3/s3.gis.js

static/scripts/S3/s3.gis.min.js

static/scripts/S3/s3.locationselector.widget.js

static/scripts/S3/s3.select_person.js

static/scripts/S3/s3.supply.js

static/scripts/tools/build.sahana.py

static/scripts/tools/noop.py

static/scripts/tools/sahana.css.cfg

static/scripts/tools/sahana.js.cfg

static/styles/S3/jquery.dataTables.css

static/styles/S3/sahana.css

static/styles/S3/sahana.min.css

tests/selenium/scripts/createTestAccount.py

views/_delete.html

views/_list.html

views/_list_create.html

views/_search.html

views/admin/index.html

views/assess/assess_list.html

views/asset/index.html

views/dataTables.html

views/default/index.html

views/gis/index.html

views/hrm/human_resource_create.html

views/hrm/human_resource_list_create.html

views/inv/index.html

views/jquery.html

views/l10n.js

views/org/organisation_assess_list.html

views/project/gap_report.html

views/req/index.html

views/s3_include_debug.html

views/s3_include_min.html

Show diffs side-by-side

added added

removed removed

controllers/admin.py

controllers/appadmin.py

controllers/assess.py

controllers/asset.py

controllers/budget.py

controllers/building.py

controllers/climate.py

controllers/cr.py

controllers/default.py

controllers/delphi.py

controllers/doc.py

controllers/dvi.py

controllers/event.py

controllers/gis.py

controllers/hms.py

controllers/hrm.py

controllers/impact.py

controllers/importer.py

controllers/inv.py

controllers/irs.py

controllers/mpr.py

controllers/msg.py

controllers/org.py

controllers/pr.py

controllers/project.py

controllers/req.py

controllers/scenario.py

controllers/supply.py

controllers/survey.py

controllers/sync.py

controllers/ticket.py

controllers/vol.py

controllers/xforms.py

deployment-templates/models/000_config.py

models/00_db.py

models/00_settings.py

models/00_tables.py

models/00_utils.py

models/01_menu.py

models/02_pr.py

models/03_gis.py

models/03_sit.py

models/04_pr.py

models/05_irs.py

models/05_org.py

models/06_hms.py

models/06_hrm.py

models/06_supply.py

models/07_cr.py

models/07_req.py

models/08_assess.py

models/08_inv.py

models/09_project.py

models/asset.py

models/budget.py

models/building.py

models/delphi.py

models/event.py

models/impact.py

models/scenario.py

models/survey.py

models/ticket.py

models/zz_last.py

models/zzz_1st_roles.py

models/zzz_1st_run.py

modules/s3/s3aaa.py

modules/s3/s3cfg.py

modules/s3/s3crud.py

modules/s3/s3export.py

modules/s3/s3gis.py

modules/s3/s3import.py

modules/s3/s3model.py

modules/s3/s3pdf.py

modules/s3/s3rest.py

modules/s3/s3search.py

modules/s3/s3task.py

modules/s3/s3tools.py

modules/s3/s3utils.py

modules/s3/s3validators.py

modules/s3/s3widgets.py

modules/s3/s3xml.py

private/import/countries.csv

static/favicon.ico

static/fonts/setfonts.py

static/formats/s3csv/hrm_import.xsl

static/formats/s3csv/inv_stock_posn.xsl

static/formats/s3csv/inv_warehouse.xsl

static/http-proxy.py

static/img/BFTBmenu_back.png

static/img/BFTBmenu_hilight.png

static/img/BFTBmenu_side.png

static/img/S3menu_side.png

static/img/arrow_blue_right.png

static/scripts/S3/S3.js

static/scripts/S3/S3.min.js

static/scripts/S3/jquery.ui.datepicker.js

static/scripts/S3/s3.dataTables.js

static/scripts/S3/s3.dataTables.min.js

static/scripts/S3/s3.gis.js

static/scripts/S3/s3.gis.min.js

static/scripts/S3/s3.hrm.js

static/scripts/S3/s3.select_person.js

static/scripts/S3/s3.select_person.min.js

static/scripts/S3/s3.supply.js

static/scripts/tools/build.sahana.py

static/scripts/tools/noop.py

static/scripts/tools/sahana.css.cfg

static/scripts/tools/sahana.js.cfg

static/styles/S3/jquery.dataTables.css

static/styles/S3/sahana.css

static/styles/S3/sahana.min.css

tests/selenium/scripts/createTestAccount.py

tests/unit/s3pdfTest.py

views/_delete.html

views/_list.html

views/_list_create.html

views/_search.html

views/admin/index.html

views/admin/settings.html

views/assess/assess_list.html

views/asset/index.html

views/climate/index.html

views/dataTables.html

views/default/index.html

views/gis/index.html

views/hrm/human_resource_create.html

views/hrm/human_resource_list_create.html

views/inv/index.html

views/inv/warehouse_upload_csv.html

views/jquery.html

views/org/organisation_assess_list.html

views/org/organisation_human_resource_list_create.html

views/project/gap_report.html

views/req/index.html

views/s3_include_debug.html

views/s3_include_min.html

Older »