Skip to content
Jump to bottom

Master #167

Closed
wants to merge 234 commits into from
Closed

Master #167

wants to merge 234 commits into from

Commits on Feb 1, 2017

  1. test for my branch

    @jic13003
    jic13003 committed Feb 1, 2017
    Copy the full SHA
    783c3ca View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2017

  1. Icons Galore!

    @clj13001
    clj13001 committed Feb 7, 2017
    Copy the full SHA
    8506f3a View commit details
    Browse the repository at this point in the history

  2. Update CREDITS.md

    @clj13001
    clj13001 committed Feb 7, 2017
    Copy the full SHA
    4cf6475 View commit details
    Browse the repository at this point in the history

  3. Update CREDITS.md

    @clj13001
    clj13001 committed Feb 7, 2017
    Copy the full SHA
    0f95bc8 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2017

  1. Profile Image Integration

    @clj13001
    clj13001 committed Feb 8, 2017
    Copy the full SHA
    d4a6920 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2017

  1. A lot added into the Profile Settings Page.

    @clj13001
    clj13001 committed Feb 9, 2017
    Copy the full SHA
    7eb10f0 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2017

  1. Update README.md

    @clj13001
    clj13001 committed Feb 10, 2017
    Copy the full SHA
    97d5692 View commit details
    Browse the repository at this point in the history

  2. Changing Text

    @clj13001
    clj13001 committed Feb 10, 2017
    Copy the full SHA
    a7d9b91 View commit details
    Browse the repository at this point in the history

  3. Changing MySQLAccess query 

    Attribute changed and this is catching up.
    @clj13001
    clj13001 committed Feb 10, 2017
    Copy the full SHA
    9adfdea View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2017

  1. Merge pull request #23 from arc12012/Connor's-Branch 

    Connor's branch
    @clj13001
    clj13001 committed Feb 12, 2017
    Copy the full SHA
    b545bb8 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2017

  1. Imporoved the look of the order info popup 

    It also now closes when pressing escape or clicking outside of it.

Made shoppingCart.html and shoppingCart.js into shoppnigCart.jsp and shop.jsp respetively; getting ready for database stuff
    @arc12012
    arc12012 committed Feb 14, 2017
    Copy the full SHA
    c5330f3 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2017

  1. Minor DB Class Changes. Also cats

    Brianna authored and Brianna committed Feb 18, 2017
    Copy the full SHA
    11fe650 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #25 from arc12012/BriBranch 

    Minor DB Class Changes. Also cats
    @beb13005
    beb13005 committed Feb 18, 2017
    Copy the full SHA
    e4b62fd View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2017

  1. Catching up with last weeks updates

    @clj13001
    clj13001 committed Feb 21, 2017
    Copy the full SHA
    a04ef03 View commit details
    Browse the repository at this point in the history

  2. Queries work now! 

    Getting the image to show is troubling. Reorganization is probably the
best solution.
    @clj13001
    clj13001 committed Feb 21, 2017
    Copy the full SHA
    cced9d4 View commit details
    Browse the repository at this point in the history

  3. Images actually were working. 

    Eclipse Debugging = 💩
Also merged together two JSP files. No need to separate.
    @clj13001
    clj13001 committed Feb 21, 2017
    Copy the full SHA
    3b4bc36 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2017

  1. Yay!

    @clj13001
    clj13001 committed Feb 23, 2017
    Copy the full SHA
    b872a75 View commit details
    Browse the repository at this point in the history

  2. Some minor modal changes to return page.

    @clj13001
    clj13001 committed Feb 23, 2017
    Copy the full SHA
    ded7118 View commit details
    Browse the repository at this point in the history

  3. Typo in the Database 

    Tabet. -_-
    @clj13001
    clj13001 committed Feb 23, 2017
    Copy the full SHA
    e41e62e View commit details
    Browse the repository at this point in the history

  4. Shop.jsp can now communicate with the dataabase! Yay! 

    Submitting the form does not do everything it needs to do with tables yet. There is a good deal of polishing and refactoring to now too.
    @arc12012
    arc12012 committed Feb 23, 2017
    Copy the full SHA
    8448e1c View commit details
    Browse the repository at this point in the history

  5. DB changes 

    Also some code clean up :)
    @clj13001
    clj13001 committed Feb 23, 2017
    Copy the full SHA
    1193551 View commit details
    Browse the repository at this point in the history

  6. Refactoring 

    Hopefully won't mess with what anyone else is doing
    @arc12012
    arc12012 committed Feb 23, 2017
    Copy the full SHA
    0a35b90 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2017

  1. Merge branch 'master' of 

    https://github.uconn.edu/arc12012/2017-CSE-Senior-Project-Team-2.git

Conflicts:
	pom.xml
    @jic13003
    jic13003 committed Feb 24, 2017
    Copy the full SHA
    edaca2a View commit details
    Browse the repository at this point in the history

  2. test commit to remove whatever the fuck I did earlier

    @jic13003
    jic13003 committed Feb 24, 2017
    Copy the full SHA
    00da908 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'refs/remotes/origin/master' into Connor… 

    …s-Branch
    @clj13001
    clj13001 committed Feb 24, 2017
    Copy the full SHA
    bb28f4d View commit details
    Browse the repository at this point in the history

  4. Adding pom file back

    @clj13001
    clj13001 committed Feb 24, 2017
    Copy the full SHA
    7f7fee9 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #27 from arc12012/Connors-Branch 

    Connors branch
    @clj13001
    clj13001 committed Feb 24, 2017
    Copy the full SHA
    e8c597f View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'refs/remotes/origin/master' into 

    John's-Branch

