← Back to branch summary

~flavour/sahana-eden/cert

~flavour/sahana-eden/cert

Viewing all changes in revision 3046.

Committer: Fran Boon
Date: 2011-12-06 16:39:55 UTC
mfrom: (2975.1.36 eden)
Revision ID: fran@aidiq.com-20111206163955-12r0a8wsdx6lpmkq

merge Trunk, bugfix group.xsl

files added:
static/formats/s3csv/pr

static/formats/s3csv/pr/group.csv

static/formats/s3csv/pr/group.xsl

files removed:
static/formats/s3csv/pr

static/formats/s3csv/pr/group.csv

static/formats/s3csv/pr/group.xsl

files modified:
.bzrignore

VERSION

controllers/hrm.py

controllers/project.py

models/00_settings.py

models/00_utils.py

models/01_menu.py

models/09_project.py

models/survey.py

modules/s3/s3cube.py

modules/s3/s3import.py

modules/s3/s3method.py

modules/s3/s3search.py

modules/s3/s3utils.py

modules/s3/s3widgets.py

static/scripts/S3/S3.js

static/scripts/S3/S3.min.js

static/scripts/S3/s3.dataTables.js

static/scripts/tools/sync_setup.py

views/default/about.html

views/layout.html

views/project/index.html

views/s3_include_debug.html

Show diffs side-by-side

added added

removed removed

controllers/hrm.py

controllers/project.py

models/00_settings.py

models/00_utils.py

models/01_menu.py

models/09_project.py

models/survey.py

modules/s3/s3cube.py

modules/s3/s3import.py

modules/s3/s3method.py

modules/s3/s3search.py

modules/s3/s3utils.py

modules/s3/s3widgets.py

static/formats/s3csv/pr/

static/formats/s3csv/pr/

static/formats/s3csv/pr/group.csv

static/formats/s3csv/pr/group.csv

static/formats/s3csv/pr/group.xsl

static/formats/s3csv/pr/group.xsl

static/scripts/S3/S3.js

static/scripts/S3/S3.min.js

static/scripts/S3/s3.dataTables.js

static/scripts/tools/sync_setup.py

views/default/about.html

views/layout.html

views/project/index.html

views/s3_include_debug.html

Older »