aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updated zh_CN messages.Weitian LI2014-06-252-67/+104
|
* Updated traffic page with new imagesWeitian LI2014-06-254-7/+14
| | | | | * Added sjtu_tuoxie_02.jpg and sjtu_xueshu_02.jpg images * Small fix to schedule.html
* Added schedule.html template for app 'schedule'.Weitian LI2014-06-2413-26/+362
| | | | | | | | | | * added 'schedule.views.ScheduleView' * added 'schedule.html' template, with 'schedule.css' and 'schedule.js' * added 'schedule.urls', updated django_skaschool.urls * added tools/templatetags/dict_utils.py * converted schedule models to south-based * removed original 'page/templates/page/program.html', related urls * updated navbar.html
* Fixed a problem with OverwriteStorage.Weitian LI2014-06-242-2/+2
| | | | | | OverwriteStorage should be called as: FileField(..., storage=OverwriteStorage(),...) ^^
* Added app schedule.Weitian LI2014-06-245-0/+88
| | | | | * Added app schedule, largely based on 'notice' app * TODO: views and templates
* Splited storage function from account.extraWeitian LI2014-06-245-61/+74
| | | | | | | | * Splited storage function from account.extra -> tools/storage.py - OverwriteStorage - file_cleanup * Updated account.models, archive.models * Added OverwriteStorage and file_cleanup function to notice.models
* Added app schedule, tools and archive/templatetags; updated settings.Weitian LI2014-06-2410-2/+41
| | | | | | | | | * Added app 'schedule' to provides a more generic schedule page * Added fake app 'tools' to holds generic utilities * Moved notice/templatetags to tools/templatetags * Small change to archive.models.Archive display format * Added archive/templatetags * Small update to introduction page
* Updated traffic and introduction pages.Weitian LI2014-06-236-14/+86
| | | | | | | | | | * Small updates to introduction page. * Updated traffic page: - traffic routes - new metro map * Used bootstrap modal plugin to view images for traffic page - traffic.js - traffic.css
* Split SECRET_KEY from settings and update .gitignore.Weitian LI2014-06-235-3/+10
| | | | | | * Split 'SECRET_KEY' from settings * Updated settings files * Updated .gitignore settings
* Updated accommodation information.Weitian LI2014-06-172-1/+15
|
* Update accommodation.html pageWeitian LI2014-06-161-1/+1
|
* Updated traffic and accommodation information.Weitian LI2014-06-157-28/+55
| | | | | | | * Updated traffic routes. * Added map of SJTU Minhang campus. * Updated accommodation information, and added related routes. * small update to templates/navbar.html
* updated name in LICENSE.txtWeitian LI2014-06-071-2/+2
|
* Updated 'profile.html' and zh_CN locale messagesWeitian LI2014-06-073-89/+129
| | | | | | * 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-072-2/+26
| | | | | | * 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
* show notice pubtime in index pageWeitian LI2014-06-031-1/+1
|
* updated notice display style in index pageWeitian LI2014-06-031-3/+3
|
* Show latest import notice at index page.Weitian LI2014-06-034-4/+42
| | | | | | * added 'page.views.IndexView' for 'django_skaschool.urls * updated 'index.html' to display notice at bottom * added '.smallcaps' in 'index.css' for English title
* Fixed a type 'identify' and updated 'list_approved' display contentsWeitian LI2014-06-038-73/+156
| | | | | | | | | * 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
|
* added "settings_email.py_sample"Weitian LI2014-05-241-0/+13
|
* * 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
* updated local messages zh_CNWeitian LI2014-05-202-66/+117
|
* 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-204-3/+18
| | | | * added 'introspection_rules' of ContentTypeRestrictedFileField for south
* * updated keywords in metainfo.htmlWeitian LI2014-05-181-1/+3
| | | | * added 'baidu-site-verification' to metainfo.html
* * changed block 'title' to 'pagetitle' for every page templateWeitian LI2014-05-1833-103/+33
|
* * updated 'robots.txt'Weitian LI2014-05-185-2/+20
| | | | | * updated template 'base.html' to include 'metainfo.html' and 'sitetitle.txt' * updated navbar.html main button text
* updated poster skaschool-poster.jpgWeitian LI2014-05-141-0/+0
|
* * upaded display format of model Notice 'notice/models.py'Weitian LI2014-05-145-6/+11
| | | | | | * updated 'archive/urls.py', shortened the url, added a redirect * updated poster image: 'skaschool-poster.jpg' * updated the lecturer information of 'page/introduction.html'
* * small updates to 'introduction.html'Weitian LI2014-05-042-6/+10
| | | | * small updates to 'NOTES.txt'
* * added 'bootstrap-3.1.1' to staticWeitian LI2014-05-0415-3/+8346
| | | | | * updated 'settings' to serve bootstrap from local ('respond.js' required local css, otherwise extra configuration requires.)
* fixed problem with 'transcript_url' field of UserProfileAdminWeitian LI2014-04-301-4/+9
|
* * fixed attachments.short_description of UserProfileAdminWeitian LI2014-04-303-1/+6
| | | | * updated related zh_CN messages
* * added 'UserProfileAdmin' with actions and list_display:Weitian LI2014-04-303-6/+221
| | | | | | | | | | | | | | | | | | | | | | | 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
* checked the contents of introduction.html pageWeitian LI2014-04-301-5/+5
|
* Apache2 conf: default to embedded modeWeitian LI2014-04-301-3/+5
| | | | | | To fix the problem in daemon mode: o Target WSGI script '/opt/www/skaschool/django_skaschool/django_skaschool/wsgi.py' cannot be loaded as Python module. o ImportError: No module named django.core.handlers.wsgi
* updated 'wsgi.py' to provide 'check_password' handler for mod_wsgi to work ↵Weitian LI2014-04-291-2/+11
| | | | with apache2 user authentication
* * added 'DEPLOYMENT.md': notes about deploymentWeitian LI2014-04-293-0/+103
| | | | | * added 'APACHE2_skaschool.conf': configuration for apache2 (>=2.2) * renamed LICENSE to LICENSE.txt
* added BeiAn information to index.htmlWeitian LI2014-04-291-0/+1
|
* modified 'wsgi.py': set DJANGO_SETTINGS_MODULE to settings_productionWeitian LI2014-04-291-1/+4
|
* Replaced get_object_or_404 with query in ListApprovedView, thus adminWeitian LI2014-04-292-2/+6
| | | | can browser approved user list normally.
* added sponsors links and updated friends linksWeitian LI2014-04-291-2/+15
|
* * added 'Markdown' to requirements.txtWeitian LI2014-04-294-13/+19
| | | | | * updated zh_CN messages * fixed a typo in 'my_markdown.py'
* * implemented 'my_markdown' templatetag (requires python-markdown)Weitian LI2014-04-294-2/+30
| | | | | * updated 'list_notice.html' .notice-content with my_markdown tag * added help_text for notice/models.py/Notice contents field
* * updated transcript help_text of account/models.pyWeitian LI2014-04-295-3/+9
| | | | | | * 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
* updated locale zh_CN messagesWeitian LI2014-04-292-35/+197
|
Copyright © 2017-2018 Aaron LI. All Rights Reserved.