# Conflicts:
#	WebContent/html/javascript/listing.jsp
    @jic13003
    jic13003 committed Feb 24, 2017
    Copy the full SHA
    f72173c View commit details
    Browse the repository at this point in the history

  7. got the listed devices page to show all devices

    @jic13003
    jic13003 committed Feb 24, 2017
    Copy the full SHA
    fb681c7 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #28 from arc12012/John's-Branch 

    John's branch
    @clj13001
    clj13001 committed Feb 24, 2017
    Copy the full SHA
    f4ec3d2 View commit details
    Browse the repository at this point in the history

  9. Image functionality fixed on Device Listing

    @clj13001
    clj13001 committed Feb 24, 2017
    Copy the full SHA
    44bb506 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2017

  1. Autofill correctly parses phone number and location

    @arc12012
    arc12012 committed Feb 27, 2017
    Copy the full SHA
    8a971dd View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2017

  1. Initial commit 

    Ideas are conceptualized, no testing done yet. May the debugging
commence!
    @clj13001
    clj13001 committed Mar 1, 2017
    Copy the full SHA
    e2b5cf5 View commit details
    Browse the repository at this point in the history

  2. Forgot the most important part! 

    Can't update database without a query. 😄
    @clj13001
    clj13001 committed Mar 1, 2017
    Copy the full SHA
    0454577 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2017

  1. Commas added in places. 

    Trying to switch branches. >_>
    @clj13001
    clj13001 committed Mar 2, 2017
    Copy the full SHA
    8e9343c View commit details
    Browse the repository at this point in the history

  2. THINGS RETURN 

    WOW :squirrel:
    @clj13001
    clj13001 committed Mar 2, 2017
    Copy the full SHA
    9d531f9 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2017

  1. Navbar generation was missing on the Completion page.

    @clj13001
    clj13001 committed Mar 3, 2017
    Copy the full SHA
    b7de000 View commit details
    Browse the repository at this point in the history

  2. nonfunctional commit because last time I changed branches without com… 

    …miting I messed up with stashing and lost my work :p
    @arc12012
    arc12012 committed Mar 3, 2017
    Copy the full SHA
    20d27ab View commit details
    Browse the repository at this point in the history

  3. availability done, most local code removed

    @jic13003
    jic13003 committed Mar 3, 2017
    Copy the full SHA
    884e613 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2017

  1. the listing page filtering works, shoutouts to adam for the help

    @jic13003
    jic13003 committed Mar 6, 2017
    Copy the full SHA
    2c43d0b View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2017

  1. New text fields for address. Ticket generation is very close to worki… 

    …ng; only the location part of the ticket is ignored. That's what the new text fields are for, and once I get them behaving as desired I'll be able to finish ticket generating.

Changed link in navbar to direct to /2017-CSE-Senior-Project-Team-2/html/webpages/ instead of /2017-CSE-Senior-Project-Team-2/html/webpages/index.html. Apache will find the index.* file if it exists there, and I have been using index.jsp.
    @arc12012
    arc12012 committed Mar 15, 2017
    Copy the full SHA
    b7bddb4 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2017

  1. Autofill updated for new address filds and location dropdown.

    @arc12012
    arc12012 committed Mar 17, 2017
    Copy the full SHA
    8b3cc0b View commit details
    Browse the repository at this point in the history

  2. Added calendar selector-that was easier than I thought. 

    Needs some css love, and a way to include data from the new fields when generating tickets.
    @arc12012
    arc12012 committed Mar 17, 2017
    Copy the full SHA
    58f881b View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2017

  1. Should now be generating a new location if needed-database needs adju… 

    …stment though.

I'm storing dates as milliseconds, which don't fit as varchars. Also need to add user ID column to location table
    @arc12012
    arc12012 committed Mar 18, 2017
    Copy the full SHA
    9847360 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2017

  1. Location Admin Page Complete

    @clj13001
    clj13001 committed Mar 21, 2017
    Copy the full SHA
    c5339d6 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2017

  1. Database changes 

    Uses pivotal instead of local db, and also connections are closed when finished
    Adam Claxton authored and Adam Claxton committed Mar 22, 2017
    Copy the full SHA
    2b31f6a View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2017

  1. New location from order form now 'works' 

    I haven't included a way to name the new location, yet. But the feature does work. Also ordering multiple devices works
    Adam Claxton authored and Adam Claxton committed Mar 23, 2017
    Copy the full SHA
    14a49ee View commit details
    Browse the repository at this point in the history

  2. Ticket generation incorporates return date 

    Added Return_Date field to the ticket table. Presumably, the corresponding field
