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

Commit Graph

  • c3cf698524 Updates converting from year to conference id. jacob 2010-11-03 17:18:02 +0000
  • 54070f1836 Several updates on migrating from fair years to conference id's jacob 2010-11-02 20:35:47 +0000
  • 1c1a0673c3 Adding conferences_id to the last two tables that need it jacob 2010-11-02 16:24:04 +0000
  • 89475dae93 A quick function update jacob 2010-11-01 21:51:27 +0000
  • e4d94ffca2 Updated the communication queries in communication.inc.php to use the conferences system rather than fair years. jacob 2010-11-01 21:23:17 +0000
  • 5e0886c812 Minor correction jacob 2010-11-01 17:21:58 +0000
  • ca0e700952 More conversions from fair year to conference id jacob 2010-11-01 17:14:42 +0000
  • d8df2be109 Quick patch on my last commit. jacob 2010-11-01 15:28:51 +0000
  • 21261a99af Many updates of queries, switching from usage of FAIRYEAR to conference_id. jacob 2010-11-01 15:24:59 +0000
  • 4f35702bbf Added API function for modifying account information jacob 2010-10-28 21:22:12 +0000
  • d0d3c7b7c4 Separated the functionality of school selection from the pages, implemented it in the API jacob 2010-10-27 16:40:17 +0000
  • f1b9123835 Added a couple of field descriptions in the user fields jacob 2010-10-26 19:38:08 +0000
  • 92d46976f7 Separating judging timeslot selection into the user object jacob 2010-10-26 18:15:04 +0000
  • 0bcd811101 Fix passing in role list by ids james 2010-10-25 23:58:48 +0000
  • 3971df267f Add registration field roles to testapi.php page Fix char(2) field detection james 2010-10-25 23:55:38 +0000
  • 19e146547f Fix api registration fields when roles ar epassed in roles can be passed in as array of ids or array of types james 2010-10-25 23:12:35 +0000
  • bb40bf4da1 Updated the user_load and user_save functions to handle judges special awards selection. Updated judge_special_awards.php to use that method rather than direct SQL queries. jacob 2010-10-25 18:07:55 +0000
  • 7625c2e309 User settings touch-ups jacob 2010-10-22 21:17:25 +0000
  • cee52c6b67 Updated function for getting user info structure. Used it in the user_load function. jacob 2010-10-22 18:43:17 +0000
  • a5887bdf96 Oops fix the docs james 2010-10-22 15:12:45 +0000
  • a035a6f8e3 Add registration/fields API Fix $roles array use colliding with global $roles array ($roles should never be used anywhere! its a master list of all of the roles set in the bootstrap!) james 2010-10-22 15:06:49 +0000
  • bae700dead Starting on code for getting relevant field descriptions for user data depending on the roles for that user. jacob 2010-10-21 21:56:09 +0000
  • 3867b9b539 Fixes on the modified user_load function jacob 2010-10-21 16:08:41 +0000
  • b9bcb127a6 Updated these tables to include the conference id: award_awards award_prizes award_types award_awards_projectcategories award_awards_projectdivisions winners students projects registrations jacob 2010-10-20 21:58:26 +0000
  • 78bf0c8751 Modified user_load to load only fields relevant to the roles that the user has jacob 2010-10-20 19:44:18 +0000
  • a792b763a1 remove username from the standard user fields add 'required_fields' array to the user object so the API users know which fields are needed james 2010-10-20 17:25:43 +0000
  • c367656d02 also load committee whether its active or not james 2010-10-15 01:46:53 +0000
  • ab068fdfbb Fix updateSessionRoles once and for all james 2010-10-15 01:31:07 +0000
  • 759ecc0a1a Oops its user_load not users_load james 2010-10-14 23:06:21 +0000
  • f225787e39 Properly update the session roles from the API side Allow (u) to be empty if we dont have it, we can get it from the session users_id james 2010-10-14 20:38:48 +0000
  • 241618c74f Fix saving active/deactive roles Fix the session roles when roles are modified and only put 'active' ones into the session roles array james 2010-10-14 20:31:10 +0000
  • ba793ac8e0 Fix rolestasks saving of the level for each item Fix tableeditor css to only modify anything in the tableeditor/tableview classes Fix saving language for volunteers Fix error message for saving phone numbers on organization and personal Fix schoolfeedback and schoolinfo pages Update school select tab, better html and school options list Fix css for tertiary menu to show difference between selected and non-selected james 2010-10-14 19:42:20 +0000
  • 01d70abf74 Added teacher interface in olympics UI touch ups jacob 2010-10-14 17:51:56 +0000
  • 4a3ea7dba9 Changed the scienceolympic judge settings to a generic activity selection tab (replacing so_judge_other.php with activities.php) Altered use of schedule_users_availability_link. It no longer distinguishes by role. jacob 2010-10-14 15:26:47 +0000
  • e55a6f901a fix schedule display boxes to be the same for FF/IE/Chrome Add min/max judges/volunteers/teams Add defaults Update science olympic tab display Add Teams/Volunteers/Judges status to admin schedule view james 2010-10-14 15:11:52 +0000
  • 2b4b42c250 Dont make jquery elements bigger, it messes stuff up! james 2010-10-14 14:31:16 +0000
  • 8e4306ae3b Updated volunteer preferences to work with the new interface and with the new conference id system jacob 2010-10-14 14:10:49 +0000
  • 9229b1665b Added user settings config for science olympic judges jacob 2010-10-13 21:01:01 +0000
  • 941b5e127f Quick correction on automatic e-mail jacob 2010-10-12 18:00:17 +0000
  • f0d1578ac3 Added generic "account" password recovery jacob 2010-10-12 16:49:38 +0000
  • 607834bc0e updating _SESSION when user roles are modified jacob 2010-10-08 20:28:56 +0000
  • 7d5f5cccd0 Removed some usage of old user functions. Added role handling in testapi.php jacob 2010-10-08 18:43:20 +0000
  • 835047f3a8 Role functions debugged in account.inc.php, using them in user_main.php and user.inc.php jacob 2010-10-08 16:07:07 +0000
  • 177f49f805 moving code for modifying user roles into accounts.inc.php. Incomplete. Broken. jacob 2010-10-07 22:02:45 +0000
  • fce116316e Implement the role/* functions james 2010-10-06 21:01:17 +0000
  • 98dcfd6399 added some skeletal function stubs jacob 2010-10-06 20:01:15 +0000
  • daa714e5ef Added functionality in the main page for managing roles jacob 2010-10-06 17:05:54 +0000
  • 052024b6d6 Updates for letting users register in roles. Incomplete jacob 2010-10-05 21:46:29 +0000
  • e590c94690 Fix api for categories (projectcategories_load wouldnt have ever worked!) james 2010-10-05 20:24:43 +0000
  • 4ddbffe4bb Oops, guess i should test before committing -- this fixes the syntax error, as well as allows more weird chars to be properly set and saved as division/category titles james 2010-10-05 20:18:32 +0000
  • e7222337f7 Fix a typo james 2010-10-05 19:45:28 +0000
  • eb1012f7c5 Oops, also bump the DB version so it runs the new updates james 2010-10-05 19:45:05 +0000
  • 4f42407073 migrate categories/divisions/subdivisions from FAIRYEAR to conferences_id rename API call /config to /config/variables update API with /config members for divisions/subdivisions/categories james 2010-10-05 19:43:30 +0000
  • d2afb6a94e Modifications on how roles get handled jacob 2010-10-05 15:04:15 +0000
  • 898bdaacfc Oops put account/edit APIDOCS back in james 2010-10-01 21:06:57 +0000
  • f0b362eff7 Add account/view api james 2010-10-01 21:04:05 +0000
  • a92544bbea Implement user/edit Remove saving some stuff from user_save james 2010-10-01 19:42:52 +0000
  • 895bcc36e2 Add user/view API Change user_load() to explicitly load specific values instead of all values, as there's now some fields that need to be deleted but we cant delete them yet... james 2010-10-01 19:28:26 +0000
  • 9db042fc10 Modifications on editing users jacob 2010-10-01 18:47:28 +0000
  • e0eef7effa Add /api/config james 2010-10-01 17:13:48 +0000
  • 88055eb6a6 oops - committed with some code remarked jacob 2010-09-30 14:41:08 +0000
  • 637a35ca60 Separated (un)registering teams for events into schedule.inc.php and added it to the api jacob 2010-09-29 21:23:54 +0000
  • 8b2de95005 Be a bit smarter with "notimplemented", add API impelmentation status, and basic details to the apidocs page james 2010-09-28 20:37:44 +0000
  • b5ed7c174f use 'events' and 'locations' instead of 'list' in the return object james 2010-09-28 20:24:32 +0000
  • 0a02525d14 Added some API functionality used in schoolschedule.php jacob 2010-09-28 20:09:31 +0000
  • eb3c8f0d77 Add not implemented API comments of what still needs to get done james 2010-09-28 19:48:03 +0000
  • cbcb1743ce add class clear to CSS so menu's work properly again james 2010-09-28 19:07:31 +0000
  • 3e8271c869 Make apidoc valid html james 2010-09-27 20:51:16 +0000
  • c413d54f6d a few apidoc cleanups james 2010-09-27 20:50:37 +0000
  • 0f9588cdf4 Add APIDOC for the rest of the existing api james 2010-09-27 20:45:57 +0000
  • 08340544d9 Add api documentation james 2010-09-27 20:38:49 +0000
  • 54bf2201de Oops fix typo james 2010-09-27 20:04:12 +0000
  • 55bdb2aec5 Add account/create API Start adding some basic APIDOC comments to be parsed out into documentation later james 2010-09-27 19:52:43 +0000
  • 64a0432c55 Add account registration and email address confirmation james 2010-09-27 19:13:56 +0000
  • c009ef1e3a Added user_school.php, a form tab for user to select the school to which they belong. Updated user_edit.php to use it. jacob 2010-09-27 16:14:09 +0000
  • bce4bdb2b2 Change "pageid" and "NAV_PAGE_ID" to "navident" and "NAV_IDENT" and add the field to the database Add schedule class details to "new" theme james 2010-09-23 21:09:04 +0000
  • 8282ceaf96 need tbody for tablesorter james 2010-09-23 17:21:47 +0000
  • ff3ab7151e Handle topic-menu headings that arent linked james 2010-09-23 17:07:19 +0000
  • a6ec8ef874 Fix the SESSION debug output james 2010-09-23 16:41:40 +0000
  • ffd09ae67e Fix clicking on secondary nav james 2010-09-23 16:37:19 +0000
  • 60c6235649 Re-write the naviagation agian - no more ajax menus, and it auto-selects the first secondary and first tertiary pages when clicking a higher level james 2010-09-23 16:17:24 +0000
  • 2292af3206 Use div_prefs and cat_prefs (make the scheduler work again) Give higher preference to not having leftover judges Treat 'indifferent' cat_prefs as cost=0 even though its a 2 (on the 0-4 scale) james 2010-09-22 18:28:51 +0000
  • a8fa8e7a99 Disable DEPRECATED warnings james 2010-09-11 00:53:03 +0000
  • 70d359c15b PHP 5.3 DEPRECATED split() so, convert all split()'s to explode()'s james 2010-09-10 19:38:56 +0000
  • 517563a97a TUAG- various tune ups to HTML,CSS useradvocate 2010-09-09 20:13:48 +0000
  • 5dab48e574 TUAG- various tune ups to HTML,CSS useradvocate 2010-09-09 20:13:29 +0000
  • eef65869bb TUAG- various tune ups to HTML,CSS useradvocate 2010-09-09 20:13:10 +0000
  • 755b9c8560 TUAG- various tune ups to HTML,CSS useradvocate 2010-09-09 20:12:41 +0000
  • c9bf5f4227 get rid of the custom fundraising module primary nav james 2010-09-09 16:42:40 +0000
  • 07f2aa208e Add class="clear to primary and secondary menu's james 2010-09-09 15:22:22 +0000
  • 3913bb397d List all conferences with status in the api call, instead of just the running ones james 2010-09-07 19:59:37 +0000
  • dfb6112e66 Split committee management out james 2010-09-03 16:59:05 +0000
  • a5f309c022 Add session variables and date list by conference to API test page james 2010-09-02 19:14:59 +0000
  • 146f557759 Add science olympics teams api to testapi page james 2010-09-02 19:01:49 +0000
  • 959843d4c4 Add a simple API test page for checking some api calls Update /api/dates to use current conference id if one isnt specificed james 2010-09-02 18:53:48 +0000
  • 6963b7104b switch conference API james 2010-09-02 17:38:13 +0000
  • c8ada5f7c2 Move the schedule to the teacher account james 2010-09-01 19:27:55 +0000
  • 88cdfebdea Move team management to teacher interface james 2010-09-01 17:53:35 +0000
  • d01a3088b7 dd api for managing science olympics teams james 2010-08-31 20:50:11 +0000
  • de564f3c55 More user stuff to get things workinga gain Add a API module for science olympics james 2010-08-31 20:12:41 +0000