Radu Ioan Fericean 0aa5223f78 Merge branch 'master' into shared_balances ...

Conflicts:
	engine/account.go
	engine/loader_csv_test.go
	engine/storage_interface.go
	engine/storage_map.go
	engine/storage_redis.go

2014-02-21 16:36:48 +02:00

..

account_test.go

Merge branch 'master' into shared_balances

2014-02-21 16:36:48 +02:00

account.go

Merge branch 'master' into shared_balances

2014-02-21 16:36:48 +02:00

accountlock_test.go

rater lib changed to engine

2013-07-24 13:38:45 +03:00

accountlock.go

Merge branch 'master' into shared_balances

2014-01-10 19:04:55 +02:00

action_timing.go

renamed USerBalance to Account

2014-02-21 14:37:31 +02:00

action_trigger.go

renamed USerBalance to Account

2014-02-21 14:37:31 +02:00

action.go

Merge branch 'master' into shared_balances

2014-02-21 16:36:48 +02:00

actions_test.go

renamed Account Type attribute

2014-02-21 15:52:47 +02:00

balances_test.go

removed special price

2013-10-03 20:14:45 +03:00

balances.go

Merge branch 'master' into shared_balances

2014-02-21 16:36:48 +02:00

callcost_test.go

removed connect fee as a separte field in call cost

2014-02-06 01:34:38 +02:00

callcost.go

Merge branch 'master' into shared_balances

2014-02-07 10:57:29 +02:00

calldesc_test.go

Merge branch 'master' into shared_balances

2014-02-21 16:36:48 +02:00

calldesc.go

Merge branch 'master' into shared_balances

2014-02-21 16:36:48 +02:00

destinations_test.go

replaced storageGetter with dataStorage

2013-12-17 22:37:51 +02:00

destinations.go

working variant for history server and gob enc

2014-01-25 11:52:11 +02:00

groups.go

refactorings, started groups

2013-08-30 19:02:05 +03:00

history_test.go

working variant for history server and gob enc

2014-01-25 11:52:11 +02:00

loader_csv_test.go

Merge branch 'master' into shared_balances

2014-02-21 16:36:48 +02:00

loader_csv.go

Merge branch 'master' into shared_balances

2014-02-21 16:36:48 +02:00

loader_db.go

Merge branch 'master' into shared_balances

2014-02-21 16:36:48 +02:00

loader_helpers_test.go

shared group fixes

2014-02-17 00:39:15 +02:00

loader_helpers.go

Merge branch 'master' into shared_balances

2014-02-07 10:57:29 +02:00

loader_local_test.go

start shared groups cvs loading

2014-02-03 18:50:26 +02:00

rateinterval_test.go

using utils types to load data

2013-11-14 09:39:00 +02:00

rateinterval.go

cutting extra decimals

2013-12-20 14:11:47 +02:00

ratingplan_test.go

replaced storageGetter with dataStorage

2013-12-17 22:37:51 +02:00

ratingplan.go

working variant for history server and gob enc

2014-01-25 11:52:11 +02:00

ratingprofile_test.go

tests for rating info activation times

2013-11-18 19:36:54 +02:00

ratingprofile.go

miminmum match length is now parametrized and can be moved in the confs

2014-02-03 10:53:32 +02:00

realcalls_test.go

renamed USerBalance to Account

2014-02-21 14:37:31 +02:00

responder.go

renamed USerBalance to Account

2014-02-21 14:37:31 +02:00

server.go

added server log messages

2014-01-23 11:44:14 +02:00

sharedgroup_test.go

start shared groups cvs loading

2014-02-03 18:50:26 +02:00

sharedgroup.go

start shared groups cvs loading

2014-02-03 18:50:26 +02:00

storage_interface.go

Merge branch 'master' into shared_balances

2014-02-21 16:36:48 +02:00

storage_map.go

Merge branch 'master' into shared_balances

2014-02-21 16:36:48 +02:00

storage_mongo.go

renamed USerBalance to Account

2014-02-21 14:37:31 +02:00

storage_mysql.go

fix for storage interface nil

2014-01-14 19:10:47 +02:00

storage_postgres.go

splited storage interface in multiple interfaces

2013-08-27 14:48:01 +03:00

storage_redis.go

Merge branch 'master' into shared_balances

2014-02-21 16:36:48 +02:00

storage_sql_local_test.go

ActionTimings -> ActionPlan in APIs, storage tables and redis key

2014-01-19 20:02:32 +01:00

storage_sql.go

more shared group fixes

2014-02-17 01:16:31 +02:00

storage_test.go

renamed Account Type attribute

2014-02-21 15:52:47 +02:00

storage_utils.go

I did not run test locally, my bad

2014-01-14 19:16:28 +02:00

timespans_test.go

cutting extra decimals

2013-12-20 14:11:47 +02:00

timespans.go

Merge branch 'master' into shared_balances

2014-02-07 10:57:29 +02:00

tpimporter_csv.go

shared group fixes

2014-02-17 00:39:15 +02:00

units_counter_test.go

renamed action's BalanceId to BalanceType

2014-02-21 13:14:06 +02:00

units_counter.go

renamed action's BalanceId to BalanceType

2014-02-21 13:14:06 +02:00