will be updated in the device table when admin approves request, but for that to
happen it will need to be able to read from somewhere. The 'date' selector provides
dates as a simple "dd-mm-yyyy" string, so I just stored it that way. Given that it
would probably be better if I just store the other dates as simple string; I will probably do that
    Adam Claxton authored and Adam Claxton committed Mar 23, 2017
    Copy the full SHA
    d9b7509 View commit details
    Browse the repository at this point in the history

  3. Login Page Stuffs with Cookies

    Brianna authored and Brianna committed Mar 23, 2017
    Copy the full SHA
    316f9ad View commit details
    Browse the repository at this point in the history

  4. Conflict fix on MySQLAccess

    @clj13001
    clj13001 committed Mar 23, 2017
    Copy the full SHA
    00e01db View commit details
    Browse the repository at this point in the history

  5. Merge pull request #31 from arc12012/BriBranch 

    Login Page Stuffs with Cookies
    @clj13001
    clj13001 committed Mar 23, 2017
    Copy the full SHA
    0b38350 View commit details
    Browse the repository at this point in the history

  6. request page done, localstorage issue fixed

    @jic13003
    jic13003 committed Mar 23, 2017
    Copy the full SHA
    cf6a423 View commit details
    Browse the repository at this point in the history

  7. merge conflict fixed

    @jic13003
    jic13003 committed Mar 23, 2017
    Copy the full SHA
    74a2129 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #32 from arc12012/John's-Super-Fun-Branch 

    John's super fun branch
    @jic13003
    jic13003 committed Mar 23, 2017
    Copy the full SHA
    cf16ef8 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #33 from arc12012/Connor-Branch 

    Connor branch
    @clj13001
    clj13001 committed Mar 23, 2017
    Copy the full SHA
    c725b69 View commit details
    Browse the repository at this point in the history

  10. I dunno why this wasn't committed

    Adam Claxton authored and Adam Claxton committed Mar 23, 2017
    Copy the full SHA
    0d0c471 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2017

  1. Large conflict resolved

    @clj13001
    clj13001 committed Mar 24, 2017
    Copy the full SHA
    4c816e1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #30 from arc12012/Client 

    Client
    @clj13001
    clj13001 committed Mar 24, 2017
    Copy the full SHA
    08176ab View commit details
    Browse the repository at this point in the history

  3. Multiple Important Changes 

    Making sure everything works after the amazing great merge.
    @clj13001
    clj13001 committed Mar 24, 2017
    Copy the full SHA
    0a91d1b View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2017

  1. Cookies, yay! 

    Also several bugfixes on shoppingcart page
    @arc12012
    arc12012 committed Mar 30, 2017
    Copy the full SHA
    d983b8d View commit details
    Browse the repository at this point in the history

  2. removed debug alert

    @arc12012
    arc12012 committed Mar 30, 2017
    Copy the full SHA
    9bcea10 View commit details
    Browse the repository at this point in the history

  3. Shopping cart locations properly make use of employee flags when read… 

    …ing from and writing to db
    @arc12012
    arc12012 committed Mar 30, 2017
    Copy the full SHA
    1e34125 View commit details
    Browse the repository at this point in the history

  4. Shoppingcart popop has a functionless location name field and date in… 

    …put looks nicer
    @arc12012
    arc12012 committed Mar 30, 2017
    Copy the full SHA
    af11bb7 View commit details
    Browse the repository at this point in the history

  5. Loc name autofills now 

    I'm pretty happy with the shoppingcart UI
    @arc12012
    arc12012 committed Mar 30, 2017
    Copy the full SHA
    f75d22c View commit details
    Browse the repository at this point in the history

  6. And now location names from the name field are stored! That's it for … 

    …tonight

Also fixed bug that made city name always null.

Note: Current database varchar is not big enough to hold the name 'Lake Char­gogg­a­gogg­man­chaugg­a­gogg­chau­bun­a­gung­a­maugg', must fix
    @arc12012
    arc12012 committed Mar 30, 2017
    Copy the full SHA
    bc2bd0c View commit details
    Browse the repository at this point in the history

  7. Quick Fixes to Admin Location Stylings

    @clj13001
    clj13001 committed Mar 30, 2017
    Copy the full SHA
    e76b5f9 View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'refs/remotes/origin/master' into Jcoona… 

    …Branch
    @clj13001
    clj13001 committed Mar 30, 2017
    Copy the full SHA
    330020e View commit details
    Browse the repository at this point in the history

  9. New files

    @clj13001
    clj13001 committed Mar 30, 2017
    Copy the full SHA
    f256d44 View commit details
    Browse the repository at this point in the history

  10. Working off of One Device Class

    @clj13001
    clj13001 committed Mar 30, 2017
    Copy the full SHA
    e8e507c View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2017

  1. Switching Branch 

    Still need to do work
    @clj13001
    clj13001 committed Mar 31, 2017
    Copy the full SHA
    3dc05cc View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2017

  1. So much refactoring 

    MySQLAccess is now split up into many smaller classes in the database
package, and I updated all MySQLAccess references to the appropriate new
class.

Killed navbar.js. All .html pages are now .jsp pages so that they can
<%@include file navbar.html%>
    @arc12012
    arc12012 committed Apr 1, 2017
    Copy the full SHA
    7b24880 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.uconn.edu/arc12012/2017-CSE-S… 

    …enior-Project-Team-2
    @arc12012
    arc12012 committed Apr 1, 2017
    Copy the full SHA
    4ac508d View commit details
    Browse the repository at this point in the history

  3. Device Settings Update

    @clj13001
    clj13001 committed Apr 1, 2017
    Copy the full SHA
    d91a2ae View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'refs/remotes/origin/master' into Jcoona… 

    …Branch
    @clj13001
    clj13001 committed Apr 1, 2017
    Copy the full SHA
    9c166a8 View commit details
    Browse the repository at this point in the history

  5. Device Settings Page Now Works.

    @clj13001
    clj13001 committed Apr 1, 2017
    Copy the full SHA
    f397ee9 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2017

  1. Listing page internal filtering reorganized somewhat in preperation f… 

    …or search function

Added fuzzy.js search library and empty search bar
    @arc12012
    arc12012 committed Apr 4, 2017
    Copy the full SHA
    580244e View commit details
    Browse the repository at this point in the history

  2. Search works, horray! (only for device names right now)

    @arc12012
    arc12012 committed Apr 4, 2017
    Copy the full SHA
    0455983 View commit details
    Browse the repository at this point in the history

  3. Fixed 'other' filter bug on listing page

    @arc12012
    arc12012 committed Apr 4, 2017
    Copy the full SHA
    991fb38 View commit details
    Browse the repository at this point in the history

  4. Search feature introduced to request page 

    Also applied 'other' bugfix to request page
    @arc12012
    arc12012 committed Apr 4, 2017
    Copy the full SHA
    a588daa View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2017

  1. Merge remote-tracking branch 'refs/remotes/origin/master' into Jcoona… 

    …Branch
    @clj13001
    clj13001 committed Apr 5, 2017
    Copy the full SHA
    0e5d59b View commit details
    Browse the repository at this point in the history

  2. A couple adjusting changes

    @clj13001
    clj13001 committed Apr 5, 2017
    Copy the full SHA
    8b460df View commit details
    Browse the repository at this point in the history

  3. Merge pull request #76 from arc12012/JcoonaBranch 

    Jcoona branch
    @clj13001
    clj13001 committed Apr 5, 2017
    Copy the full SHA
    f93a61c View commit details
    Browse the repository at this point in the history

  4. Shoopingcart order popup-location name field hidden instead of disabled

    @arc12012
    arc12012 committed Apr 5, 2017
    Copy the full SHA
    1843b38 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.uconn.edu/arc12012/2017-CSE-S… 

    …enior-Project-Team-2
    @arc12012
    arc12012 committed Apr 5, 2017
    Copy the full SHA
    d112d8c View commit details
    Browse the repository at this point in the history

  6. Search feature introduced to adimin device edit page-currently search… 

    …es only by name

