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

Commit Graph

  • 4cba8caa3c enter salutations using a textfield, not a dropdown. justin 2010-07-11 13:52:28 +00:00
  • 343f0f8acd fix spelling error justin 2010-07-11 02:27:00 +00:00
  • 2563f8295e Fixes for bugs 418 and 412 - when editing awards, the list now gets refreshed upon update - increased size of donors notes fields jacob 2010-07-09 21:54:06 +00:00
  • 5956a15754 Final UI changes for the day.... james 2010-07-09 20:35:05 +00:00
  • 39c8d90d1e More UI changes james 2010-07-09 20:25:31 +00:00
  • 5321de365f More UI recommendations james 2010-07-09 19:24:04 +00:00
  • fe5b170371 Re-arrange some stuff as per new UI specs james 2010-07-09 19:04:25 +00:00
  • b09257b47e Bug #427 asterisks added on judge expertise fields (required fields) jacob 2010-07-09 18:36:30 +00:00
  • 2aa8e3805a quick patch jacob 2010-07-06 17:50:52 +00:00
  • 342dbe6cad Oops - correcting a query jacob 2010-07-06 15:47:27 +00:00
  • 887610f5e3 Added script for copying/converting user data into the new format, populating the accounts and user_roles table Modified user.inc and user_login to handle authentication on the new accounts table jacob 2010-07-06 15:32:26 +00:00
  • 75c806bf7e temporarily set the fairyear in install3 so user_create works? james 2010-07-05 20:36:40 +00:00
  • 548ebf24db Updates and cleanups to the installer james 2010-07-05 19:37:24 +00:00
  • 16c5e8ecc9 Switch back to CSS layout james 2010-06-28 18:00:47 +00:00
  • 07f76fdac8 Addded a pendingemail field to the accounts table jacob 2010-06-24 14:45:51 +00:00
  • c086e7e0bb refactor config into config & super pages, 'config' page is now 'conference config' specifically for the conference, all non-conference related tasks are moved to the superuser page james 2010-06-23 21:18:06 +00:00
  • 1743beb14e Populating the roles table, add "superuser" field to the accounts table jacob 2010-06-23 20:45:12 +00:00
  • 41ca527d20 Use proper fieldname conventions james 2010-06-23 19:58:33 +00:00
  • 55b5080575 Added new databases for user/role management jacob 2010-06-23 19:45:33 +00:00
  • 4faa4b8dc4 Migrate all dates to use conferences ONLY, instead of dual conference/FAIRYEAR setup james 2010-06-23 16:06:01 +00:00
  • 24c80b1654 Disabled deleting teams if they're registered for events jacob 2010-06-23 15:52:27 +00:00
  • dc63df156c Fix SQL Injection and XSS vulnerability - woohoo our first 0-day exploit! http://inj3ct0r.com/exploits/12613 http://packetstorm.linuxsecurity.com/1006-exploits/fairinabox-sqlxss.txt james 2010-06-23 05:07:57 +00:00
  • b7f3274543 Massive overhaul of the configuration variables - split into system variables and conference variables - rely on conference_id instead of year james 2010-06-22 21:32:03 +00:00
  • b3448b7c7c updated to delete links between schedule registrations and users when a schedule registration is deleted jacob 2010-06-22 19:35:36 +00:00
  • 00716cd84d layout tweaks jacob 2010-06-22 17:14:23 +00:00
  • c699135bce Added some last tidbits to the UI for selecting team members at a specific event Added functionality in listSelector.js to validate data when it's switched from one list to another jacob 2010-06-22 16:56:47 +00:00
  • 964a855275 DB table for linking users to teams in events jacob 2010-06-22 14:53:08 +00:00
  • 54f6a2e251 Created a javascript "listSelector" class that can be used to select a list of items from an existing list. Added a form in schoolschedule.php which uses that class to select students on a team jacob 2010-06-21 22:06:18 +00:00
  • e02e5ba687 Remove a bunch of conferenceid=0 checks -- we now always have a conference id james 2010-06-17 21:14:00 +00:00
  • 4f65058f59 Migrate config options theme and theme_icons from Global(FAIRYEAR) to Special(no fair year associated) james 2010-06-17 20:56:03 +00:00
  • 7cb1f55a3e updates on the student list editor for teachers jacob 2010-06-17 20:22:18 +00:00
  • 6c4a54fe94 Create science fair conferences for all past years that the system knows about Also add a temporary year field to the conferences table, to make migration easier (easier to find a conference id for a given science fair year) james 2010-06-17 20:03:45 +00:00
  • 054c62dfa8 Couple small tweaks - science olympics event rename to science olympics activity, sort events by eventtype first james 2010-06-17 19:31:50 +00:00
  • d45ababbbb Dont insert blank events into the schedule james 2010-06-17 16:07:27 +00:00
  • e1ef58f988 Oops fix my missing semicolon now james 2010-06-17 15:14:36 +00:00
  • 13bc1b3d9a D'OH jacob 2010-06-17 15:11:59 +00:00
  • 970ac57f21 syntax error in the earlier version jacob 2010-06-17 15:11:04 +00:00
  • 56b5e8269a add defaults for min/max team size and number of teams to each event pull those defaults when creating a new scheduled event show registered teams when viewing an event as an admin james 2010-06-17 15:06:11 +00:00
  • f1a43a9cec DB updates that I forgot to include with my last commit jacob 2010-06-17 14:02:30 +00:00
  • 0503030a35 Updates for managing students jacob 2010-06-16 21:33:43 +00:00
  • 6ea88362e8 Only allow registration for science olympic events james 2010-06-16 18:14:44 +00:00
  • dad86ce72b Only show teams for the current conference now that teams have a conference :) james 2010-06-16 17:57:51 +00:00
  • 4c56a33d7c s/School Access/School Home james 2010-06-16 17:50:12 +00:00
  • 8e8f9f7c3b Fixed a stray quotation mark that broke a query jacob 2010-06-16 17:45:13 +00:00
  • bbf46aa47f Don't let admin remove scheduled events if they have teams registered james 2010-06-16 17:09:42 +00:00
  • dd230b2cdf Show registered teams on admin schedule Move more stuff to common include james 2010-06-16 16:15:17 +00:00
  • 7e749f0295 Added conferences_id to the so_teams table and updated corresponding code accordingly Partially implemented student manager under school dashboard for science olypmics jacob 2010-06-16 15:16:25 +00:00
  • 7ca5edc2a1 Show team registrations on the schedule view for teachers james 2010-06-15 22:01:09 +00:00
  • a4ea7f6b1e Move some common schedule functions out Properly show current capacity in schedule view james 2010-06-15 21:52:03 +00:00
  • e5d9460d73 Add schedule view for school access, allow schools to register teams for events james 2010-06-15 21:43:21 +00:00
  • 41efbd89b0 Renamed manage_teams.php to schoolteams.php for consistency Started adding a page for the school to modify students under SOIAB jacob 2010-06-15 18:14:01 +00:00
  • ebe9f4b522 Separated the school access pages into separate documents jacob 2010-06-15 16:57:50 +00:00
  • 3b0ad48451 Fix crumbtrails james 2010-06-15 15:44:25 +00:00
  • 1fa7139482 Add a title field and default it to the event name (lets them do things like "Compound Boggle #1" and "Compound Boggle #2" Add max team capacity editor and numbers to display james 2010-06-14 20:37:31 +00:00
  • 76652861d4 Added conference filter to event location editor jacob 2010-06-14 20:12:54 +00:00
  • c9ebee5c10 Forgot to update the code version on my last commit jacob 2010-06-14 19:44:49 +00:00
  • f090e957c6 Modified events table to filter properly by event and handle URLs properly Slight change in tableeditor to allow it to properly filter a value of zero (not treating it as null) jacob 2010-06-14 19:43:10 +00:00
  • e98ec8751b add event types schedule shows event types in different colours add tabs to schedule editor windor for each event type forward port ENUM changes to tableeditor fix bug in emit_minute_selector james 2010-06-14 19:25:49 +00:00
  • f116d9c5fc Added team management for SOIAB. Minor typo correction in conferences.php jacob 2010-06-14 18:30:39 +00:00
  • bd7e107c0e Again :p james 2010-06-14 16:58:58 +00:00
  • 3b7d24c823 Adjust the schedule default start/end times james 2010-06-14 16:58:33 +00:00
  • 7e4a3af95d Put back int judges -- we'll need them for science olympics yet - but in a different capacity james 2010-06-14 16:57:16 +00:00
  • 23142cf01a Hide events that are not in the time frame defined by the schedule james 2010-06-14 16:20:25 +00:00
  • 49f127dbd1 Properly set the width of each event when its placed on the schedule based on the size of the table cell its going into, and re-place all the events on window.resize :) james 2010-06-11 20:39:29 +00:00
  • 76f1a79fe7 Oops, remove teh database name from the db update on create table james 2010-06-11 20:27:53 +00:00
  • d7be4a15dc Oops commit the missing file :) james 2010-06-11 20:20:46 +00:00
  • a928b97396 Add a fixme to deleting events from the schedule to make sure we dont forget :) james 2010-06-11 20:08:27 +00:00
  • badea469f6 Switch hour and minute in the editor to dropdowns Fix passing extra parameters to emit_hour_selector Allow emit_minute_selector to work with different minute intervals james 2010-06-11 20:04:51 +00:00
  • 4edd9baad3 Working schedule event editor for adding, editing and removing events from the schedule. james 2010-06-11 19:36:50 +00:00
  • 80fc39bf7f Implement start hour and end hour for schedule view Implement event duration height calculations james 2010-06-11 15:55:16 +00:00
  • 44fd9bea1f Added function for saving submitted settings when science fair/olympic inclusion is chosen jacob 2010-06-11 14:48:29 +00:00
  • 7d38b43cfc school management partially updated jacob 2010-06-10 22:10:20 +00:00
  • 5b7f7dca00 add specific character encoding jacob 2010-06-10 20:37:49 +00:00
  • 56ce08201a Add schedule database james 2010-06-10 20:37:11 +00:00
  • df3af58ffa Place already scheduled events on the schedule table, still doesnt do duration, messing with the stupid arrays now... gotta go james 2010-06-10 20:35:02 +00:00
  • 4b95aebe8f Added an event editor jacob 2010-06-10 19:50:49 +00:00
  • 6a24618359 Event scheduling start - shows times and locations and lets you click about in the table james 2010-06-10 19:40:50 +00:00
  • ba20d1b974 Move session stuff up so it can be set before its used to determine the conference james 2010-06-10 19:40:20 +00:00
  • e0efe11f03 Added a command at the end to switch the character encoding for the entire database jacob 2010-06-10 19:09:00 +00:00
  • 78e311322c Set the record type and default sort james 2010-06-10 18:45:38 +00:00
  • 0938342569 Always create new tables with UTF8 james 2010-06-10 18:36:10 +00:00
  • 558a724e0e correcting field name jacob 2010-06-10 18:25:26 +00:00
  • dab613b746 Added locations table and editor jacob 2010-06-10 18:09:16 +00:00
  • 122248a03c Move the conference block above the configuration/dates loading, so we can load the right dates for the conference (and probably soon, the right configuration variables too!) james 2010-06-10 17:58:27 +00:00
  • c44068929a Somehow the "exit" got remarked from the top of populate_fake. Unremarked it. jacob 2010-06-10 16:13:19 +00:00
  • 6ab03749f5 Rework admin page for science olympics Add stubs for events & scheduling and event locations james 2010-06-09 20:40:04 +00:00
  • 86a43e909a Implement conference specific logos james 2010-06-09 20:24:52 +00:00
  • 703cc18425 Make JPG files using GD so it handles transaprency, but keep making the GIF/PNG's from convert binary james 2010-06-09 19:23:27 +00:00
  • d1c607f575 New TCPDF signature page dave 2010-06-09 17:05:21 +00:00
  • fa56770b8a Recommit 175 FULL due to missing 174 php james 2010-06-09 16:51:49 +00:00
  • 6049ce9edb Missing file, that's why it wasn't converting properly dave 2010-06-09 16:45:51 +00:00
  • fbba2e7e20 Needed to add a "no" value to the "deleted" field when creating a new user james 2010-06-09 16:14:01 +00:00
  • 4c9692682a added a line for catching "set" field type in the character set update created a full database dump in UTF-8 encoding for installer james 2010-06-09 15:41:50 +00:00
  • 4799b4ffd8 Add back the UTF8 database set names call, and switch all emails to use UTF8 encoding james 2010-06-09 15:14:41 +00:00
  • d5ed8a1fc4 Modified version of update 173 to handle special windows characters james 2010-06-09 15:11:14 +00:00
  • cb51fef47d Name column consistently dave 2010-06-09 07:44:02 +00:00
  • 0567451a58 Implement fair name/logo as fields in a report instead of special options. This way, the logo/fairname can be moved around and resized. Ensure those fields exist in each report. Convert name/logo preferences in all existing reports, and adjust the yloc/height of existing fields to make way for the headers if they exist. dave 2010-06-09 07:43:59 +00:00
  • a46cb110ca Add logo and fairname to labels (still doesn't scale the contents of the label). dave 2010-06-09 05:21:42 +00:00
  • 76e8f8c3e2 Convert everythign to millimeters dave 2010-06-09 05:21:40 +00:00
  • f1082a1c40 Add TABLOID to tcpdf dave 2010-06-09 05:21:38 +00:00