{"push_id":746599559,"size":19,"distinct_size":1,"ref":"refs/heads/webfaction","head":"4dcd47b2089d3c312b6ad870a6676a5ee3bfe263","before":"1149e5e51ab59ba74b8b104cb99aabb20ffbb0ea","commits":[{"sha":"dc5ff85d39a433e6d504056547bd5cffa3cec705","author":{"email":"e2a452a476d2b07f38cede2b175a223ca766b114@hotmail.com","name":"Richard"},"message":"Fix the right col latter on for randomly show only the restaurant.","distinct":false,"url":"https://api.github.com/repos/wwwidmer/CAPSTONE2015/commits/dc5ff85d39a433e6d504056547bd5cffa3cec705"},{"sha":"1a0efbbcb6fe9ad5e9ca489eb7330506fb959bb9","author":{"email":"e2a452a476d2b07f38cede2b175a223ca766b114@hotmail.com","name":"Richard"},"message":".","distinct":false,"url":"https://api.github.com/repos/wwwidmer/CAPSTONE2015/commits/1a0efbbcb6fe9ad5e9ca489eb7330506fb959bb9"},{"sha":"2176b052078e955367a7ca63da2f91f8af5c1989","author":{"email":"e2a452a476d2b07f38cede2b175a223ca766b114@hotmail.com","name":"Richard"},"message":"Merge from Master branch","distinct":false,"url":"https://api.github.com/repos/wwwidmer/CAPSTONE2015/commits/2176b052078e955367a7ca63da2f91f8af5c1989"},{"sha":"4baca744e58e54c6ad953fb5bd9ca7adf44e0cfa","author":{"email":"e2a452a476d2b07f38cede2b175a223ca766b114@hotmail.com","name":"Richard"},"message":"Need to fixed","distinct":false,"url":"https://api.github.com/repos/wwwidmer/CAPSTONE2015/commits/4baca744e58e54c6ad953fb5bd9ca7adf44e0cfa"},{"sha":"9bb64404e2c084e32032851443a7644191d6e57a","author":{"email":"7f255f705817a508e94d1ef8fd5df8f580b50fb0@gmail.com","name":"Qendrim"},"message":"OK LAST DB CHANGE read on for this addition...\nFrom the looks of it I have devised a general idea of how to get our tabbed filter. It is possible to generate our tabbed filter via buttons that are defined by string names. That means we'll have a preset amount of buttons already defined and in this case they will not display if their strings are null values or \"\" utilizing if  != \"\"statements in the html code. Now we know that each menu would have a different type of filter and xyz amount of filters but the issue is that each fooditem could have multiple food types but, for the filter we need the base case of the foodtype representing All, Drinks, Breakfast, Lunch, Dinner, Dessert, Liquor etc. In order for this to work correctly each food item's type would need to be the base case (Coca Cola->base type-Drinks, second type-Soda)  which needs to be added as the first type for the food item.  The reasoning behind that is through the view or in the html will need to query that list of food items based off the base case and then we could organize those items based on its sub category types.\n\nTake a look at what I added in, when you add food types to the menu itself, it will display buttons on the page (not yet usable)","distinct":false,"url":"https://api.github.com/repos/wwwidmer/CAPSTONE2015/commits/9bb64404e2c084e32032851443a7644191d6e57a"},{"sha":"6ae5a6193cb49aa3985dce03bb159cc14f508c25","author":{"email":"e7286aa7962d7d3ae463203c88b790377c90ab2c@gmail.com","name":"QGjevukaj"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tCapstone/menu/templates/menu.html","distinct":false,"url":"https://api.github.com/repos/wwwidmer/CAPSTONE2015/commits/6ae5a6193cb49aa3985dce03bb159cc14f508c25"},{"sha":"8d959ce9f5fd875ccc9dfe0373a1e11607d07e8e","author":{"email":"7f255f705817a508e94d1ef8fd5df8f580b50fb0@gmail.com","name":"Qendrim"},"message":"Merge edit","distinct":false,"url":"https://api.github.com/repos/wwwidmer/CAPSTONE2015/commits/8d959ce9f5fd875ccc9dfe0373a1e11607d07e8e"},{"sha":"e396758a7b9fed74e870780623df0c76ead3738a","author":{"email":"e7286aa7962d7d3ae463203c88b790377c90ab2c@gmail.com","name":"QGjevukaj"},"message":"Manuel merge with richards commitment","distinct":false,"url":"https://api.github.com/repos/wwwidmer/CAPSTONE2015/commits/e396758a7b9fed74e870780623df0c76ead3738a"},{"sha":"4a259c727229850052cf751ae62cb89d46147e63","author":{"email":"7f255f705817a508e94d1ef8fd5df8f580b50fb0@gmail.com","name":"Qendrim"},"message":"Created the function to filter each menu type of the food items into lists.\n\nTested it on menu.html, it pulls the data correctly just needs to either be linked to the button or the data needs to be hidden via borders utilizing css....\n\nLimit 5 menu types (add more as necessary)","distinct":false,"url":"https://api.github.com/repos/wwwidmer/CAPSTONE2015/commits/4a259c727229850052cf751ae62cb89d46147e63"},{"sha":"b3acb9b7e0f16ad7b311eae0b90a569e08fc48d3","author":{"email":"7f255f705817a508e94d1ef8fd5df8f580b50fb0@gmail.com","name":"Qendrim"},"message":"slight mod to simplify code-redundant if","distinct":false,"url":"https://api.github.com/repos/wwwidmer/CAPSTONE2015/commits/b3acb9b7e0f16ad7b311eae0b90a569e08fc48d3"},{"sha":"9236ecd15ecfcecd592cf75689cc4695f6edbe0f","author":{"email":"e2a452a476d2b07f38cede2b175a223ca766b114@hotmail.com","name":"RichardHung"},"message":"Trying to add tab by the number of type.","distinct":false,"url":"https://api.github.com/repos/wwwidmer/CAPSTONE2015/commits/9236ecd15ecfcecd592cf75689cc4695f6edbe0f"},{"sha":"9b29c0b41a76cfd32d6f83fb16cd7f6cd82ce6ea","author":{"email":"e2a452a476d2b07f38cede2b175a223ca766b114@hotmail.com","name":"RichardHung"},"message":"Merge branch 'master' of https://github.com/wwwidmer/CAPSTONE2015 into Richard","distinct":false,"url":"https://api.github.com/repos/wwwidmer/CAPSTONE2015/commits/9b29c0b41a76cfd32d6f83fb16cd7f6cd82ce6ea"},{"sha":"8be9a12752f567b81ed74de3870f12744b43572e","author":{"email":"e2a452a476d2b07f38cede2b175a223ca766b114@hotmail.com","name":"RichardHung"},"message":"Failing to add tab automatically.....","distinct":false,"url":"https://api.github.com/repos/wwwidmer/CAPSTONE2015/commits/8be9a12752f567b81ed74de3870f12744b43572e"},{"sha":"6dfdd689c527e703a08018436150cb4d3fac56d8","author":{"email":"cb1079dd8a739d63142fd3794ce6997241259b2a@gmail.com","name":"william widmer"},"message":"Fixed IFs and deleted footer from menu and header","distinct":false,"url":"https://api.github.com/repos/wwwidmer/CAPSTONE2015/commits/6dfdd689c527e703a08018436150cb4d3fac56d8"},{"sha":"5e32c166ba9ae04ecec9b7fe7b54564f7666ee52","author":{"email":"cb1079dd8a739d63142fd3794ce6997241259b2a@gmail.com","name":"william widmer"},"message":"manual merging of previous commit","distinct":false,"url":"https://api.github.com/repos/wwwidmer/CAPSTONE2015/commits/5e32c166ba9ae04ecec9b7fe7b54564f7666ee52"},{"sha":"790494df559243dbb748f9ff78cf27f703b95fdc","author":{"email":"cb1079dd8a739d63142fd3794ce6997241259b2a@gmail.com","name":"william widmer"},"message":"Fixed more if block issues in menu.html","distinct":false,"url":"https://api.github.com/repos/wwwidmer/CAPSTONE2015/commits/790494df559243dbb748f9ff78cf27f703b95fdc"},{"sha":"3940380c54534fa39d667e23273c34248ba00b78","author":{"email":"cb1079dd8a739d63142fd3794ce6997241259b2a@gmail.com","name":"william widmer"},"message":"Merge with richard","distinct":false,"url":"https://api.github.com/repos/wwwidmer/CAPSTONE2015/commits/3940380c54534fa39d667e23273c34248ba00b78"},{"sha":"501ef2dcf3e316d1a62fc5c8f17848ad9a14dd2c","author":{"email":"cb1079dd8a739d63142fd3794ce6997241259b2a@gmail.com","name":"william widmer"},"message":"Mismatched endifs and endblocks in several files corrected","distinct":false,"url":"https://api.github.com/repos/wwwidmer/CAPSTONE2015/commits/501ef2dcf3e316d1a62fc5c8f17848ad9a14dd2c"},{"sha":"4dcd47b2089d3c312b6ad870a6676a5ee3bfe263","author":{"email":"cb1079dd8a739d63142fd3794ce6997241259b2a@gmail.com","name":"william"},"message":"Merging with master","distinct":true,"url":"https://api.github.com/repos/wwwidmer/CAPSTONE2015/commits/4dcd47b2089d3c312b6ad870a6676a5ee3bfe263"}]}