0000000000000000000000000000000000000000 e2f9deee3cb47828a8ef01d375008d3d7eea7dfa Angela Sheu <angelasheu.us@gmail.com> 1428288468 -0700	commit (initial): Initial commit
e2f9deee3cb47828a8ef01d375008d3d7eea7dfa 607fe09565570fac6530abb3761aa7a6aeedd780 Angela Sheu <angelasheu.us@gmail.com> 1428302103 -0700	commit: Add ProgressContainer and IconContainer for main page
607fe09565570fac6530abb3761aa7a6aeedd780 f4217e94111eb59a6d00fa6388d2126a8a288b50 Angela Sheu <angelasheu.us@gmail.com> 1428344925 -0700	commit: Add IDs for Servers based on URL, update times based on device
f4217e94111eb59a6d00fa6388d2126a8a288b50 9863b1d1a08e5d386e4059eae2ae10d8692b8b96 Angela Sheu <angelasheu.us@gmail.com> 1428355671 -0700	commit: More stuff implemented
9863b1d1a08e5d386e4059eae2ae10d8692b8b96 c460142a97c7d91296c5d2efd7983b0676af8b35 Angela Sheu <angelasheu.us@gmail.com> 1428454635 -0700	commit: Lots of new stuff, also lots of spaghetti code
c460142a97c7d91296c5d2efd7983b0676af8b35 07a16455513af2eb5ea0fa0e4c79fc7a50a4b95c Angela Sheu <angelasheu.us@gmail.com> 1428525283 -0700	commit: Some stuff for editing presets
07a16455513af2eb5ea0fa0e4c79fc7a50a4b95c 1a9dc43390b64d4dd6307c9821b4c48b883e0863 Angela Sheu <angelasheu.us@gmail.com> 1428595746 -0700	commit: Editing for laundryType and temp works
1a9dc43390b64d4dd6307c9821b4c48b883e0863 0ceba1b9abc9e35b8acc6fc73d40cb6f6c903523 Angela Sheu <angelasheu.us@gmail.com> 1428595797 -0700	commit: add util objects and functions in sep. js files
0ceba1b9abc9e35b8acc6fc73d40cb6f6c903523 56db7cea03bc05c6425cb547b618f003d7a92159 Angela Sheu <angelasheu.us@gmail.com> 1428597516 -0700	commit: use uniquely generated id as key to presetItemsTable
56db7cea03bc05c6425cb547b618f003d7a92159 45e82f6b3716acf260538fff0623904ac3285825 Angela Sheu <angelasheu.us@gmail.com> 1428597865 -0700	commit: Name editing works too now
45e82f6b3716acf260538fff0623904ac3285825 5aa51b10ff96e1b0c24b3a6d10116d0e40b280e5 Angela Sheu <angelasheu.us@gmail.com> 1428598679 -0700	commit: yay done with presets
5aa51b10ff96e1b0c24b3a6d10116d0e40b280e5 ce884079bc75a80500319abcd0980ca6fb53f659 Angela Sheu <angelasheu.us@gmail.com> 1428602361 -0700	commit: add drop down button to edit preset dialog
ce884079bc75a80500319abcd0980ca6fb53f659 9d6dc4b31b384bf212d8cc481e804045ad376235 Angela Sheu <angelasheu.us@gmail.com> 1428603615 -0700	commit: remove a bit of unnecessary code
9d6dc4b31b384bf212d8cc481e804045ad376235 e0c1c7d13e76b17cf2e4e7dc5247586c118678c6 Angela Sheu <angelasheu.us@gmail.com> 1428608234 -0700	commit: remove EditPresetScreen related things, since we are using a dialog for editing
e0c1c7d13e76b17cf2e4e7dc5247586c118678c6 df3793adb0791c73efcdf01f09bd77c1fba4eb53 Angela Sheu <angelasheu.us@gmail.com> 1428615473 -0700	commit: save pt
df3793adb0791c73efcdf01f09bd77c1fba4eb53 95a12a0efc592996ad8fe487988faa486ad68d68 Angela Sheu <angelasheu.us@gmail.com> 1428623930 -0700	commit: add icons, move buttons to sep. file
95a12a0efc592996ad8fe487988faa486ad68d68 94a91971f87e60d648c1e394f86b1bac250647b6 Angela Sheu <angelasheu.us@gmail.com> 1428624678 -0700	commit: remove some comments, add some clarifying comments
94a91971f87e60d648c1e394f86b1bac250647b6 0ec9bc930677e9015864e265f8e28102d730b428 Angela Sheu <angelasheu.us@gmail.com> 1428797654 -0700	commit: Change no servers screen
0ec9bc930677e9015864e265f8e28102d730b428 7798a8814b26c9a01afc4c1dabac8eba9263949b Angela Sheu <angelasheu.us@gmail.com> 1428797712 -0700	commit (merge): Merging from master
7798a8814b26c9a01afc4c1dabac8eba9263949b 2776e8dced1396a478022410cca56fcf86cc07f4 Angela Sheu <angelasheu.us@gmail.com> 1429043307 -0700	merge angela: Fast-forward
2776e8dced1396a478022410cca56fcf86cc07f4 65ca4694de139fc129b3b2b7738fe7d167aadafe Angela Sheu <angelasheu.us@gmail.com> 1429143125 -0700	commit: Make footer buttons into tabs
65ca4694de139fc129b3b2b7738fe7d167aadafe b67a3eb7e0eee3c635f21c5cc456ca3c3b2a73ae Angela Sheu <angelasheu.us@gmail.com> 1429636423 -0700	commit: Add notification for finished machine, change Maps button to reservations
b67a3eb7e0eee3c635f21c5cc456ca3c3b2a73ae 004c420b753f2bb6f221ce43f447d5b6ec49a67c Angela Sheu <angelasheu.us@gmail.com> 1429744502 -0700	commit: tweaks
004c420b753f2bb6f221ce43f447d5b6ec49a67c 94c8779bbe8cd35d34c5c209ca44c87f768d0f77 Angela Sheu <angelasheu.us@gmail.com> 1429746314 -0700	commit: Remove highlighted tab for now because it's buggy
94c8779bbe8cd35d34c5c209ca44c87f768d0f77 9e3fde9803774abecf4f91ce0388bf0986398ba1 Angela Sheu <angelasheu.us@gmail.com> 1429748136 -0700	commit: Added back the tabs
9e3fde9803774abecf4f91ce0388bf0986398ba1 01113b57665d8507eccf77066dca426389b306a8 Angela Sheu <angelasheu.us@gmail.com> 1429811767 -0700	commit: Commit before trying layers
01113b57665d8507eccf77066dca426389b306a8 22cca20e20c5f84de249d5ecf0e77cbf8c0c9835 Angela Sheu <angelasheu.us@gmail.com> 1429830570 -0700	commit: made things prettier
22cca20e20c5f84de249d5ecf0e77cbf8c0c9835 f94643a2f444ca431b1573f3a81e0119be591069 Angela Sheu <angelasheu.us@gmail.com> 1429830584 -0700	commit: added some .png files
f94643a2f444ca431b1573f3a81e0119be591069 12d607f1af417c5306a6f7bd25649db429e5ecd9 Angela Sheu <angelasheu.us@gmail.com> 1429833294 -0700	commit: keyboard disappears when I touch the border
12d607f1af417c5306a6f7bd25649db429e5ecd9 137e34599ef23f23463dd87033a4230f6335570b Angela Sheu <angelasheu.us@gmail.com> 1429855341 -0700	commit: reservations screen with icons
137e34599ef23f23463dd87033a4230f6335570b 4f8ba1a55383ea9f692a49b8986732b0764663a9 Angela Sheu <angelasheu.us@gmail.com> 1430228949 -0700	commit: dryers now possible. still have not implemented dryer settings screen
4f8ba1a55383ea9f692a49b8986732b0764663a9 d0961134fb873eee3940145050f689d35eed4c1f Angela Sheu <angelasheu.us@gmail.com> 1430335567 -0700	pull vshi master: Fast-forward
d0961134fb873eee3940145050f689d35eed4c1f b94e4b772dc6f4efbe532cda6309a8effeaf25ad Angela Sheu <angelasheu.us@gmail.com> 1430510342 -0700	commit: redesign of presets page, icons in footer
b94e4b772dc6f4efbe532cda6309a8effeaf25ad 0012b01aa4ba193bbdbd88db1e9dc3ce8315397b Angela Sheu <angelasheu.us@gmail.com> 1430511000 -0700	commit: fixed a spacing thing
0012b01aa4ba193bbdbd88db1e9dc3ce8315397b b92433f3d5be7227404f497a66adeded1e0610c8 Angela Sheu <angelasheu.us@gmail.com> 1430760552 -0700	commit: Add dryer settings screen
b92433f3d5be7227404f497a66adeded1e0610c8 409df9cb8da0677dc3a689fe03f8f18c57ad6db3 Angela Sheu <angelasheu.us@gmail.com> 1430774780 -0700	commit: Changes to layout of reservations screen
409df9cb8da0677dc3a689fe03f8f18c57ad6db3 53986672666215f926d4b62c1959959821382d09 Angela Sheu <angelasheu.us@gmail.com> 1430785757 -0700	commit: Made preset colors different for each laundry type and temp setting. Stock preset options now have more realistic names
53986672666215f926d4b62c1959959821382d09 8d77e847df46087e8c11a0c7c9cb522f3570a188 Angela Sheu <angelasheu.us@gmail.com> 1430882775 -0700	commit: updates to payment confirmation page to include selected laundry type, cycle number, temperature. add laundromat name and washer label to appropriate screens
8d77e847df46087e8c11a0c7c9cb522f3570a188 acd8a2583937207c42ff5bd69aa37ab97d927a97 Angela Sheu <angelasheu.us@gmail.com> 1430936180 -0700	commit: Different settings screen for in progress machines
acd8a2583937207c42ff5bd69aa37ab97d927a97 08ddd1b6d4cefa13f9ab4cf085d0742d091691a5 Angela Sheu <angelasheu.us@gmail.com> 1430938547 -0700	commit: Update total time for machine load based on selected cycles
08ddd1b6d4cefa13f9ab4cf085d0742d091691a5 cd027b8438860a959bb989d71ce9fd004db6b3de Angela Sheu <angelasheu.us@gmail.com> 1431016006 -0700	commit: Fix machineType label in notification
cd027b8438860a959bb989d71ce9fd004db6b3de 8e1d190853d680bed4a9360da6354592da7b0dd5 Angela Sheu <angelasheu.us@gmail.com> 1431016262 -0700	commit: remove extraneous setting menu to false
