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.

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

GH-937 - Increasing idle period before showing the countdown to timeout. #943

Merged

ehazlett merged 13 commits into staging from gh-937

Sep 27, 2013

Contributor

jdragojevic commented Sep 27, 2013

Increased from 5 minutes to 15 minutes. Countdown still takes 120 seconds (2 minutes) before user is expired.

Looks pretty straight-forward. We should merge this.

bendk and others added some commits Sep 27, 2013


      Blind fix for #484

I'm pretty sure this should do the trick though.


      GH-937 - Increasing idle period before showing the countdown to timeout.

Increased from 5 minutes to 15 minutes. Countdown still takes 120 seconds (2 minutes) before user is expired.

f18dff2


      Merge pull request #941 from pculture/gh-484

Blind fix for #484

87ce572


      Fork languages edited in the new editor (#463)

I used Janet's suggestion of simply forking everything edited in the
new editor.

1c51eb9


      Fork dependant languages as well when edited in the new editor

aa9090a


      Added hint abut forking to the new subtitle editor template

99145d5


      there was an extra trailing " at the end of the sentence

79ae9f9


      Don't save unnecessarily in the new editor (#463)

Before we would save on approving because we wanted to mark the
subtitles complete.  Changed it so we only save if the subtitles
weren't previously completed.

bf32539


      Add more space to the old editor widget right side (#463)

This should give enough space for the open in new editor link to
display correctly.

Tried to line up the left side better with the right side as well.

6a5b425


      Bumping integration repo

This gives us the subtitle_complete data when we fetch languages from
the API.

d2e16ea


      Only fork in the new editor if the timings change (#463)

2e63811


      GH-937 - Increasing idle period before showing the countdown to timeout

Increased from 5 minutes to 15 minutes. Countdown still takes 120 seconds (2 minutes) before user is expired.
The config is split between two files, dialog.js is for the old editor, directives.js for the new.

0a0f7a5


      Merge branch 'gh-937' of https://github.com/pculture/unisubs into gh-937

93a502b

ehazlett added a commit that referenced this pull request Sep 27, 2013


      Merge pull request #943 from pculture/gh-937

GH-937 - Increasing idle period before showing the countdown to timeout.

68cffe3

ehazlett merged commit `68cffe3` into staging Sep 27, 2013

You can’t perform that action at this time.

pculture/unisubs

Join GitHub today

GH-937 - Increasing idle period before showing the countdown to timeout. #943

Conversation

jdragojevic commented Sep 27, 2013

bendk and others added some commits Sep 27, 2013

ehazlett added a commit that referenced this pull request Sep 27, 2013

ehazlett merged commit 68cffe3 into staging Sep 27, 2013

ehazlett merged commit `68cffe3` into staging Sep 27, 2013