-
Notifications
You must be signed in to change notification settings - Fork 7
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Events #34
Open
BademiChetan
wants to merge
1,417
commits into
master
Choose a base branch
from
events
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Events #34
Changes from 250 commits
Commits
Show all changes
1417 commits
Select commit
Hold shift + click to select a range
b6d7607
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
varshaan dda873d
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra 2f23981
minor corrections
webopsShaastra fb20bc7
contact info changed
f3155ee
added shows tab
srmanikandasriram 966c705
envisage and grand finale added to shows
srmanikandasriram 95aafb2
more images added in shows tab
064f00c
minor changes
webopsShaastra eef1544
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra f0a5665
images in slideshow adjusted
d6e9598
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra 23cb402
Fix next redirect issue.
anantgirdhar 9355c8c
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra 45b4dd0
Team Check-In bug fix
varshaan 2867466
Condition to check if team member is already checked in added
varshaan fcdbae5
Hospi changes
varshaan 1596dd3
Correct error message: Shaastra 2013 not 2011.
webopsShaastra 5f50e98
Add Participant PDF Gen and Mailing.
anantgirdhar 46156de
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
anantgirdhar 07856e5
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra 546a3f6
Participant PDF: Fix bugs.
webopsShaastra 318c8bd
Add Core Dashboard link in Admin Dashboard. (All Cores are now Admins.)
anantgirdhar c5838ac
Participant PDF: Add account instruction.
anantgirdhar 0b9313a
Participant PDF: Fix minor formatting issue.
anantgirdhar f38be72
contacts added
a5788d5
Shaastra ID creation script added
varshaan 258b4f2
DTVP: Add blocks BSB and MSB to BLOCK_CHOICES
anantgirdhar 764a6d0
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
varshaan 7430f4c
Give team creation rights to hospi.
anantgirdhar d995f23
Fix template errors in hospi team creation rights.
anantgirdhar 27cc802
Give delete team members permission to hospi.
anantgirdhar 37e5ef7
Give leader access to hospi.
anantgirdhar 4f3953a
Fix leader removal allowed bug.
anantgirdhar 93144f9
Give team editing link to hospi.
anantgirdhar 2a1660d
Fix hospi home template formatting.
anantgirdhar 78f2386
Add hospi home button in team home.
anantgirdhar 5eef34d
Fix template syntx error in team home.
anantgirdhar 0531866
contact update
webopsShaastra ee83adc
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
varshaan bdcb7c2
Bill generation for hospi
varshaan 8dcbfc0
Search with email added to hospi
varshaan c950186
Participant PDFs: Save PDF to server.
anantgirdhar f512c75
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
anantgirdhar 2888e0a
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra c262123
Participant PDFs: PDF write issue fixed.
anantgirdhar dc91917
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra 5d241b7
Participant PDFs: Change linespacing.
anantgirdhar c652bcd
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra f2ddbaa
Participant PDFs: Test - Change drawString to Paragraph.
anantgirdhar 19eab2d
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
anantgirdhar b0ab1e3
Fix minor bug.
anantgirdhar bba39fc
Add image, QMS instructions.
anantgirdhar 692f9a0
Import Image
anantgirdhar 4b1ab7c
Import inch
anantgirdhar 99121d8
Fix pdf format.
anantgirdhar b7924ed
Fix image path.
webopsShaastra f1daa5a
Merge conflict resolved.
webopsShaastra d8528d8
Fix bug.
anantgirdhar 602f8eb
Fix variable error.
anantgirdhar 8ffa693
Fix attribute align name.
anantgirdhar 8e97441
Fix align.
anantgirdhar d256c6a
Fix formatting.
anantgirdhar bd6ec06
Fix formatting.
anantgirdhar 579981b
Fix formatting.
anantgirdhar 42a258f
Fix formatting.
anantgirdhar f2b1725
All pdfs.
anantgirdhar 805c2c1
Fix query.
anantgirdhar 2c8a180
Fix query.
anantgirdhar 843abd5
Fix profile errors.
anantgirdhar 0a00348
Fix profile errors.
anantgirdhar 49644ac
Fix profile errors.
anantgirdhar aa7d4f0
Final cleanup.
anantgirdhar bd20a70
Fix formatting.
anantgirdhar 71e3e93
Final formatting change.
webopsShaastra 488bfe9
Fix list out of range error.
webopsShaastra 4e09ade
Account creation modified
varshaan 950b23f
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
varshaan d3167ea
creating teams script added
srmanikandasriram 9bd9cef
team creation minor change
srmanikandasriram e26fa03
team creation final changes
srmanikandasriram 66d2eaa
Participant PDFs: Add mailer.
anantgirdhar 814f3a9
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
anantgirdhar cb05f13
Participant PDFs: Fix mail content.
anantgirdhar 5389712
Participant PDFs: Fix log message.
anantgirdhar d71455f
Participant PDFs: Fix log message.
anantgirdhar ecada0f
Participant PDFs: Title case name.
anantgirdhar 3cf9e10
Participant PDFs: Final test.
anantgirdhar 112bc43
Participant PDFs: Change filename to shaastra id.
anantgirdhar b2c874e
Participant PDFs: Add email check.
anantgirdhar e81fc73
Participant PDFs: Code cleanup.
anantgirdhar 476df9f
Participant PDFs: Add log feature.
anantgirdhar c20edce
Particpant PDFs: Fix log error.
anantgirdhar 4bbf56d
Participant PDFs: Finale.
anantgirdhar b4d5ca2
Participant PDFs: Disable main function.
webopsShaastra f634420
team creation completed
webopsShaastra a89de9f
removing event registration link from announcements
srmanikandasriram e706130
updated ticker
webopsShaastra 6caa4d6
ticker copied to events.html
srmanikandasriram 0e1a32f
Participant PDFs: Arrangements to mail rws and ssq participants.
anantgirdhar 8af866d
Participant PDFs: Remaining PDFs finale.
webopsShaastra 84ecb23
adding marquee hover effect
ac55c65
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
596c26f
minor changes
webopsShaastra d5c8c29
PDF changes
varshaan 702dc65
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
varshaan c5b3435
Fix hospi bill pdf generation.
anantgirdhar e9594bd
Bill Generation
varshaan 6d7e2f3
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra 5730821
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra af83e36
Url correction
webopsShaastra 26ca9a7
Redirect Add Room to home
varshaan 0b8e554
ControllRoom changes
varshaan 0eb470a
Added table in team bill
varshaan addf1a0
URL reset
varshaan 6b2d33b
Participant PDFs: Round two.
anantgirdhar f5bd12f
Participant PDFs: Fix Attribute Error.
anantgirdhar cf0febc
Participant PDFs: Update QMS instructions.
anantgirdhar 2507937
Participant PDFs: Data checker added.
anantgirdhar 79910e2
Participant PDFs: Fix TypeError.
anantgirdhar 7c1e475
Participant PDFs: Add event details listing.
anantgirdhar 6ff253d
Participant PDFs: Fix type.
anantgirdhar 0a1bf47
hospi create shaatra id modified
srmanikandasriram 1e3774b
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
srmanikandasriram 780aa28
Fix team leader not member issue.
anantgirdhar 04d10ab
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
anantgirdhar 3e7eeb6
search by barcode
srmanikandasriram fa82284
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
srmanikandasriram fba0745
prizes app added for barcode
srmanikandasriram 5e120b8
Participant PDFs: Round 2 Finale.
anantgirdhar 16914f4
barcode minor changes
webopsShaastra 5486269
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra 04c6ed8
barcode model changed
srmanikandasriram f1ce904
admin user profile editing feature added
srmanikandasriram 710044a
Participant PDFs: Round two final test.
anantgirdhar f6b7ea1
Participant PDFs: Fix TypeError.
anantgirdhar fdd9f68
Participant PDFs: Round 2 Finale.
anantgirdhar ec692f7
error messages added to edit profile searching
srmanikandasriram cb3cf21
team barcode searching
srmanikandasriram d5e65a7
Add CSV On spot regn.
anantgirdhar dc90f6d
CSV Table formatting.
anantgirdhar f541ef7
Fix merge conflicts.
anantgirdhar b4313b3
CSV: Fix barcode db writing.
anantgirdhar 396a951
Hospi Completion
varshaan 38f94e7
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
varshaan 47f3cab
Fix hospi home link formatting.
webopsShaastra 5a38992
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra 6f848d9
Room upload correction
varshaan d8a5fc4
comment link
varshaan 20c693b
CSV: Write to erp Participant.
anantgirdhar bcb5f9b
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
anantgirdhar 8e333d9
CSV: Fix field name error.
anantgirdhar 1cb7958
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
varshaan ac935c2
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
srmanikandasriram f5d4499
CSV: Add barcode check.
anantgirdhar 8780c0d
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
anantgirdhar 235f150
unknown action solved and college added to check in form
srmanikandasriram ca8d655
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
srmanikandasriram 4b533f2
team registration duplicate updated
srmanikandasriram 92a21e9
team re registration checked
srmanikandasriram 7d5db93
DTVP: Change venue unavailable error message to include event name.
anantgirdhar d4a4b60
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
anantgirdhar b8c797f
DTVP: Fix variable name typo.
anantgirdhar 648e0c5
DTVP: Change clash error message.
anantgirdhar 47ddf19
hospi minor changes
srmanikandasriram 325d237
Dajax error fixed
varshaan 3f83671
Merge errors fixed
webopsShaastra 90d9e71
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra 1dba917
URL
varshaan 395267c
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
varshaan 285b3b5
Multiple instances of same team member removed
varshaan de4f7c4
create team in hospi autopopulate
srmanikandasriram 5d8ad12
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
srmanikandasriram 84de266
member repeating error fixed
srmanikandasriram 19d111b
hospi vols
srmanikandasriram c8e58e8
last minute changes
webopsShaastra b7d3ac0
participant userprofile sync
srmanikandasriram 2ac55f9
userprofile
webopsShaastra 961c305
userprofile editing
srmanikandasriram 241ccf5
Participant PDFs: Check participants registered CSV.
anantgirdhar 9a1c675
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
anantgirdhar e4dc4ef
PPDFs: Fix integrity error issue.
anantgirdhar b95b591
PPDFs: Fix name error issue.
anantgirdhar 7fa56e2
PPDFs: Fix College issue.
anantgirdhar cc1d306
Fix NameError in events models.
anantgirdhar 754bfa1
PPDFs: cleanEmail function.
anantgirdhar 79e8cbd
PPDFs: Add email present check.
anantgirdhar b8ef293
edit profile
srmanikandasriram ce2c0d4
room no added to message in already checked in
srmanikandasriram d9b1ffa
individual re-allot
srmanikandasriram ae10868
unmerged changes
webopsShaastra 75cb204
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra c952857
room field autofill
srmanikandasriram 69b0f1e
Edit checked in person
varshaan 20d57a0
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
varshaan 8694404
URL resolved
varshaan a23b003
room editing if already filled
srmanikandasriram 53b02f5
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
srmanikandasriram 4639edb
Auto complete for team added
varshaan d15cd28
Undone changes
varshaan 1c92643
re-allot
srmanikandasriram 44ae0af
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
srmanikandasriram e2159c2
unmerged
webopsShaastra 6883bb8
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra 9b5a8d0
PPDFs: Add specific participant pdf mailer.
anantgirdhar da671b1
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
anantgirdhar be293ac
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra f979be0
Tejas Removed
varshaan e36e5c7
Tejas removed again
varshaan 8dade62
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra 214e60d
Spons removed
varshaan c60b677
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra 33a9dba
CSV changes
varshaan 9c0147d
CSV
webopsShaastra 218fca5
Merge branch 'events' of
webopsShaastra eba4c9b
College filter added
varshaan c813740
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra 67ad9c8
Username error corrected
varshaan 8126541
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra 8f1beab
Edits
varshaan ead6be4
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra 2e69427
Edits1
varshaan 3fcd3c3
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra 574b878
Edits again
varshaan 9df298a
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra 7e6f4b5
Userprofile error
varshaan ccfa917
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra a6931cb
Profile does not exist
varshaan fa385af
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra 4d61a6a
Fixing CSV
varshaan 20aea21
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra 407c236
CSV
varshaan 6b0ed53
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra bc46194
CSV
varshaan 0ed37cb
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra 37add45
CSv
varshaan c0e5700
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra a606904
CSV
varshaan 07bd494
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra ed78f72
CSV
varshaan 8a5cc9b
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra 2dcd082
CSV
varshaan 7a01d02
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra 2415e45
CSV
varshaan 23138aa
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra 8ea0151
CSV
varshaan 543dbe8
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra 036915c
Create Participant Certificate Generator.
anantgirdhar c04baa4
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
anantgirdhar 658062a
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra c342955
Make changes for final certificate mailing.
webopsShaastra File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1 @@ | ||
6th June, 12 | ||
Basic Tabs done. | ||
Please take care of the different settings that need for dajax to run. | ||
Dont use 'shaastra' as your project folder's name. Dajax was not accepting hyphens for some reason. My folder's name is 'shaastra'. | ||
If you have a different name please change 'Dajaxice.shaastra.events.<some_func>' to 'Dajaxice.<your_project_folder>.events.<some_func>' in all the templates. | ||
Dont forget to add AUTH_PROFILE_MODULE = 'events.UserProfile' to your local settings. | ||
|
||
9th June, 12 | ||
Tab files added. they have add, delete functionality. | ||
sending file uses ajax. rest can be done by dajax. | ||
Renaming files has to be done. | ||
|
||
15th June, 12 Renaming of files done | ||
|
||
16th June, Chosen-JQuery plugin implemented in the form for adding events. 'Tags' for events can now be added in a more presentable way. | ||
|
||
25th June, Coords can now add questionnares. He/She can choose to add an mcq or a subjective. After adding an mcq, he/she can add choices for it. editing/deleting of options/questions can be done. | ||
As suggested by Suraj, I have made some changes so that you dont need to name your project folder as 'shaastra'. I have added some lines to global_settings.py and added a file called context_processors.py. So in templates just use {{pro_dir}} instead of 'shaastra' now, and your folder name will get rendered there. Just add the following line as it is in your TEMPLATE_CONTEXT_PROCESSORS - "events.context_processors.project_dir_name". | ||
Shaastra 2013 Events |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Whitespaces.
groups = Group.objects.order_by('id').all()