Viewing all changes in revision 1629.
- Committer: Robert O'Connor
- Date: 2011-04-22 07:40:01 UTC
- mfrom: (1617.1.476 eden)
- Revision ID: robby.oconnor@gmail.com-20110422074001-132b6j8xxobdw2i9
merge with trunk
- files added:
- controllers/asset.py
- modules/s3/fontmap
- static/fonts
- static/formats/hrf
- static/formats/s3csv
- static/img/gis/colorpicker
- static/potlatch2/features/bugs
- static/potlatch2/stylesheets
- static/scripts/S3/i18n
- static/scripts/ext-community-extensions
- static/scripts/ext-community-extensions/rowactions
- static/scripts/ext-community-extensions/rowactions/css
- static/scripts/ext-community-extensions/rowactions/js
- static/scripts/gis/GeoExplorer/colorpicker
- static/scripts/gis/GeoExplorer/locale
- static/selenium/scripts/GUI
- static/selenium/scripts/actions
- static/selenium/server/sslSupport
- static/selenium/tests
- views/asset
- views/building
- views/hrm
- views/req
- files removed:
- controllers/inventory.py
- static/scripts/ext-community-extensions
- static/scripts/ext-community-extensions/rowactions
- static/scripts/ext-community-extensions/rowactions/css
- static/scripts/ext-community-extensions/rowactions/js
- static/selenium/server/sslSupport
- views/logs
- views/rms
- files renamed:
- models/06_irs.py => models/05_irs.py
- static/scripts/tools/dbstruct.py => static/scripts/tools/dbstruct_mysql.py
- views/inventory/ => views/inv/
- files modified:
- .bzrignore *
expand all
collapse all
added
removed
static/img/10-30percent.png
static/img/10percent.png
static/img/1percent.png
static/img/30-60percent.png
static/img/60-100percent.png
static/img/email_icon.png
static/img/gis/colorpicker/mask.png
static/img/gis/colorpicker/picker.gif
static/img/gis/colorpicker/side_slider.jpg
static/img/gis/gxp/add.png
static/img/icon_blue_minus15px.png
static/img/icon_blue_plus15px.png
static/img/map_icon_128.png
static/img/silk/application_view_tile.png
static/img/silk/folder.png
static/img/sum.png
static/potlatch2/bing_maps.png
static/potlatch2/features/bike-shop.png
static/potlatch2/features/bugs/fixed.png
static/potlatch2/features/bugs/invalid.png
static/potlatch2/features/bugs/open.png
static/potlatch2/features/highway__living_street.png
static/potlatch2/features/highway__motorway.png
static/potlatch2/features/highway__motorway_link.png
static/potlatch2/features/highway__primary.png
static/potlatch2/features/highway__primary_link.png
static/potlatch2/features/highway__residential.png
static/potlatch2/features/highway__secondary.png
static/potlatch2/features/highway__secondary_link.png
static/potlatch2/features/highway__service.png
static/potlatch2/features/highway__tertiary.png
static/potlatch2/features/highway__tertiary_link.png
static/potlatch2/features/highway__track.png
static/potlatch2/features/highway__trunk.png
static/potlatch2/features/highway__trunk_link.png
static/potlatch2/features/highway__unclassified.png
static/potlatch2/features/highway__unknown.png
static/potlatch2/features/paths__bike.png
static/potlatch2/features/paths__bike.svg
static/potlatch2/features/paths__bridleway.png
static/potlatch2/features/paths__bridleway.svg
static/potlatch2/features/paths__footway.png
static/potlatch2/features/paths__footway.svg
static/potlatch2/features/paths__pedestrian.png
static/potlatch2/features/paths__pedestrian.svg
static/potlatch2/features/paths__steps.png
static/potlatch2/features/paths__steps.svg
static/potlatch2/features/paths__unknown.png
static/potlatch2/features/paths__unknown.svg
static/potlatch2/features/pois/accommodation_chalet.n.24.png
static/potlatch2/features/pois/accommodation_motel.n.24.png
static/potlatch2/features/pois/accommodation_shelter2.n.24.png
static/potlatch2/features/pois/amenity_bench.n.24.png
static/potlatch2/features/pois/amenity_fountain2.n.24.png
static/potlatch2/features/pois/amenity_information.n.24.png
static/potlatch2/features/pois/amenity_library.n.24.png
static/potlatch2/features/pois/amenity_playground.n.24.png
static/potlatch2/features/pois/amenity_post_office.n.24.png
static/potlatch2/features/pois/amenity_telephone.n.24.png
static/potlatch2/features/pois/amenity_toilets.n.24.png
static/potlatch2/features/pois/amenity_waste_bin.n.24.png
static/potlatch2/features/pois/boat-launch-24.png
static/potlatch2/features/pois/education_nursery3.n.24.png
static/potlatch2/features/pois/emergency-telephone-24.png
static/potlatch2/features/pois/flowers.png
static/potlatch2/features/pois/food_drinkingtap.n.24.png
static/potlatch2/features/pois/landuse_coniferous.n.24.png
static/potlatch2/features/pois/poi_boundary_administrative.n.24.png
static/potlatch2/features/pois/sport_swimming_outdoor.n.24.png
static/potlatch2/features/pois/tourist_art_gallery2.n.24.png
static/potlatch2/features/pois/tourist_attraction.n.24.png
static/potlatch2/features/pois/tourist_theme_park.n.24.png
static/potlatch2/features/pois/transport_airport_gate.n.24.png
static/potlatch2/features/pois/transport_airport_terminal.n.24.png
static/potlatch2/features/pois/transport_turning_circle.n.24.png
static/potlatch2/features/waterway__canal.png
static/potlatch2/features/waterway__canal.svg
static/potlatch2/features/waterway__dam.svg
static/potlatch2/features/waterway__drain.png
static/potlatch2/features/waterway__river.png
static/potlatch2/features/waterway__river.svg
static/potlatch2/features/waterway__slipway.png
static/potlatch2/features/waterway__stream.png
static/potlatch2/features/waterway__stream.svg
static/potlatch2/features/waterway__weir.png
static/scripts/ext-community-extensions/color-trigger.gif
static/scripts/ext-community-extensions/color-trigger.png
