Merge default.
authorgniibe <gniibe@fsij.org>
Mon, 3 Aug 2009 05:28:12 +0000 (14:28 +0900)
committergniibe <gniibe@fsij.org>
Mon, 3 Aug 2009 05:28:12 +0000 (14:28 +0900)
1  2 
ChangeLog
settings.py

diff --cc ChangeLog
+++ b/ChangeLog
@@@ -1,56 -1,12 +1,67 @@@
 -2009-08-03  Niibe Yutaka  <gniibe@fsij.org>
 +2009-08-03  NIIBE Yutaka  <gniibe@fsij.org>
  
+       * apache-setting.cfg: New file.
+       * urls.py: Remove '/fsij' prefix.
+       * templates/top_page.html: Likewise.
+       * templates/meeting_attendance/meeting_detail.html: Likewise.
+       * templates/registration/login.html: Likewise.
+       * templates/membership/member_list_top.html: Likewise.
+       * settings.py: Likewise.
+       * scripts/fsij-django.wsgi: New file.
++
 +      * membership/views.py (member_payment): Follow the type change of
 +      fee_year for fee_list.
 +      (add_member_payment): Likewise.
 +      (register_member_email): Save to member.email too.
 +      (payment_list): Bug fix.  Field name is 'date'.
 +
 +      * templates/membership/member_payment.html: Likewise.
 +
 +      * settings.py: Import SECRET_KEY from settings_private.py.
 +
 +      * membership/admin.py (MemberFee): Removed.
 +
 +2009-08-01  NIIBE Yutaka  <gniibe@fsij.org>
 +
 +      * +migrate+/20090801_membership.sql: New file.
 +
 +      * membership/models.py (MemberPayment): Rename fee to fee_year.
 +      Make fee_year IntegerField (was: ForeignKey to MemberFee).
 +      Rename t_i to le.
 +      (MemberFee): Removed.
 +      (Member): Added fields of first_name, last_name, and email.
 +
 +2009-07-31  NIIBE Yutaka  <gniibe@fsij.org>
 +
 +      * membership/views.py (member_payment, manage_register_member):
 +      Follow date_joined change.
 +      * templates/membership/member_edit.html: Likewise.
 +      * templates/membership/valid_member_list.html: Likewise.
 +
 +      * +migrate+: New directory.
 +      * +migrate+/20090731_membership.sql: New file.
 +      * +migrate+/20090731_gc_table.sql: New file.
 +
 +      * membership/admin.py: Remove MemberType.
 +
 +      * membership/models.py (Member): Rename date_join to date_joined.
 +
 +      * membership/views.py (member_payment, add_member_payment): Follow
 +      member_type change.
 +      (manage_member, manage_register_member): Likewise.
 +
 +      * templates/membership/member_edit.html: Likewise.
 +      * templates/membership/member_index.html: Likewise.
 +      * templates/membership/member_list.html: Likewise.
 +      * templates/membership/member_payment.html: Likewise.
 +
 +2009-07-30  NIIBE Yutaka  <gniibe@fsij.org>
 +
 +      * membership/models.py (MemberType): Removed.
 +      (Member, MemberPayment): Change field type of member_type into
 +      CharField with choices (was: ForeignKey).
 +      
 +      * membership/__setup__.py: Removed.
 +
diff --cc settings.py
Simple merge