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

1537 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
james
3f94324aba JOIN instead of LEFT JOIN on committee members link, incase a member has been deleted we dont want a blank record.. 
though.. if they have been deleted we should probably delete the link.. hmmm.. well.. this will hide it for now.
 2010-01-04 17:51:55 +00:00
james
34d1c02c1d Fix broken install script - i hope 2010-01-04 16:51:47 +00:00
james
a6a7d6ffe2 More invalid backslashes 2009-12-16 19:11:00 +00:00
james
df0120dd0b Special chars the stock (so & converts to &) 
Add some newlines.. still trying to fix IE7...
 2009-12-16 18:49:53 +00:00
james
3763f76ea9 Remove extra backslashes - trying to fix IE7.... 2009-12-16 18:43:57 +00:00
james
b14b0eb356 Fix the dropdowns 2009-12-16 18:12:28 +00:00
dave
c204e0ccd2 - Make it clear that by selecting >1 judging timeslots, the committee expects the judge to be there for ALL timeslots. 2009-12-14 20:34:03 +00:00
dave
64a7a44ebe - Fix the judge question formatting too 2009-12-14 20:30:20 +00:00
dave
2e0fb0e26e Fix some formatting on the judge_other pagewq 2009-12-14 20:25:38 +00:00
james
c3ed887dca I think this fixes the query, at least temporarily, until we really fix the whole user/year system 2009-12-04 17:22:55 +00:00
james
8c5a0bd853 Dont do a save, or we get nested 2009-12-03 23:32:13 +00:00
james
c962286321 Save committee member "complete" status 2009-12-03 23:19:06 +00:00
james
3da935eaff Switch fundraising dashboard to be ajax'ed and add the ability to mark thankyou's as done. 2009-12-03 21:53:01 +00:00
james
617723cdbe A few more common html entities to convert to text 2009-12-03 21:13:31 +00:00
james
df3cd54701 Fix escaping on one-off emails 2009-12-03 21:12:13 +00:00
james
684a7962f2 Set the database charset in the UPDATE script so the conversions will actually work - that only took 8 hours to figure out! 2009-12-03 20:55:16 +00:00
james
e51b7fc1b2 Move the email table updates to the PHP file, we need to fetch data, convert db, then update data 2009-12-03 19:52:59 +00:00
james
cb9e783071 Oops name the function properly 2009-12-03 19:43:18 +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
75e721bb81 Don't process basic UTF-8 Characters into HTML Entities, makes it impossible to obtain plain text version!! 2009-12-03 19:16:37 +00:00
james
c0f6031904 FCKEditor always does UTF8, so force the Rmail encoding into that 
Also calculate the email TEXT from the email HTML, its not perfect but pretty darn good.

TODO: need to do an update script that converts the encoding of ALL existing emails in the databse from ISO-8859-1 to UTF-8
DO NOT UPDATE TO THIS VERSION UNTIL I CAN ADD THAT CONVERSION SCRIPT
 2009-12-02 23:11:25 +00:00
james
148bc61320 Don't need this file anymore :) 2009-12-02 22:19:42 +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
dave
06d9e74190 - Pull the science head user properly for the school table display. 2009-12-02 01:22:47 +00:00
james
e9e04ad944 Add a link to the status page from the main communication page, since it now has history as well 2009-12-01 22:07:50 +00:00
james
01b05576b5 Remove some debug 2009-12-01 22:04:23 +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
0854c50f4e Allow to logout even if the session has already timed out 2009-11-30 20:15:00 +00:00
james
fc394ba683 Fix the broken school rollover after the principal and science head change 2009-11-30 19:10:14 +00:00
james
078d8bdb0e Make config editor for themes work on sfiab.com 2009-11-30 19:00:04 +00:00
james
9bad26096d Tweak the avery 5162 template a bit, lines up perfectly now 2009-11-30 18:46:48 +00:00
james
785f5bbf35 Show display and save the "preferred language" field. 2009-11-28 20:07:02 +00:00
james
2e65273b97 Make the status on the judge other and judge expertise pages work. 
A few updates for consistency when embedded in the editor popup
 2009-11-26 19:09:37 +00:00
james
dbad8ae320 Update the status on save and on page load 2009-11-26 18:29: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
james
471d0f7d78 Fix broken 151 db update 2009-11-13 21:25:40 +00:00
james
6e1294cbba Fix a bug in the awards rollover! egads.. i wonder how many have run their rollover with this in place.. ugh... 2009-11-13 21:20:14 +00:00
dave
f06523ec74 Forgot a closedir() 2009-11-06 22:13:51 +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
dave
2adc23658f - Explain that option a bit more. 2009-11-06 09:00:02 +00:00
dave
bf3485c24a - Add an advanced options tab to the report generator 
- Add an advanced option: Include Incompelete Registrations - Ignores the
  registrations.status and just includes everyone.  Downside: registrations
  must have a division and category selected because the mysql query matches on
  cat.year and div.year too.
 2009-11-06 08:57:13 +00:00
dave
ba808050d0 - Use the report generator dialog all the time 2009-11-06 08:24:54 +00:00
dave
3bead26bf8 - This is important for the last commit 2009-11-06 08:24:31 +00:00
dave
c9de622b6c - Move the jquery-ui-custom from start/ into the toplevel theme dir 
- Add a classic theme.  My committee doesn't like the new wild and crazy default colours.
- Delete old files.
 2009-11-06 08:20:57 +00:00
james
62fc1a9cb2 - Add stats to the user editor window 
- Go right to the fair editor from the Admin panel.
 2009-11-06 07:32:51 +00:00
james
2de42b9377 Dont' change the font size on the my reports list, it's small enough now. 2009-11-06 04:26:30 +00:00
james
e17c1a6162 - Fair statistics on the server-side SFAIB. For feeder fairs that don't use sfiab or can't upload stats automatically. 2009-11-06 04:07:12 +00:00
james
81a9d3ecfd Don't send back the username 2009-11-06 02:24:38 +00:00
james
cb7033f7ae Fix fair login for remote commands 2009-11-06 02:24:04 +00:00
james
e58ce49aed - These are fair-specific now, dont' need them as config options. 2009-11-06 02:11:58 +00:00