arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity

Commit Graph

  • a55dd4b9be Implement additional materials download for fairs user dave 2010-01-28 19:05:35 +00:00
  • 7a2f4c0d3a 'notes' is in the user_sponsors table, not the users table. dave 2010-01-28 08:42:32 +00:00
  • cf62c55185 Remove redundancy dave 2010-01-28 08:34:35 +00:00
  • 56cbd2dba5 Remove redundancy dave 2010-01-28 08:34:33 +00:00
  • 95a28b4a29 Remove debug line dave 2010-01-28 00:13:42 +00:00
  • 9f9f2053df Properly upload the project and update the reg email dave 2010-01-28 00:12:43 +00:00
  • c8087c54c3 Fix a broken link dave 2010-01-27 20:40:54 +00:00
  • 68977533b2 And a missing space dave 2010-01-27 20:34:30 +00:00
  • ee855e5f67 Fix a missing i18n dave 2010-01-27 20:34:01 +00:00
  • 505e1a8c91 Overhaul the winners entry (add ajax, mutliple fair support, fairs loggin in and entering their own winners) dave 2010-01-27 20:24:19 +00:00
  • 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. dave 2010-01-27 20:24:17 +00:00
  • 7fc721b96f Add support for URLMAIN and URLLOGIN replacement in communications dave 2010-01-27 20:24:16 +00:00
  • 29b95e97ac Use the smarter name logic in admin/communicaiton.php for shorter code. Add URLMAIN, URLLOGIN to the communicaiton as options, still have to implement them. dave 2010-01-27 20:24:14 +00:00
  • f05b4ba677 Smarter user name logic dave 2010-01-27 20:24:13 +00:00
  • 2743d237a2 Fix spelling dave 2010-01-27 20:24:11 +00:00
  • c959257e79 Fix user_password dave 2010-01-27 20:24:10 +00:00
  • 908e4d51ba Use icons in the fair main, need to re-integrate the status checks somehow dave 2010-01-27 20:24:09 +00:00
  • e7afdccaaf Rename 'Science Fair Management' to 'Feeder/Upstream Fair Management' dave 2010-01-27 20:24:05 +00:00
  • 83cd22a57c Fix indentation dave 2010-01-24 06:47:19 +00:00
  • 547cb36a23 Fix the project editor for fairs dave 2010-01-24 06:47:17 +00:00
  • 436ac1ca7e Handle the fair role in the student editor. Restrict to load/save the fair. dave 2010-01-24 06:47:16 +00:00
  • d333175a7b Fix displaying lists for fairs dave 2010-01-24 06:47:14 +00:00
  • dc326ccf86 fix indentation in student_editor dave 2010-01-24 06:47:12 +00:00
  • 8b3cd2a289 Only show fair projects if a fair logs in and uses the reg list dave 2010-01-24 06:47:11 +00:00
  • ed6879754d Remember the page for password changes too, and take them there dave 2010-01-24 06:47:09 +00:00
  • 54fe3bf509 Make user_auth_required aceept and array and return the auth user type. If the user is required to login before visiting a page, remember the page, and take them to it once they login. dave 2010-01-24 06:47:06 +00:00
  • ff01502192 If there are no feeder fairs, dont let them choose any, infact, hide the option completely james 2010-01-22 19:56:59 +00:00
  • f695306f92 Add a "new project" feature. dave 2010-01-22 19:26:35 +00:00
  • 4739e3fdf0 Add a Registration tab to the student editor (regnum, fair, status) dave 2010-01-22 19:26:31 +00:00
  • eb2f9e769f Fix the custom judge report -its the only way to get div/cat/lang prefs, and the answers to judge questions james 2010-01-22 17:43:43 +00:00
  • 5676c39b54 Properly load ALL questions for a user, even if they don't have answer records for some of them james 2010-01-22 17:36:45 +00:00
  • 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 james 2010-01-22 04:03:02 +00:00
  • 41347c1934 Add missing file dave 2010-01-21 21:58:02 +00:00
  • ca8ff11d71 More IE7 fixes (extra commas!) james 2010-01-21 20:56:06 +00:00
  • 7a9ead99ea Fix registration list to work with IE7 james 2010-01-21 20:52:59 +00:00
  • b3db4fb5f6 Fix awards page to work with IE7 -- removed extraneous comma's at end of object/arrays james 2010-01-21 20:48:18 +00:00
  • 931c9603b3 Save first, then fix the title dave 2010-01-21 20:33:04 +00:00
  • 45587ee2f4 Fix the title dave 2010-01-21 20:33:03 +00:00
  • e53a7056e9 Change pointers to the stats list dave 2010-01-21 20:33:02 +00:00
  • 1f138e52ef Save the file before committing dave 2010-01-21 20:33:01 +00:00
  • 997b54e854 New ajax reg list, prevents reloading the list on edit. Move all the stats stuff out. dave 2010-01-21 20:32:59 +00:00
  • bc9bfde34f Turn student_editor.php into a set of ajax calls dave 2010-01-21 20:32:58 +00:00
  • b15ad9a7e0 Turn project_editor.php into ajax handlers dave 2010-01-21 20:32:57 +00:00
  • c463c13f01 - Tell the user if there are no stats dave 2010-01-21 20:32:54 +00:00
  • e20ff584cb Volunteer links should go to type=volunteer not type=sponsor! james 2010-01-20 20:30:59 +00:00
  • 3ebb655d08 Hmmm, add some missins stripslashes.. stupid fucking magic quotes james 2010-01-19 04:32:12 +00:00
  • de835bf5f5 Add some instructions to the judge divisions groupings page - nobody knows what the heck to do with jdiv groups james 2010-01-19 04:14:53 +00:00
  • 91cbf39f61 Use localized dates/times on judges pages james 2010-01-19 03:42:25 +00:00
  • 214df4ddbf Fix a bug where awards that didtn have a sponsor set didnt show up in the list, also, do the same for award types, though award types hsould never be empty... james 2010-01-19 03:29:29 +00:00
  • c67488d375 If availability is disabled, dont fail loading judges Fix the team languages array Fix the timeslots checks for schedulerconfig (need round AND timeslots, not just a round) james 2010-01-18 16:24:34 +00:00
  • 7e6795fd0d Since the previous bug where judge complete status was wrong, we need a chance to recalculate them all, so lets just do it here for now. james 2010-01-15 15:39:36 +00:00
  • 59da6152dd Properly detect complete status if special awards is turned off james 2010-01-15 15:20:11 +00:00
  • c729e0f8da Dont let the scheduler run if we have 0 judges available - timmins was in an endless loop since last nite james 2010-01-15 14:53:24 +00:00
  • e6b24ff0ab Remove the edit icon (you now click anywhere on the row) and fix disabling fields for non-downloaded awards (=0, not null) james 2010-01-14 18:55:23 +00:00
  • 3c364b84c6 oops forgot to commit the getUserForSponsor function! james 2010-01-14 18:34:33 +00:00
  • 9a44ff29e1 Add x-small as tshirt size james 2010-01-13 22:40:24 +00:00
  • 357263a20b Some extra debug info added while fixing northern bc james 2010-01-12 06:43:22 +00:00
  • 591f46b29d Properly count the number of judges in each language to check if we have enough james 2010-01-08 20:25:40 +00:00
  • d8ba3da289 Remove more debugging james 2010-01-05 18:02:24 +00:00
  • 35a247e225 remove debuging james 2010-01-05 17:59:10 +00:00
  • 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. james 2010-01-04 17:51:55 +00:00
  • 34d1c02c1d Fix broken install script - i hope james 2010-01-04 16:51:47 +00:00
  • a6a7d6ffe2 More invalid backslashes james 2009-12-16 19:11:00 +00:00
  • df0120dd0b Special chars the stock (so & converts to &) Add some newlines.. still trying to fix IE7... james 2009-12-16 18:49:53 +00:00
  • 3763f76ea9 Remove extra backslashes - trying to fix IE7.... james 2009-12-16 18:43:57 +00:00
  • b14b0eb356 Fix the dropdowns james 2009-12-16 18:12:28 +00:00
  • c204e0ccd2 - Make it clear that by selecting >1 judging timeslots, the committee expects the judge to be there for ALL timeslots. dave 2009-12-14 20:34:03 +00:00
  • 64a7a44ebe - Fix the judge question formatting too dave 2009-12-14 20:30:20 +00:00
  • 2e0fb0e26e Fix some formatting on the judge_other pagewq dave 2009-12-14 20:25:38 +00:00
  • c3ed887dca I think this fixes the query, at least temporarily, until we really fix the whole user/year system james 2009-12-04 17:22:55 +00:00
  • 8c5a0bd853 Dont do a save, or we get nested james 2009-12-03 23:32:13 +00:00
  • c962286321 Save committee member "complete" status james 2009-12-03 23:19:06 +00:00
  • 3da935eaff Switch fundraising dashboard to be ajax'ed and add the ability to mark thankyou's as done. james 2009-12-03 21:53:01 +00:00
  • 617723cdbe A few more common html entities to convert to text james 2009-12-03 21:13:31 +00:00
  • df3cd54701 Fix escaping on one-off emails james 2009-12-03 21:12:13 +00:00
  • 684a7962f2 Set the database charset in the UPDATE script so the conversions will actually work - that only took 8 hours to figure out! james 2009-12-03 20:55:16 +00:00
  • e51b7fc1b2 Move the email table updates to the PHP file, we need to fetch data, convert db, then update data james 2009-12-03 19:52:59 +00:00
  • cb9e783071 Oops name the function properly james 2009-12-03 19:43:18 +00:00
  • 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) james 2009-12-03 19:41:25 +00:00
  • 75e721bb81 Don't process basic UTF-8 Characters into HTML Entities, makes it impossible to obtain plain text version!! james 2009-12-03 19:16:37 +00:00
  • 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. james 2009-12-02 23:11:25 +00:00
  • 148bc61320 Don't need this file anymore :) james 2009-12-02 22:19:42 +00:00
  • 99114c7242 Completely convert the old communication module over to the new system... (almost). james 2009-12-02 22:17:20 +00:00
  • 06d9e74190 - Pull the science head user properly for the school table display. dave 2009-12-02 01:22:47 +00:00
  • e9e04ad944 Add a link to the status page from the main communication page, since it now has history as well james 2009-12-01 22:07:50 +00:00
  • 01b05576b5 Remove some debug james 2009-12-01 22:04:23 +00:00
  • 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 james 2009-12-01 22:02:03 +00:00
  • 0854c50f4e Allow to logout even if the session has already timed out james 2009-11-30 20:15:00 +00:00
  • fc394ba683 Fix the broken school rollover after the principal and science head change james 2009-11-30 19:10:14 +00:00
  • 078d8bdb0e Make config editor for themes work on sfiab.com james 2009-11-30 19:00:04 +00:00
  • 9bad26096d Tweak the avery 5162 template a bit, lines up perfectly now james 2009-11-30 18:46:48 +00:00
  • 785f5bbf35 Show display and save the "preferred language" field. james 2009-11-28 20:07:02 +00:00
  • 2e65273b97 Make the status on the judge other and judge expertise pages work. A few updates for consistency when embedded in the editor popup james 2009-11-26 19:09:37 +00:00
  • dbad8ae320 Update the status on save and on page load james 2009-11-26 18:29:03 +00:00
  • 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 james 2009-11-26 17:50:00 +00:00
  • 471d0f7d78 Fix broken 151 db update james 2009-11-13 21:25:40 +00:00
  • 6e1294cbba Fix a bug in the awards rollover! egads.. i wonder how many have run their rollover with this in place.. ugh... james 2009-11-13 21:20:14 +00:00
  • f06523ec74 Forgot a closedir() dave 2009-11-06 22:13:51 +00:00
  • 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. dave 2009-11-06 22:10:06 +00:00
  • 2adc23658f - Explain that option a bit more. dave 2009-11-06 09:00:02 +00:00