Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Projectorville #30

Merged
merged 67 commits into from
Apr 7, 2016
Merged

Projectorville #30

merged 67 commits into from
Apr 7, 2016
+991 −2,757

Commits on Mar 31, 2016

  1. Switch to Chicago time

    @FifthSurprise
    FifthSurprise authored and Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    f8383f6 View commit details
    Browse the repository at this point in the history

  2. Update to chicago for real

    @FifthSurprise
    FifthSurprise authored and Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    4f4caf2 View commit details
    Browse the repository at this point in the history

  3. Disable tweeting

    @FifthSurprise
    FifthSurprise authored and Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    ea97896 View commit details
    Browse the repository at this point in the history

  4. Better message for time and update time zone to California

    @FifthSurprise
    FifthSurprise authored and Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    3c8a68f View commit details
    Browse the repository at this point in the history

  5. working through issue #33 

    added migration for games to have a localized time zone
add control for time zone in set of new time edit
next step is to add a user preference for time zone display
    @x41farmer
    x41farmer authored and Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    00cce0d View commit details
    Browse the repository at this point in the history

  6. Move country data into ticker.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    d711ee9 View commit details
    Browse the repository at this point in the history

  7. Remove Rioter / Activity section.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    f943c25 View commit details
    Browse the repository at this point in the history

  8. Move Terror Tracker to right side, make into thermometer.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    b69fd5b View commit details
    Browse the repository at this point in the history

  9. Remove left column, make middle column into left column.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    12ccbac View commit details
    Browse the repository at this point in the history

  10. Add code for making Thermometer work.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    12b2765 View commit details
    Browse the repository at this point in the history

  11. Remove old RoundProgress plugin for previous terror tracker.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    f578ca6 View commit details
    Browse the repository at this point in the history

  12. CSS Cleanup.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    801b73a View commit details
    Browse the repository at this point in the history

  13. Remove inclusion of roundProgress library.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    cd70a20 View commit details
    Browse the repository at this point in the history

  14. Improve code for Terror Thermometer.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    7b352ce View commit details
    Browse the repository at this point in the history

  15. Remove JS code for Activity and Rioters.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    925b528 View commit details
    Browse the repository at this point in the history

  16. Start handling resizing text.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    f41d9cc View commit details
    Browse the repository at this point in the history

  17. Rework country ticker to contain more information.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    c018579 View commit details
    Browse the repository at this point in the history

  18. Make Marquee work for Countries Ticker.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    5f89a5d View commit details
    Browse the repository at this point in the history

  19. Whoops I forgot to rename the function.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    aaf2533 View commit details
    Browse the repository at this point in the history

  20. General Cleanup.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    5a89248 View commit details
    Browse the repository at this point in the history

  21. General cleanup, play with Font Sizes.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    82b8e89 View commit details
    Browse the repository at this point in the history

  22. Clean up Alien class additions.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    ba2013f View commit details
    Browse the repository at this point in the history

  23. Only display one news item at a time.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    1d1152e View commit details
    Browse the repository at this point in the history

  24. Margin tweaking.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    fd094e7 View commit details
    Browse the repository at this point in the history

  25. Rewrite Ruby code to be slightly less gross than I had it.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    9fc73be View commit details
    Browse the repository at this point in the history

  26. Add "stagnation" icon for Country Income Ticker.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    052a5ba View commit details
    Browse the repository at this point in the history

  27. Remove empty file.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    1a23560 View commit details
    Browse the repository at this point in the history

  28. Clean up uses of colours.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    b37bf51 View commit details
    Browse the repository at this point in the history

  29. Remove redundant image.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    d8e3671 View commit details
    Browse the repository at this point in the history

  30. Neaten up comments.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    ba8bcfc View commit details
    Browse the repository at this point in the history

  31. Remove empty file.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    f387231 View commit details
    Browse the repository at this point in the history

  32. Rename classes for legibility.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    5c00bbd View commit details
    Browse the repository at this point in the history

  33. Refactor rubies again.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    e8aa03d View commit details
    Browse the repository at this point in the history

  34. Ruby tweaks.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    8c92749 View commit details
    Browse the repository at this point in the history

  35. Ruby tweaks.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    cb2ee4a View commit details
    Browse the repository at this point in the history

  36. Upate angularRails version.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    3ea4f08 View commit details
    Browse the repository at this point in the history

  37. Rewrite angular logic for clarity. Add in ngAnimate.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    02b02b7 View commit details
    Browse the repository at this point in the history

  38. Replace News Slideshow.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    61be20d View commit details
    Browse the repository at this point in the history

  39. Add default class to Dashboard for styling.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    168d5bc View commit details
    Browse the repository at this point in the history

  40. Renamed controller.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    a3097c6 View commit details
    Browse the repository at this point in the history

  41. Change Terror Thermometer into Terror Bar.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    01bc066 View commit details
    Browse the repository at this point in the history

  42. Cleanup. Misc little things.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    1ece99b View commit details
    Browse the repository at this point in the history

  43. Update Bower with required libraries.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    c5c0b9a View commit details
    Browse the repository at this point in the history

  44. More styling changes.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    773f01f View commit details
    Browse the repository at this point in the history

  45. Fix indenting and extra spaces.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    de27932 View commit details
    Browse the repository at this point in the history

  46. Add new background image.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    32dc969 View commit details
    Browse the repository at this point in the history

  47. Styling and layout tweaks.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    6f6885c View commit details
    Browse the repository at this point in the history

  48. Add support for vertical / horizontal media images for news.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    425704e View commit details
    Browse the repository at this point in the history

  49. Let's call this Version 1.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    43b2242 View commit details
    Browse the repository at this point in the history

  50. Adjust seed data because I forgot.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    abab0da View commit details
    Browse the repository at this point in the history

  51. Delete image placeholder.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    54fdad0 View commit details
    Browse the repository at this point in the history

  52. Include Angular manually because it hates Bower for some reason like … 

    …an asshole.
    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    2b1d45e View commit details
    Browse the repository at this point in the history

  53. Finish handling news image orientation on the front.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    ccd4b0a View commit details
    Browse the repository at this point in the history

  54. Use minified versions of Angular.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    12371ed View commit details
    Browse the repository at this point in the history

  55. Missed this during a gross merge conflict.

    Michael Pelletier committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    d0f2b4c View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2016

  1. Remove empty file.

    Michael Pelletier committed Apr 2, 2016
    Configuration menu
    Copy the full SHA
    bff3413 View commit details
    Browse the repository at this point in the history

  2. Add comment about news animation.

    Michael Pelletier committed Apr 2, 2016
    Configuration menu
    Copy the full SHA
    76f24c3 View commit details
    Browse the repository at this point in the history

  3. Rework news ticker to just be a marquee.

    Michael Pelletier committed Apr 2, 2016
    Configuration menu
    Copy the full SHA
    c31b82f View commit details
    Browse the repository at this point in the history

  4. Fix bad indenting.

    Michael Pelletier committed Apr 2, 2016
    Configuration menu
    Copy the full SHA
    0312af1 View commit details
    Browse the repository at this point in the history

  5. Remove angular CDN script tags.

    Michael Pelletier committed Apr 2, 2016
    Configuration menu
    Copy the full SHA
    63686a9 View commit details
    Browse the repository at this point in the history

  6. Move lib js files into lib folder. use minified versions. forget bower.

    Michael Pelletier committed Apr 2, 2016
    Configuration menu
    Copy the full SHA
    33ff1c7 View commit details
    Browse the repository at this point in the history

  7. Fix mistake on api_controller due to merge conflicts.

    Michael Pelletier committed Apr 2, 2016
    Configuration menu
    Copy the full SHA
    0e4844f View commit details
    Browse the repository at this point in the history

  8. Remove unminified versions.

    Michael Pelletier committed Apr 2, 2016
    Configuration menu
    Copy the full SHA
    13d2400 View commit details
    Browse the repository at this point in the history

  9. Use minified version of angular timer.

    Michael Pelletier committed Apr 2, 2016
    Configuration menu
    Copy the full SHA
    1ab12b3 View commit details
    Browse the repository at this point in the history

  10. Remove old image.

    Michael Pelletier committed Apr 2, 2016
    Configuration menu
    Copy the full SHA
    83a76e0 View commit details
    Browse the repository at this point in the history

  11. Restructure request to allow error handling. Add connection error icon.

    Michael Pelletier committed Apr 2, 2016
    Configuration menu
    Copy the full SHA
    dc32ef5 View commit details
    Browse the repository at this point in the history

  12. Add comments throughout JS.

    Michael Pelletier committed Apr 2, 2016
    Configuration menu
    Copy the full SHA
    1c22c2e View commit details
    Browse the repository at this point in the history