arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity
1,766 Commits 10 Branches 6 Tags 31 MiB
14308b5991
Commit Graph

160 Commits

Author SHA1 Message Date
james
14308b5991 Start of adding 'conferences' and ability to switch between running conferences 2010-06-03 19:21:27 +00:00
james
8d6d653567 Add a new date 'judge schedule available' to specify when judge assignments and schedules become available to judges. When the chief judge is playing with the scheduler he doesnt want to have judges thinkign they are assigned to their final teams/projects/timeslots, so only make them available to judges after this date has passed. 
The default (as always) maintains old behaviour, so if this date is not explicitly set, it'll always show the schedule
 2010-04-06 14:29:50 +00:00
james
2f38386967 set enable_stats to 'no' for YSO 2010-03-30 17:03:58 +00:00
dave
8ee1f36f90 TCPDF support library and label generation code that uses TCPDF. All 
other stuff still works, this only adds on.  And on second thought, I
should probably disable the report type that would let someone use this.
 2010-03-25 04:27:33 +00:00
dave
e9398f4895 UPdate code version 2010-03-02 22:50:51 +00:00
james
471b358f2f Aparently some emails use "webmaster@sfiab.ca" -- wipe that out as well to force them to set a proper from address or use the fair manager's email 2010-03-02 20:18:39 +00:00
dave
89547f902a Some fairs did a rollvoer before the NULL was fixed (I think it was 
fixed), and reset some award sources to 0 instead of NULL.
award_source_fairs_id can never be 0 anyway (unless someone edits the DB
manually), so just set them back to NULL so the existing code works.
 2010-02-22 18:45:57 +00:00
dave
15c9c5619a Database table for computing floor locations 2010-02-22 18:45:55 +00:00
james
74905273cc If anyones emails are still set to come from 'website@sfiab.ca' wipe that out, which will force it to default to the fair manager's email address when sending - we dont want anything coming from that address! 2010-02-18 16:13:36 +00:00
james
9499418eea Remove config->external award sources from CONFIG 
Remove award_sources table from database
Rename STO->YSO and YSF->YSC
 2010-02-12 16:48:45 +00:00
james
d8375c0c5f Add ability to cancel emails in the queue to be sent 2010-02-11 15:58:26 +00:00
james
5dcbc28d54 Fix email sending to not fail if a single email fails, instead, flag it as failed and continue on 
Better track email sending as well, and add fields for tracking bounces (not implemented yet)
 2010-02-10 17:05:49 +00:00
dave
faa3742bda Support Highest, High, Indiffernt (short and long), and expertise 5,4,3 
(short and long) all with the same two functions.
 2010-02-04 17:55:07 +00:00
james
fd4e72e1f4 Fix judge invite only text on user_new to actually show up 2010-02-03 00:30:24 +00:00
dave
5c8bbe16b6 Remove the typepref selection, it turned into 
users_judge.special_award_only.
 2010-02-02 17:48:59 +00:00
dave
7d611e531f Add a 'per_fair' option to the awards, so an award can be treated as a 
separate award for each feeder fair, allowing the maximum prize
assignments from each fair.
 2010-01-27 20:24:17 +00:00
james
522ea8206d Change projects.projectdivisions_id and project.projectcategories_id from TINYINT to INT so they match what is allowed in the division and category configuration 2010-01-22 04:03:02 +00:00
james
fde1debf6d COnversion script to convert all emails to UTF8, but still display properly on the site by back-encoding them to ISO-8859-1 (until such a time that we can switch the entire system to UTF8) 2009-12-03 19:41:25 +00:00
james
99114c7242 Completely convert the old communication module over to the new system... (almost). 
TODO: switch the "send" to the new dialog-style preview and confirmation, instead of the old one, but at least it works!
 2009-12-02 22:17:20 +00:00
james
838f61a948 Working email sending from fundraising module, and implement new emailqueue system. None of the existing emails are migrated to the new system yet, and both old and new work in parallel until we can finish migration 2009-12-01 22:02:03 +00:00
james
d954d148d6 Add all the missing judge registration fields, and let them be configurable. 
Notify user if invalid regexp's are entered in fields (there was no feedback as to why it wasnt saving!)
Also make the space in the postalcode optional

FIXME: still need to change the "incomplete" to "complete" message once everything is saved properly, it stays as incomplete right now until they navigate away and come back.
 2009-11-26 17:50:00 +00:00
dave
f67b485d6d - Separate the icons out of the colour themes 
- Detect the theme directories and use dropdown boxes to select the theme and theme_icons, so no one can type in random stuff and screw their sfiab.
- Add 2 missing icons.
 2009-11-06 22:10:06 +00:00
