Viewing all changes in revision 453.
- Committer: Fabien Chaillou
- Date: 2013-01-13 00:25:45 UTC
- mfrom: (447.2.19 FinancistoSQLite)
- Revision ID: fabien.chaillou@gmail.com-20130113002545-5k8oid465p3tqobm
Merge with Master
- files added:
- libs/commons-logging-1.1.1.jar
- src/ru/orangesoftware/financisto/datetime
- src/ru/orangesoftware/financisto/filter
- files removed:
- libs/dropbox-android-sdk-1.2.2.jar
- src/ru/orangesoftware/financisto/model/info
- files renamed:
- res/drawable/account_type_bank.png => res/drawable-mdpi/account_type_bank.png
- res/drawable/account_type_card_amex.png => res/drawable-mdpi/account_type_card_amex.png
- res/drawable/account_type_card_diners.png => res/drawable-mdpi/account_type_card_diners.png
- res/drawable/account_type_card_discover.png => res/drawable-mdpi/account_type_card_discover.png
- res/drawable/account_type_card_jcb.png => res/drawable-mdpi/account_type_card_jcb.png
- res/drawable/account_type_card_maestro.png => res/drawable-mdpi/account_type_card_maestro.png
- res/drawable/account_type_card_mastercard.png => res/drawable-mdpi/account_type_card_mastercard.png
- res/drawable/account_type_card_nets.png => res/drawable-mdpi/account_type_card_nets.png
- res/drawable/account_type_card_unionpay.png => res/drawable-mdpi/account_type_card_unionpay.png
- res/drawable/account_type_card_visa.png => res/drawable-mdpi/account_type_card_visa.png
- res/drawable/account_type_card_visa_electron.png => res/drawable-mdpi/account_type_card_visa_electron.png
- res/drawable/account_type_cash.png => res/drawable-mdpi/account_type_cash.png
- res/drawable/account_type_credit_card.png => res/drawable-mdpi/account_type_credit_card.png
- res/drawable/account_type_debit_card.png => res/drawable-mdpi/account_type_debit_card.png
- res/drawable/account_type_other.png => res/drawable-mdpi/account_type_other.png
- res/drawable/account_type_paypal.png => res/drawable-mdpi/account_type_paypal.png
- res/drawable/alacarte.png => res/drawable-mdpi/alacarte.png
- res/drawable/amount_input.png => res/drawable-mdpi/amount_input.png
- res/drawable/bag_green.png => res/drawable-mdpi/bag_green.png
- res/drawable/blotter.png => res/drawable-mdpi/blotter.png
- res/drawable/bookmark.png => res/drawable-mdpi/bookmark.png
- res/drawable/btn_check_all.png => res/drawable-mdpi/btn_check_all.png
- res/drawable/btn_keyboard_key_normal.9.png => res/drawable-mdpi/btn_keyboard_key_normal.9.png
- res/drawable/btn_menu_selected.png => res/drawable-mdpi/btn_menu_selected.png
- res/drawable/btn_menu_unselected.png => res/drawable-mdpi/btn_menu_unselected.png
- res/drawable/btn_next.png => res/drawable-mdpi/btn_next.png
- res/drawable/btn_previous.png => res/drawable-mdpi/btn_previous.png
- res/drawable/btn_tag.png => res/drawable-mdpi/btn_tag.png
- res/drawable/btn_uncheck_all.png => res/drawable-mdpi/btn_uncheck_all.png
- res/drawable/budgets.png => res/drawable-mdpi/budgets.png
- res/drawable/calculator.png => res/drawable-mdpi/calculator.png
- res/drawable/calculator_button_big_normal.png => res/drawable-mdpi/calculator_button_big_normal.png
- res/drawable/calculator_button_big_pressed.png => res/drawable-mdpi/calculator_button_big_pressed.png
- res/drawable/calculator_button_normal.png => res/drawable-mdpi/calculator_button_normal.png
- res/drawable/calculator_button_pressed.png => res/drawable-mdpi/calculator_button_pressed.png
- res/drawable/coins.png => res/drawable-mdpi/coins.png
- res/drawable/core_res_res_drawable_btn_default_small_normal.9.png => res/drawable-mdpi/core_res_res_drawable_btn_default_small_normal.9.png
- res/drawable/core_res_res_drawable_btn_toggle_disabled.9.png => res/drawable-mdpi/core_res_res_drawable_btn_toggle_disabled.9.png
- res/drawable/core_res_res_drawable_btn_toggle_off.9.png => res/drawable-mdpi/core_res_res_drawable_btn_toggle_off.9.png
- res/drawable/core_res_res_drawable_btn_toggle_on.9.png => res/drawable-mdpi/core_res_res_drawable_btn_toggle_on.9.png
- res/drawable/credit_cards.png => res/drawable-mdpi/credit_cards.png
- res/drawable/currencies.png => res/drawable-mdpi/currencies.png
- res/drawable/divider_horizontal_dark.9.png => res/drawable-mdpi/divider_horizontal_dark.9.png
- res/drawable/divider_vertical_dark.png => res/drawable-mdpi/divider_vertical_dark.png
- res/drawable/divider_vertical_light.png => res/drawable-mdpi/divider_vertical_light.png
- res/drawable/download.png => res/drawable-mdpi/download.png
- res/drawable/expander_ic_maximized.9.png => res/drawable-mdpi/expander_ic_maximized.9.png
- res/drawable/expander_ic_minimized.9.png => res/drawable-mdpi/expander_ic_minimized.9.png
- res/drawable/expense.png => res/drawable-mdpi/expense.png
- res/drawable/frame_gallery_thumb_selected.9.png => res/drawable-mdpi/frame_gallery_thumb_selected.9.png
- res/drawable/ic_blotter_expense.png => res/drawable-mdpi/ic_blotter_expense.png
- res/drawable/ic_blotter_income.png => res/drawable-mdpi/ic_blotter_income.png
- res/drawable/ic_blotter_split.png => res/drawable-mdpi/ic_blotter_split.png
- res/drawable/ic_blotter_transfer.png => res/drawable-mdpi/ic_blotter_transfer.png
- res/drawable/ic_btn_round_bottom.png => res/drawable-mdpi/ic_btn_round_bottom.png
- res/drawable/ic_btn_round_calc.png => res/drawable-mdpi/ic_btn_round_calc.png
- res/drawable/ic_btn_round_down.png => res/drawable-mdpi/ic_btn_round_down.png
- res/drawable/ic_btn_round_sort_by_title.png => res/drawable-mdpi/ic_btn_round_sort_by_title.png
- res/drawable/ic_btn_round_top.png => res/drawable-mdpi/ic_btn_round_top.png
- res/drawable/ic_btn_round_up.png => res/drawable-mdpi/ic_btn_round_up.png
- res/drawable/ic_btn_round_updown.png => res/drawable-mdpi/ic_btn_round_updown.png
- res/drawable/ic_dialog_currency.png => res/drawable-mdpi/ic_dialog_currency.png
- res/drawable/ic_dialog_time.png => res/drawable-mdpi/ic_dialog_time.png
- res/drawable/ic_home_currency.png => res/drawable-mdpi/ic_home_currency.png
- res/drawable/ic_launcher_folder_small.png => res/drawable-mdpi/ic_launcher_folder_small.png
- res/drawable/ic_menu_agenda.png => res/drawable-mdpi/ic_menu_agenda.png
- res/drawable/ic_menu_attachment.png => res/drawable-mdpi/ic_menu_attachment.png
- res/drawable/ic_menu_bill_off.png => res/drawable-mdpi/ic_menu_bill_off.png
- res/drawable/ic_menu_bill_on.png => res/drawable-mdpi/ic_menu_bill_on.png
- res/drawable/ic_menu_calendar.png => res/drawable-mdpi/ic_menu_calendar.png
- res/drawable/ic_menu_calendar_day.png => res/drawable-mdpi/ic_menu_calendar_day.png
- res/drawable/ic_menu_calendar_off.png => res/drawable-mdpi/ic_menu_calendar_off.png
- res/drawable/ic_menu_collapse_all_categories.png => res/drawable-mdpi/ic_menu_collapse_all_categories.png
- res/drawable/ic_menu_compose.png => res/drawable-mdpi/ic_menu_compose.png
- res/drawable/ic_menu_expand_all_categories.png => res/drawable-mdpi/ic_menu_expand_all_categories.png
- res/drawable/ic_menu_goto.png => res/drawable-mdpi/ic_menu_goto.png
- res/drawable/ic_menu_more_small.png => res/drawable-mdpi/ic_menu_more_small.png
- res/drawable/ic_menu_today.png => res/drawable-mdpi/ic_menu_today.png
- res/drawable/ic_menu_upload.png => res/drawable-mdpi/ic_menu_upload.png
- res/drawable/ic_tab_accounts_selected.png => res/drawable-mdpi/ic_tab_accounts_selected.png
- res/drawable/ic_tab_accounts_unselected.png => res/drawable-mdpi/ic_tab_accounts_unselected.png
- res/drawable/ic_tab_blotter_selected.png => res/drawable-mdpi/ic_tab_blotter_selected.png
- res/drawable/ic_tab_blotter_unselected.png => res/drawable-mdpi/ic_tab_blotter_unselected.png
- res/drawable/ic_tab_budgets_selected.png => res/drawable-mdpi/ic_tab_budgets_selected.png
- res/drawable/ic_tab_budgets_unselected.png => res/drawable-mdpi/ic_tab_budgets_unselected.png
- res/drawable/ic_tab_graph_selected.png => res/drawable-mdpi/ic_tab_graph_selected.png
- res/drawable/ic_tab_graph_unselected.png => res/drawable-mdpi/ic_tab_graph_unselected.png
- res/drawable/ic_tab_reports_selected.png => res/drawable-mdpi/ic_tab_reports_selected.png
- res/drawable/ic_tab_reports_unselected.png => res/drawable-mdpi/ic_tab_reports_unselected.png
- res/drawable/ic_tab_selected_starred.png => res/drawable-mdpi/ic_tab_selected_starred.png
- res/drawable/ic_tab_unselected_starred.png => res/drawable-mdpi/ic_tab_unselected_starred.png
- res/drawable/icon.png => res/drawable-mdpi/icon.png
- res/drawable/icon_accounts.png => res/drawable-mdpi/icon_accounts.png
- res/drawable/icon_add_account.png => res/drawable-mdpi/icon_add_account.png
- res/drawable/icon_lock.png => res/drawable-mdpi/icon_lock.png
- res/drawable/icon_transaction_32x32.png => res/drawable-mdpi/icon_transaction_32x32.png
- res/drawable/icon_transfer_32x32.png => res/drawable-mdpi/icon_transfer_32x32.png
- res/drawable/income.png => res/drawable-mdpi/income.png
- res/drawable/lcd.9.png => res/drawable-mdpi/lcd.9.png
- res/drawable/line_back.png => res/drawable-mdpi/line_back.png
- res/drawable/marker.png => res/drawable-mdpi/marker.png
- res/drawable/marker_orange.png => res/drawable-mdpi/marker_orange.png
- res/drawable/menu_entities.png => res/drawable-mdpi/menu_entities.png
- res/drawable/menu_entities_categories.png => res/drawable-mdpi/menu_entities_categories.png
- res/drawable/menu_entities_currencies.png => res/drawable-mdpi/menu_entities_currencies.png
- res/drawable/menu_entities_locations.png => res/drawable-mdpi/menu_entities_locations.png
- res/drawable/menu_entities_projects.png => res/drawable-mdpi/menu_entities_projects.png
- res/drawable/money.png => res/drawable-mdpi/money.png
- res/drawable/mylocation.png => res/drawable-mdpi/mylocation.png
- res/drawable/notification_icon.png => res/drawable-mdpi/notification_icon.png
- res/drawable/notification_icon_transaction.png => res/drawable-mdpi/notification_icon_transaction.png
- res/drawable/notification_icon_transfer.png => res/drawable-mdpi/notification_icon_transfer.png
- res/drawable/orangesoftware.png => res/drawable-mdpi/orangesoftware.png
- res/drawable/right_arrow.png => res/drawable-mdpi/right_arrow.png
- res/drawable/statusbar_background.png => res/drawable-mdpi/statusbar_background.png
- res/drawable/textfield_default.9.png => res/drawable-mdpi/textfield_default.9.png
- res/drawable/transaction_status_cleared_2.png => res/drawable-mdpi/transaction_status_cleared_2.png
- res/drawable/transaction_status_pending_2.png => res/drawable-mdpi/transaction_status_pending_2.png
- res/drawable/transaction_status_pending_2s.png => res/drawable-mdpi/transaction_status_pending_2s.png
- res/drawable/transaction_status_reconciled_2.png => res/drawable-mdpi/transaction_status_reconciled_2.png
- res/drawable/transaction_status_restored_2.png => res/drawable-mdpi/transaction_status_restored_2.png
- res/drawable/transaction_status_unreconciled_2.png => res/drawable-mdpi/transaction_status_unreconciled_2.png
- res/drawable/twitter.png => res/drawable-mdpi/twitter.png
- res/drawable/wallet_open.png => res/drawable-mdpi/wallet_open.png
- res/drawable/widget_background_gray.9.png => res/drawable-mdpi/widget_background_gray.9.png
- src/ru/orangesoftware/financisto/utils/DateUtils.java => src/ru/orangesoftware/financisto/datetime/DateUtils.java
- src/ru/orangesoftware/financisto/blotter/WhereFilter.java => src/ru/orangesoftware/financisto/filter/WhereFilter.java
- src/ru/orangesoftware/financisto/model/info/TransactionAttributeInfo.java => src/ru/orangesoftware/financisto/model/TransactionAttributeInfo.java
- src/ru/orangesoftware/financisto/model/info/TransactionInfo.java => src/ru/orangesoftware/financisto/model/TransactionInfo.java
- tests/src/ru/orangesoftware/financisto/db/MonthlyViewTest.java => tests/src/ru/orangesoftware/financisto/db/PlannerTest.java
- files modified:
- .idea/compiler.xml
expand all
collapse all
added
removed
res/drawable/btn_circle_disable.png
res/drawable/btn_circle_disable_focused.png
res/drawable/btn_circle_normal.png
res/drawable/btn_circle_pressed.png
res/drawable/btn_circle_selected.png
res/drawable/btn_toggle_expense.9.png
res/drawable/btn_toggle_income.9.png
res/drawable/btn_total_default.9.png
res/drawable/btn_total_pressed.9.png
res/drawable/ic_btn_round_minus.png
res/drawable/ic_btn_round_more.png
res/drawable/ic_btn_round_plus.png
res/drawable/ic_btn_round_split.png
res/drawable/ic_btn_round_transfer.png
res/drawable/ic_btn_switch.png
res/drawable/ic_input_add.png
res/drawable/ic_input_exchange_rates.png
res/drawable/ic_input_templates.png
res/drawable/ic_input_transfer.png
res/drawable/ic_menu_back.png
res/drawable/ic_menu_filter_clear.png
res/drawable/ic_menu_filter_off.png
res/drawable/ic_menu_filter_on.png
res/drawable/ic_menu_forward.png
res/drawable/ic_menu_report_both.png
res/drawable/ic_menu_report_expense.png
res/drawable/ic_menu_report_income.png
res/drawable/ic_menu_report_summary.png
res/drawable/ic_menu_rotate.png
res/drawable/ic_tab_android_active.png
res/drawable/ic_tab_android_inactive.png
res/drawable/ic_tab_reports_line_selected.png
res/drawable/ic_tab_reports_line_unselected.png
res/drawable/icon_transaction.png
res/drawable/icon_transfer.png
res/drawable/list_selector_background_focus.9.png
res/drawable/menu_entities_exchange_rates.png
res/drawable/menu_entities_payees.png
res/drawable/timepicker_down_disabled.9.png
res/drawable/timepicker_down_disabled_focused.9.png
res/drawable/timepicker_down_normal.9.png
res/drawable/timepicker_down_pressed.9.png
res/drawable/timepicker_down_selected.9.png
res/drawable/timepicker_input_disabled.9.png
res/drawable/timepicker_input_normal.9.png
res/drawable/timepicker_input_pressed.9.png
res/drawable/timepicker_input_selected.9.png
res/drawable/timepicker_up_disabled.9.png
res/drawable/timepicker_up_disabled_focused.9.png
res/drawable/timepicker_up_normal.9.png
res/drawable/timepicker_up_pressed.9.png
res/drawable/timepicker_up_selected.9.png
res/drawable/total_error.png
