GitBucket
|
Resolved Merged Conflicts + Corrected Indentation
|
|---|
Bhavesh Goyal
authored
on 15 Apr 2015
|
| README.rst |
|---|
| setup.py |
|---|
| src/postorius/__init__.py |
|---|
| src/postorius/auth/decorators.py |
|---|
| src/postorius/doc/news.rst |
|---|
| src/postorius/forms.py |
|---|
| src/postorius/static/postorius/css/style.css |
|---|
| src/postorius/templates/postorius/base.html |
|---|
| src/postorius/templates/postorius/domain_confirm_delete.html |
|---|
| src/postorius/templates/postorius/domain_index.html |
|---|
| src/postorius/templates/postorius/domain_new.html |
|---|
| src/postorius/templates/postorius/lists/archival_options.html 0 → 100644 |
|---|
| src/postorius/templates/postorius/lists/confirm_delete.html |
|---|
| src/postorius/templates/postorius/lists/confirm_remove_role.html |
|---|
| src/postorius/templates/postorius/lists/held_messages.html |
|---|
| src/postorius/templates/postorius/lists/index.html |
|---|
| src/postorius/templates/postorius/lists/mass_subscribe.html |
|---|
| src/postorius/templates/postorius/lists/memberoptions.html |
|---|
| src/postorius/templates/postorius/lists/members.html |
|---|
| src/postorius/templates/postorius/lists/metrics.html |
|---|
| src/postorius/templates/postorius/lists/new.html |
|---|
| src/postorius/templates/postorius/lists/settings.html |
|---|
| src/postorius/templates/postorius/lists/subscribe.html |
|---|
| src/postorius/templates/postorius/lists/summary.html |
|---|
| src/postorius/templates/postorius/lists/unsubscribe.html |
|---|
| src/postorius/templates/postorius/login.html |
|---|
| src/postorius/templates/postorius/menu/list_nav.html |
|---|
| src/postorius/templates/postorius/user_address_activation.html |
|---|
| src/postorius/templates/postorius/user_address_activation_sent.html |
|---|
| src/postorius/templates/postorius/user_address_preferences.html |
|---|
| src/postorius/templates/postorius/user_mailmansettings.html |
|---|
| src/postorius/templates/postorius/user_profile.html |
|---|
| src/postorius/templates/postorius/user_settings.html |
|---|
| src/postorius/templates/postorius/user_subscription_preferences.html |
|---|
| src/postorius/templates/postorius/user_subscriptions.html |
|---|
| src/postorius/templates/postorius/user_tasks.html |
|---|
| src/postorius/tests/fixtures/vcr_cassettes/archival_options.yaml 0 → 100644 |
|---|
| src/postorius/tests/fixtures/vcr_cassettes/list_members_access.yaml |
|---|
|
Too large (Show diff)
|
| src/postorius/tests/fixtures/vcr_cassettes/list_members_page.yaml |
|---|
|
Too large (Show diff)
|
| src/postorius/tests/fixtures/vcr_cassettes/test_list_archival_options.yaml 0 → 100644 |
|---|
| src/postorius/tests/fixtures/vcr_cassettes/test_list_archival_options_disable_archiver.yaml 0 → 100644 |
|---|
| src/postorius/tests/fixtures/vcr_cassettes/test_list_archival_options_enable_archiver.yaml 0 → 100644 |
|---|
| src/postorius/tests/fixtures/vcr_cassettes/test_list_creation.yaml |
|---|
|
Too large (Show diff)
|
| src/postorius/tests/fixtures/vcr_cassettes/test_list_index.yaml |
|---|
|
Too large (Show diff)
|
| src/postorius/tests/fixtures/vcr_cassettes/test_list_members_add_moderator.yaml |
|---|
|
Too large (Show diff)
|
| src/postorius/tests/fixtures/vcr_cassettes/test_list_members_add_owner.yaml |
|---|
|
Too large (Show diff)
|
| src/postorius/tests/fixtures/vcr_cassettes/test_list_members_add_owner_new_owner_added.yaml |
|---|
| src/postorius/tests/fixtures/vcr_cassettes/test_list_members_new_moderator_added.yaml |
|---|
| src/postorius/tests/fixtures/vcr_cassettes/test_list_metrics.yaml |
|---|
|
Too large (Show diff)
|
| src/postorius/tests/fixtures/vcr_cassettes/test_list_summary.yaml |
|---|
|
Too large (Show diff)
|
| src/postorius/tests/mailman_api_tests/__init__.py |
|---|
| src/postorius/tests/mailman_api_tests/test_archival_options.py 0 → 100644 |
|---|
| src/postorius/tests/test_forms.py |
|---|
| src/postorius/urls.py |
|---|
| src/postorius/views/list.py |
|---|
| src/postorius/views/settings.py |
|---|