aboutsummaryrefslogtreecommitdiffstats
path: root/account
Commit message (Collapse)AuthorAgeFilesLines
* Updated 'profile.html' and zh_CN locale messagesWeitian LI2014-06-071-6/+34
| | | | | | * updated profile.html to show 'sjtu_id' and 'sjtu_initpass' info and show a related alert * updated zh_CN locale messages
* Added fields 'sjtu_id' & 'sjtu_initpass' to UserProfile modelWeitian LI2014-06-073-0/+107
| | | | | | | * added fields 'sjtu_id' & 'sjtu_initpass' to UserProfile model * updated 'dump()' and 'dump_fieldnames()' method * updated 'UserProfileAdmin' to show these fields * added south migration 0004 for newly added two fields
* Updated UserProfile admin (account/admin.py)Weitian LI2014-06-071-18/+68
| | | | | | | * displayed one more column 'id' * added filter function * changed display style of 'is_approved', 'is_sponsored' and 'is_checkin': display icons instead of text
* Validate username field on registrationWeitian LI2014-06-071-1/+23
| | | | | | * validate username with regex on registration (bootstrap3 frontent does not handle regex correctly. XXX) -> account/forms.py * small update to registration page title display style
* Fixed a type 'identify' and updated 'list_approved' display contentsWeitian LI2014-06-036-27/+110
| | | | | | | | | * changed 'identify' to 'identity' in Model 'UserProfile' * updated forms.py, admin.py, profile.html related to 'identity' * added South migration for renaming field 'identify' to 'identity' * updated display contents of 'list_approved': removed 'identity' column * updated 'institute' field name to 'institute (and major)' * updated related translations
* updated 'list_approved.html' display style (removed column identity)Weitian LI2014-06-021-9/+10
|
* * fixed the csv output format problem in 'admin/account/userprofile/csv'Weitian LI2014-05-242-10/+109
| | | | | * added 'account/csv_unicode.py' to provide Unicode CSV I/O support * used 'UnicodeWriter' in 'account/admin.py' userprofile_csv_view to generate csv format export
* small updates to account/models.pyWeitian LI2014-05-201-5/+11
|
* * added 'is_checkin' field to account.models.UserProfileWeitian LI2014-05-206-3/+371
| | | | | | | | * added 'get_checkin_value', 'dump_fieldnames' and 'dump' methods to UserProfile model * generated south migrations for app 'account' * display two more columns (email, is_checkin) in UserProfileAdmin * added 'get_urls' and 'userprofile_csv_view' to UserProfileAdmin * updaed 'profile.html' with 'is_checkin' field
* * enabled 'south' in 'INSTALLED_APPS'Weitian LI2014-05-201-0/+15
| | | | * added 'introspection_rules' of ContentTypeRestrictedFileField for south
* * changed block 'title' to 'pagetitle' for every page templateWeitian LI2014-05-1814-46/+14
|
* fixed problem with 'transcript_url' field of UserProfileAdminWeitian LI2014-04-301-4/+9
|
* * fixed attachments.short_description of UserProfileAdminWeitian LI2014-04-301-0/+1
| | | | * updated related zh_CN messages
* * added 'UserProfileAdmin' with actions and list_display:Weitian LI2014-04-301-1/+134
| | | | | | | | | | | | | | | | | | | | | | | o actions: - 'approve_users', - 'sponsor_users', - 'cancel_approve_users', - 'cancel_sponsor_users', - 'reset_approve_users', - 'reset_sponsor_users', o list_display: - 'user', - 'realname', - 'gender', - 'institute', - 'identify', - 'reason', - 'transcript_url', - 'supplement', - 'attachments', - 'is_approved', - 'is_sponsored', * updated zh_CN messages
* Replaced get_object_or_404 with query in ListApprovedView, thus adminWeitian LI2014-04-292-2/+6
| | | | can browser approved user list normally.
* * updated transcript help_text of account/models.pyWeitian LI2014-04-294-3/+5
| | | | | | * updated ValidationError message and used named string of account/extra.py * small changes to 'profile.html' and 'profile_update.html' * added class Meta to notice/models.py/NoticeAttachment
* * fixed FieldFile import problem of account/extra.pyWeitian LI2014-04-293-4/+6
| | | | | * updated models.py and added 'help_text' to transcript field * using 'get_object_or_404' in views.py instead of simply get method
* * updated activation_email subject and content templateWeitian LI2014-04-293-5/+8
| | | | | | * updated password_reset_email subject and content template * fixed a typo in 400.html * small update to profile_update_done btn style
* * updated login.html with 'password-reset' styleWeitian LI2014-04-292-6/+10
| | | | | | * updated profile.html with transcript display * updated about.html with alert warning information * updated introduction with poster download link
* * included archive urlsWeitian LI2014-04-282-16/+17
| | | | * moved 'file_cleanup' function to extra.py
* * implemented function to auto login user after activationWeitian LI2014-04-271-3/+15
| | | | | o added 'login_on_activation' and connected to 'user_activated' signal o updated 'activation_complete.html' template
* * updated 'list_approved.html' and related 'ListApprovedView'Weitian LI2014-04-273-11/+19
| | | | * small update to 'profile.html'
* * updated 'profile.html' to show new fieldsWeitian LI2014-04-274-12/+100
| | | | | | * added account_profile.css * fixes to 'save' method of model UserProfile and UserFile * fixes to 'UpdateProfileView' with formset 'instance'
* * added 'OverwriteStorage()' to overwrite previous uploaded filesWeitian LI2014-04-272-1/+87
| | | | * overwrite 'save' method to delete previous uploaded files
* * added model 'UserFile' and register to adminWeitian LI2014-04-274-13/+164
| | | | | | | | | * updated 'UserProfile' model: o added fields 'reason', 'transcript', 'supplement' o used 'ContentTypeRestrictedFileField' with dynamical 'upload_to' * updated 'UpdateProfileView' to support formset * updated 'UpdateProfileForm' with new fields and clean method * added 'UserFileForm' and 'UserFileFormSet'
* * updated 'profile_update' template:Weitian LI2014-04-274-2/+109
| | | | | | | o account_profile_update.css account_profile_update.js o added fields 'reason', 'transcript', 'supplement' o supported upload files (optional, dynamical formset) * updated urls.py of 'password_reset' view
* * updated ALLOWED_CONTENT_TYPESWeitian LI2014-04-271-0/+50
| | | | * implemented ContentTypeRestrictedFileField based on FileField
* * implemented 'password_reset' function based on django auth viewsWeitian LI2014-04-268-15/+152
| | | | | * added password_reset related templates and email templates * updated account urls.py
* * installed 'django-recaptcha'Weitian LI2014-04-251-1/+5
| | | | * added 'captcha' field to UserRegForm
* * updated 'introduction' url to index.htmlWeitian LI2014-04-221-1/+1
| | | | * fixed comment in 'list_approved.html'
* * added column 'identify' to 'list_approved' viewWeitian LI2014-04-221-3/+6
| | | | * updated navbar.html to always show 'list_approved' but login_required
* fixes to account admin.site.registerWeitian LI2014-04-212-8/+8
|
* * added following methods for 'UserProfile' model:Weitian LI2014-04-212-1/+35
| | | | | | | | | o get_gender_value() o get_approved_value() o get_sponsored_value() o get_identify_value() * updated 'user_registered_callback' to save 'identify' field * updated 'account/profile.html' template to show identify infomation
* * added 'ResendEmailForm' formsWeitian LI2014-04-217-21/+184
| | | | | | | | * implemented 'ResendEmailView' class-based view and templates * added js code 'account_email_resend.js' Warning: cannot load static file located in app directory
* * implemented 'list_approved' view, added related templateWeitian LI2014-04-214-1/+82
| | | | * updated related link in 'navbar.html'
* * added 'profile', 'profile_update' and 'profile_update_done' templatesWeitian LI2014-04-207-27/+172
| | | | | | | and implemented related views * added 'account.forms.UpdateProfileForm' * implemented 'account.views.UpdateProfileView' using class-based view * updated 'account.urls'
* small fixes to "br" tagWeitian LI2014-04-204-6/+54
|
* disabled app south and removed migrationsWeitian LI2014-04-203-153/+0
|
* added 'password_change' and 'password_change_done' views and templatesWeitian LI2014-04-203-4/+60
|
* fixed UserProfile model to use CharField choices in "is_approved" and ↵Weitian LI2014-04-201-2/+17
| | | | "is_sponsored"
* * updated django_skaschool/settings.pyWeitian LI2014-04-204-3/+78
| | | | | | o LOGIN_URL, LOGIN_REDIRECT_URL, LOGOUT_URL * added login/logout views to account urls.py * added account templates for login, logout, profile
* * implemented custom form and profile for registrationWeitian LI2014-04-204-2/+148
|
* * implemented the index pageWeitian LI2014-04-203-0/+153
| | | | | | | | o base.html, navbar.html, favicon.html, index.html o added static files related to index page * performed south migrations * implemented registration templates * implemented regiration views and pages
* * updated settings.py, added settings_email.pyWeitian LI2014-04-185-0/+21
* created directories 'static' and 'templates' * added app 'account', 'notice' * added app 'demo'