{"shas":[["78efde23da06161fbcdc102328ffbf5ef13a5d79","08133d153e8b6ff92805a238be7ba2d560369499@gmail.com","changed method of resolving locale messages for student query","doccz"],["d5560b29f0fe1f156feb21a38f420267b8b66d38","18c0467fa91ffd0de1fa84761448c3a3e15025fe@gmail.com","change login screen","alanclv & suziee"],["ea08f042e42f24f930e71049b9a61195b7895a57","68b4b0984a683af80af0cb6118ff4a97be1ff24d@.(none)","some changes to /file files","suziee"],["b4c08cb378d143a0b113f375e4ca267303c9e89a","68b4b0984a683af80af0cb6118ff4a97be1ff24d@.(none)","Merge branch 'master' of git://github.com/alanclv/RebelHotel into dev","suziee"],["bafdfc1407b81eea04ae48e4977dd03f849a1767","68b4b0984a683af80af0cb6118ff4a97be1ff24d@.(none)","Merge https://github.com/doccz/RebelHotel into dev","suziee"],["09ab42d89d4c98e953e6e6756d484ecc99b5fba8","08133d153e8b6ff92805a238be7ba2d560369499@gmail.com","added first name and last name fields to query students; removed some commented code","doccz"],["76b5b490dcdddcc232cce1b6a2570e35ff5c9db9","08133d153e8b6ff92805a238be7ba2d560369499@gmail.com","updated majors/work efforts; fixes pertaining to the old major entity addition","doccz"],["ee3024ad286527abe4a6c68e1a5d3fdb7ec99de2","08133d153e8b6ff92805a238be7ba2d560369499@gmail.com","student query export to CSV","doccz"],["4b6793b2f5104c72e47a8dce58c7c276d1f5a0a7","68b4b0984a683af80af0cb6118ff4a97be1ff24d@.(none)","included implementation for line; added new enum to /file","suziee"],["6e2ed2491cbf16dc2915e6d879e68720be9e9b23","68b4b0984a683af80af0cb6118ff4a97be1ff24d@.(none)","Merge http://github.com/doccz/RebelHotel into dev","suziee"],["ed47510d632dc1773f36de504c41fdf67b32ce49","68b4b0984a683af80af0cb6118ff4a97be1ff24d@.(none)","merged with doccz; added workrequirementservice but no implementation; changed some of the /file files; have not updated departments enums, yet","suziee"],["bd257a1596bac307ca9aeac5ef4fa780bd803f29","12dea96fec20593566ab75692c9949596833adc9@Alan-Chapmans-Mac-mini.local","file upload work","suziee"],["5c21731c28249ff9999f42788d5bb0c0e58c9154","12dea96fec20593566ab75692c9949596833adc9@Alan-Chapmans-Mac-mini.local","fix merge","suziee"],["cf11df6c04260a1255fa639cca5fd0f38c25f4a6","12dea96fec20593566ab75692c9949596833adc9@Alan-Chapmans-Mac-mini.local","updated login page","suziee"],["244f71b1ec5c1e993c1ac3e89912a14b9b2c549f","12dea96fec20593566ab75692c9949596833adc9@Alan-Chapmans-Mac-mini.local","updated fileDepartments enum; updated line to ignore recreation majors; recognizes different majors, but not for work templates, which i will fix later; still need to create random password for new user accounts; i still have problems with persist/merge","suziee"],["7437a068efcaacd6de5f097c396261b18c90be2c","68b4b0984a683af80af0cb6118ff4a97be1ff24d@.(none)","fixed merge conflicts with myself","suziee"],["29cac2c4df0a1facb2c9b42b436f5aba6b0a492f","68b4b0984a683af80af0cb6118ff4a97be1ff24d@.(none)","worked more on upload file","suziee"],["84803dd4f7b621f7662d01008d6e5791214059e7","68b4b0984a683af80af0cb6118ff4a97be1ff24d@.(none)","error with major/wr and term","suziee"],["28a5d3226da3e9158d97d3476a63322ed8d14bc9","521a5bcf4066015517ca432079d7ddc0f32d75cd@unlv.nevada.edu"," added email service skeleton, dont pull me yet","Greg"],["7c2d57d75d6e5ced54b0eb8556dcf095ce1d20a8","68b4b0984a683af80af0cb6118ff4a97be1ff24d@.(none)","still trying to work around those foreign key contraints","suziee"]],"repo":"suziee/RebelHotel","actor":"suziee","ref":"refs/heads/master","size":77,"head":"b9a2ad2649969ec6c118f08b53240f22ba3758e0","actor_gravatar":"8af4ced36d061b76efcb87a428deeeee","push_id":29725093}