Resolved Merged Conflicts + Corrected Indentation

Fork: 0

kalle / postorius

Browse code Resolved Merged Conflicts + Corrected Indentation master
commit 3bf7cabf9c7f3523cc84fd4a56343dea504d8a53 2 parents bf45ce2 + 2c50231 Bhavesh Goyal authored on 15 Apr 2015

Patch

Unified Split

Showing 56 changed files

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          README.rst
 Postorius requires Python 2.6 or newer and mailman.client,
the official Python bindings for GNU Mailman, it also requires
django-social-auth.
The minimum Django version is 1.3.
The minimum Django version is 1.6.
Postorius needs a running version of GNU Mailman version 3.
 
 
NEWS/Changelog
 Postorius requires Python 2.6 or newer and mailman.client,
 the official Python bindings for GNU Mailman, it also requires
 django-social-auth.
+The minimum Django version is 1.3.
+The minimum Django version is 1.6.
 Postorius needs a running version of GNU Mailman version 3.
 NEWS/Changelog

                Ignore Space
               Show notes
              View
            
          
          4 ■■■■■
          setup.py
 setup(
    name="postorius",
    version='1.0.0b1',
    version='1.0.0b3',
    description="A web user interface for GNU Mailman",
    long_description=open('README.rst').read(),
    maintainer="The Mailman GSOC Coders",
    license='GPLv3',
        ],
    packages=find_packages('src'),
    package_dir={'': 'src'},
    include_package_data=True,
    install_requires=['django>=1.5, <1.8',
    install_requires=['django>=1.6',
                      'django-browserid',
                      'mailmanclient']
)
 setup(
     name="postorius",
+    version='1.0.0b1',
+    version='1.0.0b3',
     description="A web user interface for GNU Mailman",
     long_description=open('README.rst').read(),
     maintainer="The Mailman GSOC Coders",
     license='GPLv3',
         ],
     packages=find_packages('src'),
     package_dir={'': 'src'},
     include_package_data=True,
+    install_requires=['django>=1.5, <1.8',
+    install_requires=['django>=1.6',
                       'django-browserid',
                       'mailmanclient']
 )

Ignore Space Show notes View

■■■■■

src/postorius/__init__.py

Ignore Space Show notes View src/postorius/auth/decorators.py

Ignore Space Show notes View src/postorius/doc/news.rst

Ignore Space Show notes View src/postorius/forms.py

Ignore Space Show notes View src/postorius/static/postorius/css/style.css

Ignore Space Show notes View src/postorius/templates/postorius/base.html

Ignore Space Show notes View src/postorius/templates/postorius/domain_confirm_delete.html

Ignore Space Show notes View src/postorius/templates/postorius/domain_index.html

Ignore Space Show notes View src/postorius/templates/postorius/domain_new.html

Ignore Space Show notes View src/postorius/templates/postorius/lists/archival_options.html 0 → 100644

Ignore Space Show notes View src/postorius/templates/postorius/lists/confirm_delete.html

Ignore Space Show notes View src/postorius/templates/postorius/lists/confirm_remove_role.html

Ignore Space Show notes View src/postorius/templates/postorius/lists/held_messages.html

Ignore Space Show notes View src/postorius/templates/postorius/lists/index.html

Ignore Space Show notes View src/postorius/templates/postorius/lists/mass_subscribe.html

Ignore Space Show notes View src/postorius/templates/postorius/lists/memberoptions.html

Ignore Space Show notes View src/postorius/templates/postorius/lists/members.html

Ignore Space Show notes View src/postorius/templates/postorius/lists/metrics.html

Ignore Space Show notes View src/postorius/templates/postorius/lists/new.html

Ignore Space Show notes View src/postorius/templates/postorius/lists/settings.html

Ignore Space Show notes View src/postorius/templates/postorius/lists/subscribe.html

Ignore Space Show notes View src/postorius/templates/postorius/lists/summary.html

Ignore Space Show notes View src/postorius/templates/postorius/lists/unsubscribe.html

Ignore Space Show notes View src/postorius/templates/postorius/login.html

Ignore Space Show notes View src/postorius/templates/postorius/menu/list_nav.html

Ignore Space Show notes View src/postorius/templates/postorius/user_address_activation.html

Ignore Space Show notes View src/postorius/templates/postorius/user_address_activation_sent.html

Ignore Space Show notes View src/postorius/templates/postorius/user_address_preferences.html

Ignore Space Show notes View src/postorius/templates/postorius/user_mailmansettings.html

Ignore Space Show notes View src/postorius/templates/postorius/user_profile.html

Ignore Space Show notes View src/postorius/templates/postorius/user_settings.html

Ignore Space Show notes View src/postorius/templates/postorius/user_subscription_preferences.html

Ignore Space Show notes View src/postorius/templates/postorius/user_subscriptions.html

Ignore Space Show notes View src/postorius/templates/postorius/user_tasks.html

Ignore Space Show notes View src/postorius/tests/fixtures/vcr_cassettes/archival_options.yaml 0 → 100644

Ignore Space Show notes View src/postorius/tests/fixtures/vcr_cassettes/list_members_access.yaml
Too large (Show diff)

Ignore Space Show notes View src/postorius/tests/fixtures/vcr_cassettes/list_members_page.yaml
Too large (Show diff)

Ignore Space Show notes View src/postorius/tests/fixtures/vcr_cassettes/test_list_archival_options.yaml 0 → 100644

Ignore Space Show notes View src/postorius/tests/fixtures/vcr_cassettes/test_list_archival_options_disable_archiver.yaml 0 → 100644

Ignore Space Show notes View src/postorius/tests/fixtures/vcr_cassettes/test_list_archival_options_enable_archiver.yaml 0 → 100644

Ignore Space Show notes View src/postorius/tests/fixtures/vcr_cassettes/test_list_creation.yaml
Too large (Show diff)

Ignore Space Show notes View src/postorius/tests/fixtures/vcr_cassettes/test_list_index.yaml
Too large (Show diff)

Ignore Space Show notes View src/postorius/tests/fixtures/vcr_cassettes/test_list_members_add_moderator.yaml
Too large (Show diff)

Ignore Space Show notes View src/postorius/tests/fixtures/vcr_cassettes/test_list_members_add_owner.yaml
Too large (Show diff)

Ignore Space Show notes View src/postorius/tests/fixtures/vcr_cassettes/test_list_members_add_owner_new_owner_added.yaml

Ignore Space Show notes View src/postorius/tests/fixtures/vcr_cassettes/test_list_members_new_moderator_added.yaml

Ignore Space Show notes View src/postorius/tests/fixtures/vcr_cassettes/test_list_metrics.yaml
Too large (Show diff)

Ignore Space Show notes View src/postorius/tests/fixtures/vcr_cassettes/test_list_summary.yaml
Too large (Show diff)

Ignore Space Show notes View src/postorius/tests/mailman_api_tests/__init__.py

Ignore Space Show notes View src/postorius/tests/mailman_api_tests/test_archival_options.py 0 → 100644

Ignore Space Show notes View src/postorius/tests/test_forms.py

Ignore Space Show notes View src/postorius/urls.py

Ignore Space Show notes View src/postorius/views/list.py

Ignore Space Show notes View src/postorius/views/settings.py

Show line notes below