Hopefully soon it will include more fields in its search
    @arc12012
    arc12012 committed Apr 5, 2017
    Copy the full SHA
    8e8baf3 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2017

  1. Bug pushes

    @clj13001
    clj13001 committed Apr 6, 2017
    Copy the full SHA
    eeb1fcd View commit details
    Browse the repository at this point in the history

  2. Search works across multiple fields, hooray!

    @arc12012
    arc12012 committed Apr 6, 2017
    Copy the full SHA
    523a88e View commit details
    Browse the repository at this point in the history

  3. More bug fixes

    @clj13001
    clj13001 committed Apr 6, 2017
    Copy the full SHA
    8a01c2c View commit details
    Browse the repository at this point in the history

  4. Enhancements and Bug Fixes

    @clj13001
    clj13001 committed Apr 6, 2017
    Copy the full SHA
    5590ded View commit details
    Browse the repository at this point in the history

  5. Admin device search now indexes serial number

    @arc12012
    arc12012 committed Apr 6, 2017
    Copy the full SHA
    a3dbda4 View commit details
    Browse the repository at this point in the history

  6. Accept Tickets -- tickets still need to be viewable

    Brianna authored and Brianna committed Apr 6, 2017
    Copy the full SHA
    8449075 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2017

  1. Approval Page Works

    @clj13001
    clj13001 committed Apr 7, 2017
    Copy the full SHA
    f295c71 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #83 from arc12012/ApproveRejectTickets 

    Approve reject tickets
    @clj13001
    clj13001 committed Apr 7, 2017
    Copy the full SHA
    70f9441 View commit details
    Browse the repository at this point in the history

  3. Quickfix

    @clj13001
    clj13001 committed Apr 7, 2017
    Copy the full SHA
    36ab9f9 View commit details
    Browse the repository at this point in the history

  4. Merge Resolution

    @clj13001
    clj13001 committed Apr 7, 2017
    Copy the full SHA
    b56d511 View commit details
    Browse the repository at this point in the history

  5. Quick fix

    @clj13001
    clj13001 committed Apr 7, 2017
    Copy the full SHA
    86a6a38 View commit details
    Browse the repository at this point in the history

  6. BETA IS READY

    @clj13001
    clj13001 committed Apr 7, 2017
    Copy the full SHA
    7b2f796 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #84 from arc12012/bug 

    Bug
    @clj13001
    clj13001 committed Apr 7, 2017
    Copy the full SHA
    627c3c7 View commit details
    Browse the repository at this point in the history

  8. Quick Formatting Updates For Tomorrow's Showoff

    @clj13001
    clj13001 committed Apr 7, 2017
    Copy the full SHA
    8c4f20b View commit details
    Browse the repository at this point in the history

  9. OK, I lied. THIS is ready for beta.

    @clj13001
    clj13001 committed Apr 7, 2017
    Copy the full SHA
    7324e4e View commit details
    Browse the repository at this point in the history

  10. Recovering Files

    @clj13001
    clj13001 committed Apr 7, 2017
    Copy the full SHA
    0963edf View commit details
    Browse the repository at this point in the history

  11. Fixed servlet-api.jar problem

    @clj13001
    clj13001 committed Apr 7, 2017
    Copy the full SHA
    79f8a7f View commit details
    Browse the repository at this point in the history

  12. bar graph added, edits to pie chart

    @jic13003
    jic13003 committed Apr 7, 2017
    Copy the full SHA
    2313810 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2017

  1. Profile Settings Page now Updates

    @clj13001
    clj13001 committed Apr 11, 2017
    Copy the full SHA
    4da198f View commit details
    Browse the repository at this point in the history

  2. User Automatic Logout 

    If a user is idle on the system it will now automatically log them out
and redirect them to the login page, rather than a crummy error page.
    @clj13001
    clj13001 committed Apr 11, 2017
    Copy the full SHA
    66dd230 View commit details
    Browse the repository at this point in the history

  3. Shopping cart form should be better now

    @arc12012
    arc12012 committed Apr 11, 2017
    Copy the full SHA
    0a919e1 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2017

  1. Update CREDITS.md

    @clj13001
    clj13001 committed Apr 12, 2017
    Copy the full SHA
    31dc822 View commit details
    Browse the repository at this point in the history

  2. Error Page Exists Now

    @clj13001
    clj13001 committed Apr 12, 2017
    Copy the full SHA
    9efc228 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'refs/remotes/origin/master' into bugs

    @clj13001
    clj13001 committed Apr 12, 2017
    Copy the full SHA
    bdf9cd4 View commit details
    Browse the repository at this point in the history

  4. Doesn't Force Login If You're Already Logged In 

    👌
    @clj13001
    clj13001 committed Apr 12, 2017
    Copy the full SHA
    cb9e346 View commit details
    Browse the repository at this point in the history

  5. Update CREDITS.md

    @clj13001
    clj13001 committed Apr 12, 2017
    Copy the full SHA
    22b7d3d View commit details
    Browse the repository at this point in the history

  6. Handling MySQL Errors 

    Max User Connections problem should be really fixed at this point. You