james
e58ce49aed - These are fair-specific now, dont' need them as config options. 2009-11-06 02:11:58 +00:00
james
101c3c7723 Check if they are alreayd a parent and dont re-add if they are 
Also fix levengshtein distances for mere and pere with UTF8
 2009-10-22 20:31:52 +00:00
james
ac3f5f9eb4 Add todo list for receipts and database to track receipts 2009-10-20 19:09:54 +00:00
dave
7c6e52c8ef update the db code version too 2009-10-16 17:18:10 +00:00
james
663420b078 All of tonights wackload of changes 2009-10-11 03:32:14 +00:00
james
ff9d802b6e Database updates 2009-10-08 19:20:07 +00:00
jacob
a4d4cc11cc Updated fundraising_campaigns table to use "fundraising_goal" field instead of "fundraising_goal_id" 2009-10-06 20:49:37 +00:00
james
cf2affcc03 Update default fundraising goals, and insert defaults if none exist 2009-10-06 19:04:45 +00:00
james
01fde584be Do a lot of database re-working, renaming and reorganization 
Database now refers to everything by donor/donation .. and apparently just as i complete this, carolyn has decided to go to both donor/sponsor instead of just donor.. ugh..
 2009-10-02 16:46:13 +00:00
james
3974636d1c DB update for donors add new fundraising main page 2009-10-01 16:52:36 +00:00
dave
9b1ea927e6 - Delete sponsor_confirmed entries from reports (it's in one system report), 
that field doesn't exist anymore.
 2009-09-27 02:55:08 +00:00
dave
0f31f72f07 - Add two more fields: 
- additional_materials: if there are additional materials required if a fair assigns a winner to this award.
	- register_winners: to tell the feeder fair that this award is for winners who will participate at the upstream fair
 2009-09-25 04:29:41 +00:00
dave
97c489646e - Turn the uploader into a popup window 
- Add the ability to select category/division mappings specific for each upstream server
- Add some auto-determining code if the cat/div mappings don't exist
 2009-09-23 05:53:33 +00:00
dave
5ec38a7314 - Server-side award uploading. Tag registrations, proejcts, and students with 
a fair_id.  This is ignored for regular operation, but now needed to have
  multiple students from multiple feeder fairs attached to the same award. (so
  we know which ones to delete when we update the winners)
 2009-09-21 07:20:49 +00:00
dave
ed04710018 - Rename YSF to YSC 
- Add the help websites we lost somewhere for STO and YSC
- Copy the $config ysf login data into the fairs data
 2009-09-19 06:12:48 +00:00
james
98755a5e4a Make sponsorships table able to handle either an organization sponsor (linked to sponsors) or an individual sponsor (linked to users) 2009-09-18 15:12:10 +00:00
dave
7a2e0b2b7e - Add a feeder fair statisics report type and report 2009-09-18 05:35:13 +00:00
dave
6bd4d03941 - Selection screen to select what stats to download from feeder fairs 2009-09-17 07:00:09 +00:00
dave
e9d3d4ce03 - Database update for feeder fair award info 
- Load/Save feeder fair awards in the award editor
- Fix all the POSTs in the award editor.   .load automatically does a POST if
  the data is an array, so we need to call .serializeArray() when we want a
  post to happen.
 2009-09-13 07:08:12 +00:00
james
183531ada0 Fix 131 2009-09-09 02:38:57 +00:00
james
f963dbf276 Merge all changes from branch r1284:1498 into trunk 2009-09-09 00:26:12 +00:00
james
f569ed3e13 Fix Quebec province translation so its country code is properly set. 2008-10-06 18:50:18 +00:00
dave
f8f9964fba - Non-invasive commit, ground work for moving judges to the user backend. 2008-09-15 03:51:52 +00:00
james
9995867f1d Add countries table and populate 
Add countries_code field to provinces table and fix canadian provinces
Populate US States into provinces table
Add config option to Localization tab to enter a 2 letter country code (how to lookuup from countries table?!)
Update emit_province_selector to use country config entry
 2008-08-28 21:41:31 +00:00
james
d5ff3be6b9 Use page text description instead of the database page text name on the page text editor list. (BUG 198) 2008-08-26 21:06:05 +00:00
james
7e84ab0222 Add cms table, and move the 'index' pagetext to cms 
Add .htaccess rules for the cms
Add cms page display code and convert index.php to pull from the cms
If no page title is passed to send_header(), output the fair name in the <title> tag
 2008-08-19 21:13:29 +00:00
james
3d33d976c3 Create a Localization Category for config variables, and move the Province/State, Postal/Zip there 
Add new config variables for dateformat and timeformat
 2008-08-18 21:33:30 +00:00
james
fca09d86c0 Update the database to store the page texts in multiple languages 2008-08-18 21:09:12 +00:00