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

Commit Graph

  • f785a71be2 Oops - removed debug output from the project/new api. Updated getProject to take userId as a parameter, rather than the registration number. jacob 2011-02-18 20:48:56 +0000
  • 40e139b7a1 Fix for logical error in how I connected users to registrations. Had the wrong ID field connecting them. jacob 2011-02-18 20:25:47 +0000
  • e6dfe1c476 Added joinProject function in register_participants.inc.php, and added the api for it at /api/project/join jacob 2011-02-18 19:19:56 +0000
  • c1d248dbd3 Added the soulmate for a lonely opening brace. jacob 2011-02-18 17:12:32 +0000
  • 6519392bd5 Added getRegistrationsId() function, returning the registration ID for the specified user jacob 2011-02-18 17:05:07 +0000
  • 96f36d4681 Implement project\/view james 2011-02-18 16:56:35 +0000
  • 340a45127b Added code preventing users from creating more than one registration/project jacob 2011-02-18 16:46:44 +0000
  • 3c0151263f Convert project/edit to pass a 'project' object as JSON instead of individual fields james 2011-02-18 16:37:11 +0000
  • ef4a14a386 modified the project/add API to not expect any data, but simply create the project. jacob 2011-02-18 16:14:23 +0000
  • 3745d8cfd9 Added api functionality for creating and saving projects jacob 2011-02-17 22:04:47 +0000
  • ca48277fb0 Remove 2501 and 2502 commits - they're still messed up :( james 2011-02-17 18:53:39 +0000
  • 5dcdb5029a dennis 2011-02-17 18:07:10 +0000
  • 6925d88b16 dennis 2011-02-17 18:03:28 +0000
  • b71a0dc994 email_send should send html version of email if we have it, also dont translate the subject & body thorugh i18n() james 2011-02-17 16:36:17 +0000
  • 31f29b7f84 email_send should send html version of the email if we have it james 2011-02-17 16:35:44 +0000
  • 0b57eb2edd Whoa, guess this divs/cats adjustment never made it into branch! scheduler is complete b0rked without it. james 2011-02-16 20:28:55 +0000
  • dfb54ec9df Added date of birth, food requriements, t-shirt size and medical alert info to the users table as student fields jacob 2011-02-16 19:08:58 +0000
  • 93f4703b71 Add account_list (temporary hack) user_invite can find users by username OR by email address if the account is found, but user_load fails, thats okay, it just means that they dont have any roles yet james 2011-02-16 18:39:59 +0000
  • d58e8f4a1e Revert Dennis's invalid line endings commit james 2011-02-16 17:00:55 +0000
  • 4ac3a8f974 Revert Dennis's commit - improper line endings caused the whole files to be replaced james 2011-02-16 16:59:33 +0000
  • 19304cf75a When adding a user with user_create, we need to set deleted='no', also, update user_load to catch an empty 'deleted' field, instead of only looking for !='no' becuase now we have users in the system without any deleted field. fuck. james 2011-02-16 16:49:53 +0000
  • ce35d4ccee Changes by Dennis. Required to provide for a clean install on Windows server ISPs (also my Windows xp workstation with PHP and mySQL). There should be NO changes to functionality. dennis 2011-02-10 14:46:58 +0000
  • 727bae005b Some fairs with LOTs of divisions may exceed the 255 char limit on the judge division preferences saving. dave 2011-02-09 18:39:14 +0000
  • b791499b18 dennis: Modifications to allow installation on Windows servers. dennis 2011-02-05 22:35:44 +0000
  • 9730d79ab6 Update on curl.inc.php to fix a reported bug when downloading awards jacob 2011-02-04 16:37:34 +0000
  • 221213e1d8 Add grade to participant required fields james 2011-02-02 23:19:15 +0000
  • ebc7d7ad1d Fix the other two places that used the array_diff_assoc incorrectly (by simply removing it) james 2011-02-01 21:59:06 +0000
  • b4d018f771 Fix user_save to properly update the status of all roles that the user has Fix special awards tab to load&save properly Fix volunteer positions tab to load&save properly james 2011-02-01 20:10:11 +0000
  • 347b12ab2e Oops - only update the session user id for the newly created user if it's the same account and the same conference as the one doing the user creation jacob 2011-01-28 20:16:43 +0000
  • 8714fe7a1d Fix invitation emails james 2011-01-28 20:02:21 +0000
  • ceb55a49a6 Add a user id to the session when someone adds a role (and thus a user) to an account that does not currently correspond to any user records. jacob 2011-01-28 19:57:09 +0000
  • 462427c1b1 Fix divisions insert check james 2011-01-28 18:22:18 +0000
  • cb6796b95d Languages group fix james 2011-01-28 18:12:30 +0000
  • 349af780ed Email address fix for user_list (now show accounts.username and accounts.email) james 2011-01-28 18:01:31 +0000
  • 552ce74d96 Couple of quick fixes: - the "languages" field needed to be regrouped when applied to a Science Olympics account - Modified account/create api to test all errors and return them as a group, rather than exiting on the first error jacob 2011-01-27 22:55:42 +0000
  • a5bd01f621 Bunch of fixes james 2011-01-26 23:15:58 +0000
  • f1c8b9919f Hack to get around upgraded version of PHP not accepting pass-by-reference that isn't explicitly stated on both sides. This allows judge registration to complete dave 2011-01-24 06:00:32 +0000
  • 2813377014 Also need to substr the long usernames in the installer, doh! james 2011-01-20 19:32:00 +0000
  • 95d57c25bf Bump version number for more development james 2011-01-19 19:54:00 +0000
  • c53e9611e5 Fix for adding users that have been deleted.... i think. james 2011-01-19 19:46:48 +0000
  • f47f2c4ceb prepare version 2.3.0 james 2011-01-17 18:34:42 +0000
  • 97076cbe32 Add function to copy schools from a different conference. fix the user_load_by_uid calls, but im not sure if simply replacing them with user_load() is the 'right' fix.. but at least the page loads now :p james 2011-01-11 20:10:51 +0000
  • c048e33f6a Fix access codes for schools james 2011-01-05 21:05:31 +0000
  • 54a5cc8da4 Add school access code to email replacement tags james 2011-01-05 20:35:31 +0000
  • e6cd95ebfc Fix science head and principal queries in branch james 2011-01-05 20:25:14 +0000
  • afc836e214 Add the 16 char username truncate fix to the update script too james 2011-01-03 17:17:18 +0000
  • 9230b559db Forward port mysql 5.1 16 character username limit difference james 2010-12-30 14:24:05 +0000
  • 79513c6d29 Add a fix for new MySQL 5.1 where it doesnt truncate at 16 characters before comparing, so all our long usernames were failing (mysql internally only supports 16 characters) james 2010-12-30 13:56:50 +0000
  • e0f0a5dd90 Re-do user_invite to allow users to be invited by admin/config's - its not complete, but its working, it still needs to send emails though to tell the user of their new role, but i need to think on how to do that because if its a new account then it could be just a username/password without an email, but if its invited then the email __IS__ the username, but we shouldnt rely on the email being valid until its been confirmed via the email confirmation.. ugh?!?! james 2010-12-21 23:16:20 +0000
  • 8f2e8f985b Adjust wording slightly james 2010-12-21 22:57:46 +0000
  • beac7bb44e Forward port the "auto-select novice" change james 2010-12-16 16:56:49 +0000
  • c1afa5f00f Start with all the divisions set to "novice", this way, they dont specifically need to put something in every row, they only need to change the ones that they know. james 2010-12-16 16:49:41 +0000
  • 459eb17e98 Add a hidden config option (put it in data/config.inc.php) to not require API access over SSL james 2010-12-08 21:18:07 +0000
  • 8f17e80169 If there's less than 2 conferences (specifically, 1 conference) then dont show the conference selector in the header james 2010-12-07 19:29:02 +0000
  • 673b0b51f8 Make conference saving work again james 2010-12-07 19:26:39 +0000
  • e278505bc0 Simplify the user list and make it work again james 2010-12-06 20:26:39 +0000
  • 39ff0dd2ce More fixes to (hopefully) allow a superuser to add admin/config roles james 2010-12-06 19:33:38 +0000
  • 0acf5a5661 Allow superuser to always access admin/config even if its not in their session roles james 2010-12-06 18:33:02 +0000
  • 8817e5eb86 Updated the user loading to only include fields that are relevant to the roles, accounting for the fact that certain roles (eg. juge) have different fields for different conference types. jacob 2010-12-02 20:28:19 +0000
  • 336cec80e0 Quick fix for an error showing up in some field types for the api Added an error catch, re-indexing the languages array when a user is saved, to ensure that the indecies are numeric jacob 2010-12-02 18:43:35 +0000
  • 77a3c77e69 oops - forgot to remove debugging remarks jacob 2010-12-02 17:54:01 +0000
  • dfd468505c Modified the api loging for better readability and to include the output jacob 2010-12-02 17:50:16 +0000
  • 128fc6a3b5 Added logging to the API, and separated the log file creation into a common function jacob 2010-12-02 17:25:23 +0000
  • a6544f40c4 Added an error check in saving the user, avoiding duplicate keys on an insert if bad data is passed in. Touched up the error output to make finding errors a pinch easier. jacob 2010-12-02 16:33:04 +0000
  • 6b94ef5c76 Added abillity to uninvite a user from a particular role where allowed, and api function (/user/uninvite) Added function user_list_modifiable, which returns a list of user info that the current user is allowed to modify (users.inc.php) Added api for calling user_list_modifiable (/user/list) jacob 2010-12-01 19:40:45 +0000
  • 39f53e4168 Added teacher abillity to add/remove students Updated the user_save to output more meaningful errors Updates on 'questions' and 'pagetext' tables to change the 0 conference ID to -1, matching the -1 year jacob 2010-11-29 22:54:12 +0000
  • 1e1fa0097a Updated super/conferences.php, adding a rollback if there are errors in copying a conference. Added compvars.php, which is a test script for comparing data after it's been rolled over from one conference to another - used to test the rollover in super/conferences.php. Updated usage of the role "student", replacing it with "participant". jacob 2010-11-26 16:50:17 +0000
  • 57561c829d Add copyoriginal and copyparent to API james 2010-11-25 20:47:32 +0000
  • 46b39f81e0 Add copyoriginal, copyparent, and notes(currently unused) to conferences table Add code in create conference and copy conference to set copyoriginal and copyparent Add missing json_decode to API (we expect ALL arrays being POSTED to be json encoded) james 2010-11-25 20:45:44 +0000
  • e9f46edb0e Added code for inviting users, access to it through the api jacob 2010-11-23 20:58:38 +0000
  • c098354179 Add the warnings back in! eeek! james 2010-11-22 19:00:41 +0000
  • d0d9fe4d60 Add ability to see WHO the recipients of a communication will be james 2010-11-22 18:40:50 +0000
  • 4f388734a9 Add special award subset of sponsors that can be contacted james 2010-11-22 18:14:03 +0000
  • 6e955082e9 Re-Add some report fields that were added in 2077 (after the 2072 branch) james 2010-11-19 15:34:23 +0000
  • 8f255f4eb8 Added an icon for conference management. Added fields in the config for teachers jacob 2010-11-18 22:46:46 +0000
  • 0720cb0ae0 Updated super/conferences to properly manage existing conferences, and touched up it's UI to fit the site theme jacob 2010-11-18 20:44:48 +0000
  • 63178e596b Add dictionary documentation Update Test API page to link to apidocs and dictionary james 2010-11-18 17:24:18 +0000
  • 1701e965ef Added a quick link to test api/registration/dictionary jacob 2010-11-18 17:10:53 +0000
  • 8b15620f69 Added the api/registration/dictionary functionality jacob 2010-11-18 17:00:26 +0000
  • e730a5ab05 Added the rollover for the fiscal year, and removed the rollover for the fair year jacob 2010-11-18 16:38:12 +0000
  • f6eee9666a Updated to properly use the user_save function jacob 2010-11-18 16:02:11 +0000
  • 31baeaa715 SQL error fix jacob 2010-11-18 15:59:22 +0000
  • a8b0adce05 fix typo james 2010-11-17 23:47:37 +0000
  • 2c9baf185a Added code for a fiscal year rollover, as well as an icon for linking to it. jacob 2010-11-17 22:53:40 +0000
  • 1b098f85b3 The API depends on a return value from the user_save function, which was not being generated. Updated user_save to return 'ok' on success, and an error message otherwise. Updated api.php to make use of user_save's retun value. jacob 2010-11-17 21:02:32 +0000
  • 65ecdcac05 Add branch for 2.3 starting at trunk 2072 We'll probably use this for 2011 fairyear and will have to svnswitch every sfiab install to this branch. ONLY BUGFIXES TO THIS BRANCH and ALL COMMITS should go to TRUNK as well james 2010-11-17 19:21:46 +0000
  • 6c5669c3f4 Arg - accidentally committed with a data dump... jacob 2010-11-17 16:37:44 +0000
  • 1972323a65 Correction on how the multiselect fields are described jacob 2010-11-17 16:12:10 +0000
  • 2848ed177d Quick correction on how lang is described in the user_get_fields function jacob 2010-11-17 15:52:02 +0000
  • 0ff766175b Updates on the data that gets returned when describing the user structure Modified user code to properly save the volunteer availability data Updated the UI to properly use the user_save function to update judge and volunteer info jacob 2010-11-16 22:51:42 +0000
  • 61fba8a93c json_decode always returns an object unless you tell it to give you an associative array (2nd parameter) give multi-select-lists as full object's where appropriate (might be more too? special awards?) james 2010-11-16 21:19:16 +0000
  • a0c64963e0 small mod on user save function jacob 2010-11-16 20:54:46 +0000
  • cf2e2eb6db Modified some of the user preference data as it's stored in the user array jacob 2010-11-16 20:42:40 +0000
  • 1e2340beb1 Some updates on the interface for creating conferences Modified the user object, correcting some issues with judging availability and volunteer availability. jacob 2010-11-16 19:53:26 +0000
  • 7113a3df95 Oops, i never committed this before - add configerence id as an optional parameter to /auth/login james 2010-11-16 04:29:16 +0000
  • 00f380483b Rewrote the installation script to deal with conferences Writing UI components to create conferences from within the user interface - still buggy jacob 2010-11-10 23:05:24 +0000
  • a3b72f7aa3 Altering tables projectdivisions, projectsubdivisions, and projectcategories, changing their primary keys from (year, id) to (conferences_id, id) jacob 2010-11-10 19:25:46 +0000
  • a7a7735347 Added grouping to the list of user information fields jacob 2010-11-10 18:47:01 +0000
  • 769d5ee969 A quick fix. The award_awards_table had the conferences_id set to 0 where the year was -1. Modified it to match. jacob 2010-11-05 17:48:19 +0000
  • 88c6d9a0dd Further updates in migrating to conference id jacob 2010-11-03 20:59:03 +0000