also cannot delete a location unless no devices/employees are there.
There is now a "something went wrong!" page in case someone works around
that.
    @clj13001
    clj13001 committed Apr 12, 2017
    Copy the full SHA
    f6a8c2e View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'refs/remotes/origin/master' into bugs

    @clj13001
    clj13001 committed Apr 12, 2017
    Copy the full SHA
    8bfbed6 View commit details
    Browse the repository at this point in the history

  8. Enhancements annd Bugs

    @clj13001
    clj13001 committed Apr 12, 2017
    Copy the full SHA
    2afb2eb View commit details
    Browse the repository at this point in the history

  9. Color changes

    @clj13001
    clj13001 committed Apr 12, 2017
    Copy the full SHA
    2dbdb55 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2017

  1. Merge pull request #111 from arc12012/bugs 

    Bugs
    @clj13001
    clj13001 committed Apr 13, 2017
    Copy the full SHA
    7535ac3 View commit details
    Browse the repository at this point in the history

  2. just saving progress

    @arc12012
    arc12012 committed Apr 13, 2017
    Copy the full SHA
    c4c90bc View commit details
    Browse the repository at this point in the history

  3. Redirect wasn't quite working 

    It's all good now
    @clj13001
    clj13001 committed Apr 13, 2017
    Copy the full SHA
    8da70d8 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'refs/remotes/origin/master' into bugs

    @clj13001
    clj13001 committed Apr 13, 2017
    Copy the full SHA
    6fd0ac4 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #112 from arc12012/bugs 

    Bugs
    @clj13001
    clj13001 committed Apr 13, 2017
    Copy the full SHA
    f22f1a4 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.uconn.edu/arc12012/2017-CSE-S… 

    …enior-Project-Team-2 into email
    @arc12012
    arc12012 committed Apr 13, 2017
    Copy the full SHA
    3a6b8ae View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of https://github.uconn.edu/arc12012/2017-CSE-S… 

    …enior-Project-Team-2 into email
    @arc12012
    arc12012 committed Apr 13, 2017
    Copy the full SHA
    f75fc9a View commit details
    Browse the repository at this point in the history

  8. I'm just testing something 

    This shouldn't interfere with anything anyone else is doing
    @arc12012
    arc12012 committed Apr 13, 2017
    Copy the full SHA
    21cf687 View commit details
    Browse the repository at this point in the history

  9. Testing a diff tool...

    @arc12012
    arc12012 committed Apr 13, 2017
    Copy the full SHA
    f9919e9 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' into email

    @arc12012
    arc12012 committed Apr 13, 2017
    Copy the full SHA
    630efae View commit details
    Browse the repository at this point in the history

  11. still testing

    @arc12012
    arc12012 committed Apr 13, 2017
    Copy the full SHA
    3de6d7c View commit details
    Browse the repository at this point in the history

  12. test

    @arc12012
    arc12012 committed Apr 13, 2017
    Copy the full SHA
    6b8d995 View commit details
    Browse the repository at this point in the history

  13. test

    @arc12012
    arc12012 committed Apr 13, 2017
    Copy the full SHA
    da57b00 View commit details
    Browse the repository at this point in the history

  14. Merge remote-tracking branch 'refs/remotes/origin/master' into bugs

    @clj13001
    clj13001 committed Apr 13, 2017
    Copy the full SHA
    7db2471 View commit details
    Browse the repository at this point in the history

  15. Removing buggy script

    @clj13001
    clj13001 committed Apr 13, 2017
    Copy the full SHA
    146a0b6 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'search' into email

    @arc12012
    arc12012 committed Apr 13, 2017
    Copy the full SHA
    6c94b95 View commit details
    Browse the repository at this point in the history

  17. Formatting of Statistics Page

    @clj13001
    clj13001 committed Apr 13, 2017
    Copy the full SHA
    fb62bfc View commit details
    Browse the repository at this point in the history

  18. Merging Support

    @clj13001
    clj13001 committed Apr 13, 2017
    Copy the full SHA
    722b0ba View commit details
    Browse the repository at this point in the history

  19. Merge pull request #113 from arc12012/John's-Branch 

    John's branch
    @clj13001
    clj13001 committed Apr 13, 2017
    Copy the full SHA
    383bda4 View commit details
    Browse the repository at this point in the history

  20. Merge branch 'master' of https://github.uconn.edu/arc12012/2017-CSE-S… 

    …enior-Project-Team-2
    @arc12012
    arc12012 committed Apr 13, 2017
    Copy the full SHA
    875b24f View commit details
    Browse the repository at this point in the history

  21. Text Edits

    @clj13001
    clj13001 committed Apr 13, 2017
    Copy the full SHA
    f9938ca View commit details
    Browse the repository at this point in the history

  22. Merge branch 'master' of https://github.uconn.edu/arc12012/2017-CSE-S… 

    …enior-Project-Team-2
    @arc12012
    arc12012 committed Apr 13, 2017
    Copy the full SHA
    5aaf946 View commit details
    Browse the repository at this point in the history

  23. Another... text ... fix 

    My spelling is atrocious, at least my vocab isnt
    @clj13001
    clj13001 committed Apr 13, 2017
    Copy the full SHA
    d655898 View commit details
    Browse the repository at this point in the history

  24. Added Mail class which can send an email from my gmail account 

    Needs some work to be able to send messeges relevant to the project, and propbably needs modification to work with Synchrony's email.

Classpath was modified to include new libraries

