Commit Graph

2342 Commits

Author SHA1 Message Date
jacob
fc503f505c Small modification to ensure that the user variable at least includes their name if they have no roles; 2012-03-06 18:22:18 +00:00
jacob
88ed011e5a Modified the user info structure to explain the users' t-shirt size as an enumeration rather than a varchar 2012-02-22 15:57:29 +00:00
jacob
f61b4b94f3 Quick patches:
- wording changes for creating an account and recovering passwords
 - updated rollover script to copy the conference logo
2012-02-15 16:36:52 +00:00
jacob
680528d387 Misplaced not operator preventing people from registering new projects 2012-02-10 22:04:58 +00:00
jacob
6893a22276 Updated code to allow invitaiton of committee members. 2012-02-10 20:19:19 +00:00
james
4f8b8c6a57 Forward port substitutions on firstname/lastname for new user welcome email 2012-02-10 17:37:59 +00:00
jacob
f16f5b6211 A small patch. Allows registration id's in the user field with a zero value to be handled the same way as a null value. 2012-02-08 21:30:37 +00:00
jacob
6ea87600da Updated the user_copy function to avoid copying the registrations_id and grade fields. 2012-02-07 17:31:33 +00:00
jacob
0f26cbbf2c Quick fix to make sure you can't switch to an inactive conference through the API 2012-02-06 17:41:50 +00:00
jacob
b1d2fd76a6 Another bug fix on conferences.php 2011-12-20 15:40:17 +00:00
jacob
01589a1518 Bug fixes for conference managament "wizard". 2011-12-20 15:21:48 +00:00
james
80ec239bd9 CSS fixups 2011-12-20 15:10:30 +00:00
jacob
14c192d69f Added the pronunciation field to the user object for participants 2011-04-08 18:24:24 +00:00
james
0e188391d8 Update on the winners.php to work with the new user system 2011-04-08 18:08:17 +00:00
james
2811eef8d2 Some touch-ups to get prize nomination working properly with the new system 2011-04-08 16:28:21 +00:00
james
36cc0e289c Forward port truncate username fix into trunk 2011-03-29 19:42:00 +00:00
james
974d42fa91 Fix "Try Report" from report editor - if no conference id passed in, use the current conference id, which it was set to do, but $conference wasnt global'd in the function 2011-03-29 18:27:12 +00:00
james
ef46b5811b And fix the same bug with the prize order saving 2011-03-28 18:38:49 +00:00
james
497f6eddd7 fix a bug in saving the award order (we need to .load on a div that actually exists) 2011-03-28 18:36:58 +00:00
jacob
75e7d4e574 Just a few quick query updates 2011-03-28 14:44:25 +00:00
james
b519726d73 Update website consent page 2011-03-27 17:11:36 +00:00
james
a1b0c33a64 Take website first/last name censent into consideration for app
Update project info
2011-03-27 17:08:59 +00:00
james
ade9e1b876 Update confirmed participants page from students table to users table 2011-03-27 16:49:22 +00:00
jacob
3e290af2dc Quick query fix 2011-03-24 21:34:12 +00:00
jacob
4a9e2ca163 Updated e-mail to accomodate custom e-mail address confirmation messages. 2011-03-24 21:04:28 +00:00
james
98f6a9f76d Update more communication emails (teachers, principals)
Tweak award eligibility display
Add "Account" info to student reports (email, username, pendingemail)
Move some project identification stuff around and fix the groupings
2011-03-23 19:44:08 +00:00
james
3af6933f73 hmm better implement the selection of eligibility - it wasnt working here for me, but was on some windows browsers.. so.. be explicit with what its doing and now it should work everywhere 2011-03-22 20:40:31 +00:00
james
23d8765fa6 Fix all participant emails in communication module
Make queries for communications easier, all you need is a users.id queried, the system will find everything else for you
Add ability to use [PASSWORD], [USERNAME], [EMAIL] (tries accounts.email first, if its not there, it uses accounts.pendingemail), in _ANY_ email.  [REGNUM] also added but will obviously only work for participants
Add "all" section to the tabs list for user editor, so a user without any roles can still get the basic pages like "account",  "roles", and "personal info"
Put count on participant invitations for teachers (and superusers)
Fix a bug where changing a password for a different user didnt work (it changed YOURS!)
2011-03-22 04:37:51 +00:00
james
5147b3a62b Fix daves commit from last night, we dont use year anymore, we use conferences_id 2011-03-20 19:20:03 +00:00
dave
58af12c9cb Commit from branch2.3, match the categories/divs with the project year to avoid printing categories from previous years. 2011-03-20 00:09:00 +00:00
james
d59908033e Always put the app text under the barcode so people know what its for :p
Fix the naming of the barcode function for consistency
2011-03-19 21:05:18 +00:00
james
12bb399d48 Fix the conference logo not working on reports (FINALLY! god for such a stupid bug it took me forever to realize it), also tweaked the barcode code a bit 2011-03-19 20:49:06 +00:00
james
c493120128 INcrease the size of the barcode slightly. 2011-03-17 23:16:44 +00:00
james
047dd2c86f Oops missed one (IMPORTANT) barcode commit 2011-03-17 23:13:51 +00:00
james
c338261abc Add iPhone app stuff to trunk/ 2011-03-17 23:06:16 +00:00
dennis
2e303635ea Changes to facilitate running in Windows OS IIS or Apache werb server 2011-03-15 20:28:10 +00:00
james
3b2bf0a0e2 Oops, fix off-by-one in safetyquestion report editor fields 2011-03-15 00:08:59 +00:00
james
41085e2c46 Add fields for project safety question answers to report buildeir 2011-03-14 22:04:30 +00:00
james
d182699702 shrink RegNum column, it doesnt need to be so big.
fix project_details custom report for students->users
2011-03-14 21:24:39 +00:00
james
9c080c76f5 Add some trimming to username/passwords/emails (to prevent people from putting spaces before and/or after their email address causing it to be invalid)
Updated report system to read students from users table instead of students table
Fix tcpdf tables spanning multiple pages spilling into the header area
Fix calling an invalid add_table function (its addTable yo!)
2011-03-14 20:59:16 +00:00
james
badc2e9378 forward port translation changes on participant special award pages 2011-03-10 16:17:21 +00:00
james
81fafb609c Add ability fo superuser to SEE anyones current password 2011-03-10 15:01:17 +00:00
james
6d189a907f If the email is already validated (like if they clicked the link more than once) just tell them thats the case instead of telling them its invalid (which it is) 2011-03-09 23:43:19 +00:00
james
a463b591cc Make participant invite table header clickable to sort 2011-03-09 02:49:41 +00:00
james
ae8ec49388 Allow admin or superuser to uninvite students from any school 2011-03-08 17:46:25 +00:00
james
43283059ae show pendingemail in school list if email isnt set (and let them know its unconfirmed)
show "no name set" in school list if the name (firstname." ".lastname) is blank
2011-03-07 22:34:28 +00:00
james
5270935d3b A few tweaks to get the simcoe signature page back to 1 page
- reduce some spacing
 - remove final <hr /> from bottom
2011-03-07 20:05:26 +00:00
james
ef327f008b Update the javascript based count when the page loads 2011-03-07 17:48:06 +00:00
james
e47f65729d Trim the summary before splitting to count words (gets rid of leading and trailing whitespace causing extra 'words') 2011-03-07 16:28:02 +00:00
james
7583dc7dc6 More better output for school info on partifipant invite list (see whats going on!) 2011-03-05 04:44:27 +00:00