Permalink
Commits on Apr 23, 2015
  1. @xliiv

    Merge pull request #434 from allegro/release/3.0.1

    Release/3.0.1
    xliiv committed Apr 23, 2015
  2. @szok

    Release 3.0.1

    szok committed Apr 23, 2015
  3. @xliiv

    Merge pull request #435 from xliiv/fix/demo-data-today

    Fixed demo data generation.
    xliiv committed Apr 23, 2015
  4. Fixed demo data generation.

    There was a useless 'today' variable in function's scope which is removed,
    because it's already defined in top of file.
    Tymoteusz Jankowski committed Apr 23, 2015
Commits on Apr 22, 2015
  1. @ar4s

    Merge pull request #432 from xliiv/fix/static-files-backend

    Updated static files to cached backend.
    ar4s committed Apr 22, 2015
  2. Updated static files to cached backend.

    Recently Ralph-core change static files backend to cached one.
    This change make use of cached static files by change url generating
    method.
    In addition test are fixed by setting non-cache backend.
    Tymoteusz Jankowski committed Apr 20, 2015
Commits on Apr 17, 2015
  1. @xliiv

    Merge pull request #425 from xliiv/release/3.0.0

    updated changelog to 3.0
    xliiv committed Apr 17, 2015
  2. @mkurek

    Merge pull request #427 from ar4s/hotfix/added-mising-image

    Added mising image
    mkurek committed Apr 17, 2015
  3. @xliiv

    Merge pull request #431 from ar4s/hotfix/demo-data

    Hotfix/demo data
    xliiv committed Apr 17, 2015
  4. @ar4s

    Merge branch 'develop' into hotfix/demo-data

    Conflicts:
    	src/ralph_scrooge/utils/demo.py
    ar4s committed Apr 17, 2015
  5. @ar4s

    usage type for each warehouses

    ar4s committed Apr 17, 2015
  6. @xliiv

    Merge pull request #429 from ar4s/improvements/demo-data

    Demo data
    xliiv committed Apr 17, 2015
  7. @ar4s

    added extra demo data

    For better demo data.
    ar4s committed Apr 17, 2015
  8. @xliiv

    Merge pull request #428 from mkurek/fix/remove-menu

    Fixed Scrooge menu items
    xliiv committed Apr 17, 2015
  9. @xliiv

    Merge pull request #430 from mkurek/fix/vip-db-default-components

    Settings tweaks
    xliiv committed Apr 17, 2015
Commits on Apr 16, 2015
  1. @mkurek

    Settings tweaks

    * new default collect plugins
    * added database and vip as default components
    mkurek committed Apr 16, 2015
  2. @mkurek

    Fixed Scrooge menu items

    * unification of menu items in angular views and old django views
    * removed unnecessary 'Extra costs' and 'Usage types' items
    * renamed and reordered some menu items
    mkurek committed Apr 16, 2015
  3. @ar4s

    added mising image

    This change is require if we using built-in staticfiles versioning in Django
    because ``collectstatic`` scan all depends files (e.g. css, img) and is
    failure if some file doesn't exist.
    ar4s committed Apr 16, 2015
Commits on Apr 13, 2015
  1. @mkurek

    updated changelog to 3.0

    mkurek committed with Tymoteusz Jankowski Apr 10, 2015
Commits on Apr 8, 2015
  1. @mkurek

    Merge pull request #423 from mkurek/fix/travis-cache

    fixed travis cache
    mkurek committed Apr 8, 2015
  2. @mkurek

    fixed travis cache

    removed duplicate of travis cache directory config
    mkurek committed Apr 8, 2015
  3. @mkurek

    Merge pull request #418 from ar4s/technical-speedup-travis

    Added cache to Travis
    mkurek committed Apr 8, 2015
Commits on Apr 7, 2015
  1. @ar4s

    added cache

    ar4s committed Mar 26, 2015
  2. @mkurek

    Merge pull request #415 from kula1922/feature/ras-312

    Improve Cost Card style
    mkurek committed Apr 7, 2015
Commits on Apr 3, 2015
  1. @mkurek

    Merge pull request #400 from damian1976/patch-1

    Openstack ceilometer plugin with MongoDB support
    mkurek committed Apr 3, 2015
  2. @mkurek

    Merge pull request #411 from mkurek/fix/allocations-team-template

    fixed team division (%) template
    mkurek committed Apr 3, 2015
Commits on Mar 30, 2015
  1. @mkurek

    Merge pull request #417 from damian1976/damian1976-value-rounding-in-…

    …report
    
    Fix: Printing correct decimal places in base_plugin_report.py and report_services_usages.py
    mkurek committed Mar 30, 2015
  2. @kula1922

    Improve Cost Card style

    - Move cost to right
    - Space as separator
    - Add lines between rows and columns
    kula1922 committed Mar 19, 2015
Commits on Mar 25, 2015
  1. @damian1976 @damian1976

    Openstack ceilometer plugin with MongoDB support (changes include i.e…

    …. adding new plugin, renaming existing
    
    openstack_ceilometer.py plugin file name to openstack_mysql_ceilometer.py etc.)
    damian1976 committed with damian1976 Mar 4, 2015
  2. @damian1976 @damian1976

    Fix: Printed values in base_plugin_report.py

    and report_services_usages.py are properly formatted using correct number of decimal places
    set in admin
    damian1976 committed with damian1976 Mar 11, 2015
  3. @mkurek

    Merge pull request #416 from szok/feature/asset_model

    Add asset_model to collect plugins
    mkurek committed Mar 25, 2015
Commits on Mar 24, 2015
  1. @szok

    Add asset_model to settings

    szok committed Mar 24, 2015
Commits on Mar 13, 2015
  1. @mkurek

    fixed team division (%) template

    previously in team division tab there was wrong template (teamcosts). From now team division and service division templates are merged into single, taballocationclientdivision template.
    mkurek committed Mar 13, 2015
Commits on Mar 9, 2015
  1. @kula1922

    Merge pull request #409 from mkurek/fix/stats-lambda

    fixed scrooge statistics inner functions (added returns)
    kula1922 committed Mar 9, 2015
  2. @kula1922

    Merge pull request #407 from mkurek/fix/monthly-cost-progress

    fixed progress in monthly cost view
    kula1922 committed Mar 9, 2015