Shopping cart remove all items messege fixed
    @arc12012
    arc12012 committed Apr 13, 2017
    Copy the full SHA
    92401ab View commit details
    Browse the repository at this point in the history

  25. Merge branch 'master' of https://github.uconn.edu/arc12012/2017-CSE-S… 

    …enior-Project-Team-2
    @arc12012
    arc12012 committed Apr 13, 2017
    Copy the full SHA
    fb495d4 View commit details
    Browse the repository at this point in the history

  26. Merge branch 'email'

    @arc12012
    arc12012 committed Apr 13, 2017
    Copy the full SHA
    ab2b332 View commit details
    Browse the repository at this point in the history

  27. Merge remote-tracking branch 'refs/remotes/origin/master' into bugs

    @clj13001
    clj13001 committed Apr 13, 2017
    Copy the full SHA
    99edea5 View commit details
    Browse the repository at this point in the history

  28. Logout Button Is Functional 

    That was NOT fun.
    @clj13001
    clj13001 committed Apr 13, 2017
    Copy the full SHA
    a792c6f View commit details
    Browse the repository at this point in the history

  29. Merge remote-tracking branch 'refs/remotes/origin/master' into bugs

    @clj13001
    clj13001 committed Apr 13, 2017
    Copy the full SHA
    fd8abc7 View commit details
    Browse the repository at this point in the history

  30. Switch branches

    @clj13001
    clj13001 committed Apr 13, 2017
    Copy the full SHA
    87230c7 View commit details
    Browse the repository at this point in the history

  31. Quick fix

    @clj13001
    clj13001 committed Apr 13, 2017
    Copy the full SHA
    c4ec0a7 View commit details
    Browse the repository at this point in the history

  32. Merge remote-tracking branch 'refs/remotes/origin/master' into bugs

    @clj13001
    clj13001 committed Apr 13, 2017
    Copy the full SHA
    2b0ecdc View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2017

  1. Admins are now forced to change their password upon first login

    @clj13001
    clj13001 committed Apr 14, 2017
    Copy the full SHA
    2a37d1e View commit details
    Browse the repository at this point in the history

  2. These got missed in the last commit

    @clj13001
    clj13001 committed Apr 14, 2017
    Copy the full SHA
    924f70e View commit details
    Browse the repository at this point in the history

  3. Merge pull request #122 from arc12012/bugs 

    Bugs
    @clj13001
    clj13001 committed Apr 14, 2017
    Copy the full SHA
    9323536 View commit details
    Browse the repository at this point in the history

  4. Adds logout feature. Users must now input a 9 digit SSO number.

    Brianna authored and Brianna committed Apr 14, 2017
    Copy the full SHA
    6ccd07a View commit details
    Browse the repository at this point in the history

  5. This page needs to be updated.

    Brianna authored and Brianna committed Apr 14, 2017
    Copy the full SHA
    1d19e52 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'refs/remotes/origin/master' into bugs

    @clj13001
    clj13001 committed Apr 14, 2017
    Copy the full SHA
    0a58ded View commit details
    Browse the repository at this point in the history

  7. MD5 Hash added for admin passwords

    Brianna authored and Brianna committed Apr 14, 2017
    Copy the full SHA
    ffe983b View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'refs/remotes/origin/master' into John's… 

    …-Branch
    @clj13001
    clj13001 committed Apr 14, 2017
    Copy the full SHA
    76ba1c7 View commit details
    Browse the repository at this point in the history

  9. Conflict resolution

    @clj13001
    clj13001 committed Apr 14, 2017
    Copy the full SHA
    410de8b View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2017

  1. Website Reorganization 

    Files are more organized now
    @clj13001
    clj13001 committed Apr 15, 2017
    Copy the full SHA
    048eabc View commit details
    Browse the repository at this point in the history

  2. Merge pull request #125 from arc12012/loginbugs 

    Loginbugs
    @clj13001
    clj13001 committed Apr 15, 2017
    Copy the full SHA
    b77ee75 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2017

  1. fixed pie chart to show umbrella terms

    @jic13003
    jic13003 committed Apr 16, 2017
    Copy the full SHA
    367c4d9 View commit details
    Browse the repository at this point in the history

  2. Restructured Mail.java a bit and added ticket confirmation email temp… 

    …late
    @arc12012
    arc12012 committed Apr 16, 2017
    Copy the full SHA
    20f7ba5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.uconn.edu/arc12012/2017-CSE-S… 

    …enior-Project-Team-2 into email
    @arc12012
    arc12012 committed Apr 16, 2017
    Copy the full SHA
    488daa8 View commit details
    Browse the repository at this point in the history

  4. A messege is constructed and sent to the client (still through gmail)… 

    … when ordering devices.
    @arc12012
    arc12012 committed Apr 16, 2017
    Copy the full SHA
    e6c1f94 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2017

  1. Made a Notification settings form on the profile page, which doesn't … 

    …do anything yet.

Gave Users a notificationPreferences integer attribute
    @arc12012
    arc12012 committed Apr 17, 2017
    Copy the full SHA
    3b4e711 View commit details
    Browse the repository at this point in the history

  2. fixed up statistics to match changes mentioned by zach

    @jic13003
    jic13003 committed Apr 17, 2017
    Copy the full SHA
    1d04f5a View commit details
    Browse the repository at this point in the history

  3. Modified return, request, and listing to support mouseover

    @jic13003
    jic13003 committed Apr 17, 2017
    Copy the full SHA
    467eeaf View commit details
    Browse the repository at this point in the history

  4. fixed a problem with other manufacturer in request, fixed listing popup

    @jic13003
    jic13003 committed Apr 17, 2017
    Copy the full SHA
    6cb7e19 View commit details
    Browse the repository at this point in the history

  5. Quick fix

    @clj13001
    clj13001 committed Apr 17, 2017
    Copy the full SHA
    f3f5b1c View commit details
    Browse the repository at this point in the history

  6. Introducing the notification queue 

    It will one day be able to consolidate recent several events to notify users about into a single email.

