Skip to content
Permalink
Browse files

Merge remote-tracking branch 'origin/master' into release/3.6.6

  • Loading branch information...
eos87 committed Aug 6, 2019
2 parents 1238142 + 2c7ae7f commit f5ec0b8d699c04bff010353e83ed6e7e9b75d7f5
Showing with 4 additions and 4 deletions.
  1. +1 −1 client/app/scripts/liveblog-edit/components/inactivity.modal.tsx
  2. +1 −1 client/package.json
  3. +2 −2 server/settings.py
@@ -70,7 +70,7 @@ class InactivityModal extends React.Component<IInactivityModalProps> {
const bodyText = `
The current post has been inactive in the editor for some time so the warning message
of being edited by you has been removed. Please be careful about saving the post as
the work from other users in this post could get overwritten`;
the work from other users in this post could get overwritten.`;

const footerBtns = this.modalActions();

@@ -10,7 +10,7 @@
"eslint": "grunt eslint",
"tslint": "tsc --noEmit && tslint -c tslint.json 'app/**/*.{ts,tsx}'",
"lint": "npm run eslint && npm run tslint",
"webdriver-update": "./node_modules/protractor/bin/webdriver-manager update --gecko false --versions.chrome 74.0.3729.6 --versions.standalone 3.9.1",
"webdriver-update": "./node_modules/protractor/bin/webdriver-manager update --gecko false --versions.chrome 76.0.3809.68 --versions.standalone 3.9.1",
"e2e": "./node_modules/.bin/protractor protractor-conf.js"
},
"licenses": [
@@ -361,8 +361,8 @@ def env(variable, fallback_value=None):
DEFAULT_THEME_DATE_FORMAT = env('DEFAULT_THEME_DATE_FORMAT', 'D. MMMM YYYY HH:mm')
DEFAULT_THEME_TIMEZONE = env('DEFAULT_THEME_TIMEZONE', arrow.now().format('ZZZ'))

# TTL for editing post flag (seconds). Default: 60 minutes
EDIT_POST_FLAG_TTL = int(env('EDIT_POST_FLAG_TTL', 60 * 60)) # 5 mins for testing matters
# TTL for editing post flag (seconds). Default: 5 hours
EDIT_POST_FLAG_TTL = int(env('EDIT_POST_FLAG_TTL', 5 * 60 * 60))

# list of URLs where the hooks would be trigger too. POST only for now
# This should be comma separated string like: 'example.com, domain.com'

0 comments on commit f5ec0b8

Please sign in to comment.
You can’t perform that action at this time.