search

StanfordHCI / flash-teams

2 stars 0 forks source link

"Logged In" popup and polling #111

Closed tdoshi closed 10 years ago

tdoshi commented 10 years ago
negarrahmati commented 10 years ago

Great! :D

Negar

On Mon, Mar 31, 2014 at 11:46 PM, tdoshi notifications@github.com wrote:

  • Logged In popup is removed
  • Polls as soon as page is entered, so automatically refreshes on both start and end

You can merge this Pull Request by running

git pull https://github.com/StanfordHCI/flash-startups preMockIt

Or view, comment on, or merge it at:

https://github.com/StanfordHCI/flash-startups/pull/111 Commit Summary

  • Merge branches 'master' and 'bugFixin' into bugFixin
  • Merge branch 'master' into bugFixin
  • toCommit
  • Merge branch 'master' into bugFixin
  • Merge branch 'master' into bugFixin
  • link name changed and parent folder link added
  • link color change
  • kept Jay's merge conflicts
  • file's names are correct
  • main file name is correct
  • deleteFile fix
  • got rid of logged in pop-up
  • polls for start and and both

File Changes

  • A foundry/.Gemfile.swohttps://github.com/StanfordHCI/flash-startups/pull/111/files#diff-0(0)
  • A foundry/.Gemfile.swphttps://github.com/StanfordHCI/flash-startups/pull/111/files#diff-1(0)
  • A foundry/Gemfile~https://github.com/StanfordHCI/flash-startups/pull/111/files#diff-2(62)
  • M foundry/app/assets/javascripts/authoring/awareness.jshttps://github.com/StanfordHCI/flash-startups/pull/111/files#diff-3(25)
  • M foundry/app/assets/javascripts/authoring/events.jshttps://github.com/StanfordHCI/flash-startups/pull/111/files#diff-4(18)
  • M foundry/app/assets/javascripts/authoring/gdrive.jshttps://github.com/StanfordHCI/flash-startups/pull/111/files#diff-5(4)
  • M foundry/app/assets/javascripts/authoring/sidebar.jshttps://github.com/StanfordHCI/flash-startups/pull/111/files#diff-6(13)
  • A foundry/app/assets/javascripts/realtime-client-utils.jshttps://github.com/StanfordHCI/flash-startups/pull/111/files#diff-7(399)
  • M foundry/app/controllers/members_controller.rbhttps://github.com/StanfordHCI/flash-startups/pull/111/files#diff-8(2)
  • A foundry/app/views/flash_teams/auth.html.erbhttps://github.com/StanfordHCI/flash-startups/pull/111/files#diff-9(0)
  • M foundry/app/views/flash_teams/edit.html.erbhttps://github.com/StanfordHCI/flash-startups/pull/111/files#diff-10(8)
  • A foundry/client_secrets.jsonhttps://github.com/StanfordHCI/flash-startups/pull/111/files#diff-11(1)
  • A foundry/lib/google_drive/google_docs.rbhttps://github.com/StanfordHCI/flash-startups/pull/111/files#diff-12(33)

Patch Links:

Reply to this email directly or view it on GitHubhttps://github.com/StanfordHCI/flash-startups/pull/111 .

jaypatelh commented 10 years ago

You're forgetting to add your name in front of the branch name! :)

jaypatelh commented 10 years ago

Fixed some bugs with the poll function being newly placed at the beginning of the code.