Right now it's an untested system.out.println(), but we'll get there.
    @arc12012
    arc12012 committed Apr 17, 2017
    Copy the full SHA
    b473947 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of https://github.uconn.edu/arc12012/2017-CSE-S… 

    …enior-Project-Team-2
    @arc12012
    arc12012 committed Apr 17, 2017
    Copy the full SHA
    8663d5d View commit details
    Browse the repository at this point in the history

  8. Couple temp fixes

    @clj13001
    clj13001 committed Apr 17, 2017
    Copy the full SHA
    d2f31f3 View commit details
    Browse the repository at this point in the history

  9. Committing to get to master.

    @clj13001
    clj13001 committed Apr 17, 2017
    Copy the full SHA
    ff35a4c View commit details
    Browse the repository at this point in the history

  10. merging

    @clj13001
    clj13001 committed Apr 17, 2017
    Copy the full SHA
    bc54fee View commit details
    Browse the repository at this point in the history

  11. Merge pull request #132 from arc12012/John's-Branch 

    John's branch
    @clj13001
    clj13001 committed Apr 17, 2017
    Copy the full SHA
    8dda270 View commit details
    Browse the repository at this point in the history

  12. Merge remote-tracking branch 'refs/remotes/origin/master' into bugs

    @clj13001
    clj13001 committed Apr 17, 2017
    Copy the full SHA
    dd292c9 View commit details
    Browse the repository at this point in the history

  13. Device Hub now supports some extra fields

    @clj13001
    clj13001 committed Apr 17, 2017
    Copy the full SHA
    b33a427 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2017

  1. Replaced my personal email with a dummy email so everyone can get ema… 

    …ils now
    @arc12012
    arc12012 committed Apr 18, 2017
    Copy the full SHA
    734d223 View commit details
    Browse the repository at this point in the history

  2. Latitude and Longitude Support

    @clj13001
    clj13001 committed Apr 18, 2017
    Copy the full SHA
    a8b1ed8 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #135 from arc12012/bugs 

    Bugs
    @clj13001
    clj13001 committed Apr 18, 2017
    Copy the full SHA
    bb2dd4a View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2017

  1. Extremely Important Bug Fixes 

    Lets hope Max Questions stops bugging out.
    @clj13001
    clj13001 committed Apr 19, 2017
    Copy the full SHA
    1592e3f View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'refs/remotes/origin/master' into bugs

    @clj13001
    clj13001 committed Apr 19, 2017
    Copy the full SHA
    28ea1d8 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #138 from arc12012/bugs 

    Bugs
    @clj13001
    clj13001 committed Apr 19, 2017
    Copy the full SHA
    c57bb5b View commit details
    Browse the repository at this point in the history

  4. Device Redirect fix and database sql file

    @arc12012
    arc12012 committed Apr 19, 2017
    Copy the full SHA
    a043509 View commit details
    Browse the repository at this point in the history

  5. Fixed a properties error I caused eariler

    @arc12012
    arc12012 committed Apr 19, 2017
    Copy the full SHA
    791e43d View commit details
    Browse the repository at this point in the history

  6. max_user_questions. Guess I'm done for tonight. 

    The concept behing my notification queue works, now it just needs to get information needed to compose a summary email.
That's where the database is giving me trouble. I reduced the number of queries it needs to run, but haven't been able to test yet.
We'll see if it works later.  ¯\_(ツ)_/¯
    @arc12012
    arc12012 committed Apr 19, 2017
    Copy the full SHA
    c474ccc View commit details
    Browse the repository at this point in the history

  7. More bug fixes

    @clj13001
    clj13001 committed Apr 19, 2017
    Copy the full SHA
    58df8d6 View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'refs/remotes/origin/master' into bugs

    @clj13001
    clj13001 committed Apr 19, 2017
    Copy the full SHA
    af9ba3d View commit details
    Browse the repository at this point in the history

  9. Reducing queries via navbar

    @clj13001
    clj13001 committed Apr 19, 2017
    Copy the full SHA
    16d0493 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #140 from arc12012/bugs 

    Bugs
    @clj13001
    clj13001 committed Apr 19, 2017
    Copy the full SHA
    d7bbcda View commit details
    Browse the repository at this point in the history

  11. Merge remote-tracking branch 'refs/remotes/origin/master' into bugs

    @clj13001
    clj13001 committed Apr 19, 2017
    Copy the full SHA
    0ec07ba View commit details
    Browse the repository at this point in the history

  12. New Users Can Be Created Now

    @clj13001
    clj13001 committed Apr 19, 2017
    Copy the full SHA
    1cc8784 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #142 from arc12012/bugs 

    Bugs
    @clj13001
    clj13001 committed Apr 19, 2017
    Copy the full SHA
    49d3dbe View commit details
    Browse the repository at this point in the history

  14. The notification queue works!!!! 

    Now I just need to make notification preferences actually editable, make the reject email and then figure out what emails need to be sent to admins.
    @arc12012
    arc12012 committed Apr 19, 2017
    Copy the full SHA
    c77c2df View commit details
    Browse the repository at this point in the history

  15. Merge branch 'email'

    @arc12012
    arc12012 committed Apr 19, 2017
    Copy the full SHA
    ef21eba View commit details
    Browse the repository at this point in the history

  16. site change

    @clj13001
    clj13001 committed Apr 19, 2017
    Copy the full SHA
    55c5997 View commit details
    Browse the repository at this point in the history

  17. Merge remote-tracking branch 'refs/remotes/origin/master' into bugs

    @clj13001
    clj13001 committed Apr 19, 2017
    Copy the full SHA
    9dc2fc1 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2017

  1. Introduced notification settings display bug 

    Also tied notification settings gui to db notification settings
    @arc12012
    arc12012 committed Apr 20, 2017
    Copy the full SHA
    ba78b24 View commit details
    Browse the repository at this point in the history

  2. Fixed bugs from previous commit. Notification preferences work now, j… 

    …ust look bad.
    @arc12012
    arc12012 committed Apr 20, 2017
    Copy the full SHA
    64ae85a View commit details
    Browse the repository at this point in the history

  3. Ticket rejection emails have been implemented. Client email notificat… 

    …ion system finished?

Could definitely use polishing, but the functionality is there. Now for admin emails...
    @arc12012
    arc12012 committed Apr 20, 2017
    Copy the full SHA
    5e8ed1e View commit details
    Browse the repository at this point in the history

  4. Buggy admin ticket search bar; pushing to debug on desktop

    @arc12012
    arc12012 committed Apr 20, 2017
    Copy the full SHA
    08d3858 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2017

  1. Bug Fixes

    @clj13001
    clj13001 committed Apr 21, 2017
    Copy the full SHA
    d937b87 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into bugs

    @clj13001
    clj13001 committed Apr 21, 2017
    Copy the full SHA
    260aad7 View commit details
    Browse the repository at this point in the history

  3. Merge

    @clj13001
    clj13001 committed Apr 21, 2017
    Copy the full SHA
    30999b4 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #150 from arc12012/bugs 

    Bugs
    @clj13001
    clj13001 committed Apr 21, 2017
    Copy the full SHA
    e7b6682 View commit details
    Browse the repository at this point in the history

  5. Update README.md

    @clj13001
    clj13001 committed Apr 21, 2017
    Copy the full SHA
    7e61ec8 View commit details
    Browse the repository at this point in the history

  6. Obliterating Rented Device

    @clj13001
    clj13001 committed Apr 21, 2017
    Copy the full SHA
    49c6fbf View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'refs/remotes/origin/master' into bugs

    @clj13001
    clj13001 committed Apr 21, 2017
    Copy the full SHA
    1f3595a View commit details
    Browse the repository at this point in the history

  8. I have learned to hate JSON. 

    Goodnight.
    @clj13001
    clj13001 committed Apr 21, 2017
    Copy the full SHA
    684f004 View commit details
    Browse the repository at this point in the history

  9. Ticket page search bar

    @arc12012
    arc12012 committed Apr 21, 2017
    Copy the full SHA
    b9d4c85 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'search'

    @arc12012
    arc12012 committed Apr 21, 2017
    Copy the full SHA
    186a6b1 View commit details
    Browse the repository at this point in the history

  11. Made device search rainbow

    @arc12012
    arc12012 committed Apr 21, 2017
    Copy the full SHA
    c1fe6d4 View commit details
    Browse the repository at this point in the history

  12. Password Reset Functionality

    @clj13001
    clj13001 committed Apr 21, 2017
    Copy the full SHA
    fc200b4 View commit details
    Browse the repository at this point in the history

  13. Merge

    @clj13001
    clj13001 committed Apr 21, 2017
    Copy the full SHA
    f0aaa51 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #153 from arc12012/bugs 

    Bugs
    @clj13001
    clj13001 committed Apr 21, 2017
    Copy the full SHA
    527cd32 View commit details
    Browse the repository at this point in the history

  15. Merge remote-tracking branch 'refs/remotes/origin/master' into bugs

    @clj13001
    clj13001 committed Apr 21, 2017
    Copy the full SHA
    e024559 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2017

  1. Device description and admin comments are no longer indexed by search… 

    … bar; should alleviate wonky search results
    @arc12012
    arc12012 committed Apr 22, 2017
    Copy the full SHA
    1f32fe9 View commit details
    Browse the repository at this point in the history

  2. Mail method for sending new passwords, untested

    @arc12012
    arc12012 committed Apr 22, 2017
    Copy the full SHA
    409d23f View commit details
    Browse the repository at this point in the history

  3. Password Reset 

    Still needs a bit of extra work
    @clj13001
    clj13001 committed Apr 22, 2017
    Copy the full SHA
    2f8dd73 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'refs/remotes/origin/master' into bugs

    @clj13001
    clj13001 committed Apr 22, 2017
    Copy the full SHA
    2e0a4eb View commit details
    Browse the repository at this point in the history

  5. Push

    @clj13001
    clj13001 committed Apr 22, 2017
    Copy the full SHA
    d9c38d7 View commit details
    Browse the repository at this point in the history

  6. Included WAR file in project

    @arc12012
    arc12012 committed Apr 22, 2017
    Copy the full SHA
    d04db29 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #160 from arc12012/bugs 

    Bugs
    @clj13001
    clj13001 committed Apr 22, 2017
    Copy the full SHA
    16cb3b3 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' of https://github.uconn.edu/arc12012/2017-CSE-S… 

    …enior-Project-Team-2
    @arc12012
    arc12012 committed Apr 22, 2017
    Copy the full SHA
    b91d55f View commit details
    Browse the repository at this point in the history

  9. Updated WAR

    @arc12012
    arc12012 committed Apr 22, 2017
    Copy the full SHA
    c3315bb View commit details
    Browse the repository at this point in the history

  10. Quick fix

    @clj13001
    clj13001 committed Apr 22, 2017
    Copy the full SHA
    180e81a View commit details
    Browse the repository at this point in the history

  11. Error happened! :(

    @clj13001
    clj13001 committed Apr 22, 2017
    Copy the full SHA
    6341267 View commit details
    Browse the repository at this point in the history

  12. Updated WAR file

    @arc12012
    arc12012 committed Apr 22, 2017
    Copy the full SHA
    c3a9998 View commit details
    Browse the repository at this point in the history

  13. Updated WAR file

    @arc12012
    arc12012 committed Apr 22, 2017
    Copy the full SHA
    09a0749 View commit details
    Browse the repository at this point in the history

  14. quick fix ... again

    @clj13001
    clj13001 committed Apr 22, 2017
    Copy the full SHA
    1621de4 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'master' of https://github.uconn.edu/arc12012/2017-CSE-S… 

    …enior-Project-Team-2
    @arc12012
    arc12012 committed Apr 22, 2017
    Copy the full SHA
    cab1517 View commit details
    Browse the repository at this point in the history

  16. Updated WAR file

    @arc12012
    arc12012 committed Apr 22, 2017
    Copy the full SHA
    1a3e3d4 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2017

  1. Merge remote-tracking branch 'refs/remotes/origin/master' into bugs

    @clj13001
    clj13001 committed Apr 23, 2017
    Copy the full SHA
    4e02bc4 View commit details
    Browse the repository at this point in the history

  2. All Tickets Page Added

    @clj13001
    clj13001 committed Apr 23, 2017
    Copy the full SHA
    a8fac9c View commit details
    Browse the repository at this point in the history

  3. Shopping cart touch ups 

    Submit button is disabled when nothing is selected. Return defaults to today.

Request page shows all devices by default
    @arc12012
    arc12012 committed Apr 23, 2017
    Copy the full SHA
    abe4856 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'bugs' of https://github.uconn.edu/arc12012/2017-CSE-Sen… 

    …ior-Project-Team-2 into bugs
    @arc12012
    arc12012 committed Apr 23, 2017
    Copy the full SHA
    5493da4 View commit details
    Browse the repository at this point in the history