-
- {{#link-to "explore" (query-params cfs='open') class='ui blue button'}}{{t 'Show more calls for speakers'}}{{/link-to}}
+ {{#if (gt callForSpeakersEvents.length 3)}}
+
+
+ {{#link-to "explore" (query-params cfs='open') class='ui blue button'}}{{t 'Show more calls for speakers'}}{{/link-to}}
+
-
+ {{/if}}
{{/if}}
{{modals/event-share-modal isOpen=isShareModalOpen event=eventToShare}}
diff --git a/app/templates/my-sessions/view.hbs b/app/templates/my-sessions/view.hbs
index 45f72181e16..d90d9e9b068 100644
--- a/app/templates/my-sessions/view.hbs
+++ b/app/templates/my-sessions/view.hbs
@@ -1,7 +1,7 @@
{{#if (not model.isLocked)}}
- {{#link-to 'events.view.sessions.edit' model.event.id model.id}}
+ {{#link-to 'public.cfs.edit-session' model.event.id model.id}}
{{#if device.isMobile}}
@@ -10,7 +10,7 @@
{{/if}}
{{#each model.speakers as |speaker|}}
{{#if (eq speaker.email authManager.currentUser.email)}}
- {{#link-to 'events.view.speakers.edit' model.event.id speaker.id}}
+ {{#link-to 'public.cfs.edit-speaker' model.event.id speaker.id}}
{{#if device.isMobile}}
diff --git a/app/templates/orders/view.hbs b/app/templates/orders/view.hbs
index 65bd36798f5..713b056f1bf 100644
--- a/app/templates/orders/view.hbs
+++ b/app/templates/orders/view.hbs
@@ -30,8 +30,8 @@
{{t 'Download Tickets'}}
diff --git a/app/utils/computed-helpers.js b/app/utils/computed-helpers.js
index 0bf1851b9c5..a4ec5530111 100644
--- a/app/utils/computed-helpers.js
+++ b/app/utils/computed-helpers.js
@@ -47,13 +47,23 @@ export const computedSegmentedLink = function(property) {
export const computedDateTimeSplit = function(property, segmentFormat, endProperty) {
return computed(property, {
get() {
- return moment(this.get(property)).format(getFormat(segmentFormat));
+ let momentDate = moment(this.get(property));
+ if (this.constructor.modelName === 'event') {
+ momentDate = momentDate.tz(this.timezone);
+ }
+ return momentDate.format(getFormat(segmentFormat));
},
set(key, value) {
- const newDate = moment(value, getFormat(segmentFormat));
+ let newDate = moment(value, getFormat(segmentFormat));
+ if (this.constructor.modelName === 'event') {
+ newDate = newDate.tz(this.timezone, true);
+ }
let oldDate = newDate;
if (this.get(property)) {
oldDate = moment(this.get(property), segmentFormat === 'date' ? FORM_DATE_FORMAT : FORM_TIME_FORMAT);
+ if (this.constructor.modelName === 'event') {
+ oldDate = oldDate.tz(this.timezone, true);
+ }
} else {
oldDate = newDate;
}
diff --git a/app/utils/validators.js b/app/utils/validators.js
index dadcbbb8e67..2595b5c9f08 100644
--- a/app/utils/validators.js
+++ b/app/utils/validators.js
@@ -20,12 +20,14 @@ export const compulsoryProtocolValidUrlPattern = new RegExp('^(https?:\\/\\/)' /
export const protocolLessValidUrlPattern = new RegExp(
'^'
+ // localhost inclusion
+ + '(?:(?:localhost)(:\\d{2,5})?|'
// user:pass authentication
+ '(?:\\S+(?::\\S*)?@)?'
+ '(?:'
// IP address exclusion
// private & local networks
- + '(?!(?:10|127)(?:\\.\\d{1,3}){3})'
+ + '(?!(?:10)(?:\\.\\d{1,3}){3})'
+ '(?!(?:169\\.254|192\\.168)(?:\\.\\d{1,3}){2})'
+ '(?!172\\.(?:1[6-9]|2\\d|3[0-1])(?:\\.\\d{1,3}){2})'
// IP address dotted notation octets
@@ -49,7 +51,7 @@ export const protocolLessValidUrlPattern = new RegExp(
// port number
+ '(?::\\d{2,5})?'
// resource path
- + '(?:[/?#]\\S*)?'
+ + '(?:[/?#]\\S*)?)'
+ '$', 'i'
);
diff --git a/docs/installation/local.md b/docs/installation/local.md
index e426ab059de..bcb674af1a8 100644
--- a/docs/installation/local.md
+++ b/docs/installation/local.md
@@ -34,7 +34,7 @@ brew reinstall gettext
brew link --force gettext
```
-- By default, the `.env.example` file specifies the `API_HOST` as `localhost:5000` and assumes, that the [open-event-server](https://github.com/fossasia/open-event-server) is already up and running. If you intend to work on issues which involve both the frontend, and the backend, please install and set it up first before proceeding to run the frontend. **If however, you intend to work on just the frontend, please change the URL for `API_HOST` to `https://open-event-api-dev.herokuapp.com` which is a test deployment of the open-event-server.**
+- By default, the `.env.example` file specifies the `API_HOST` as `https://open-event-api-dev.herokuapp.com` which is a test deployment of the open-event-server. If you intend to work on just the frontend, this is sufficient. **If however, you intend to work on issues which involve both the frontend and the backend, you must have the [open-event-server](https://github.com/fossasia/open-event-server) already up and running. Please install and set it up first before changing the URL for `API_HOST` to `localhost:5000` and proceeding to run the frontend.**
## Running / Development
* `ember serve`
diff --git a/tests/integration/helpers/general-date-test.js b/tests/integration/helpers/general-date-test.js
new file mode 100644
index 00000000000..c3210fd1228
--- /dev/null
+++ b/tests/integration/helpers/general-date-test.js
@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupIntegrationTest } from 'open-event-frontend/tests/helpers/setup-integration-test';
+import hbs from 'htmlbars-inline-precompile';
+import { render } from '@ember/test-helpers';
+import moment from 'moment';
+
+module('Integration | Helper | general date', function(hooks) {
+ setupIntegrationTest(hooks);
+
+ test('it renders', async function(assert) {
+ this.set('inputMomentValue', moment('2019-05-01T03:30:00+09:00'));
+ this.set('inputTimezoneValue', 'Japan');
+ await render(hbs`{{general-date inputMomentValue inputTimezoneValue}}`);
+ assert.equal(this.element.innerHTML.trim(), '3:30 AM , May 1st 2019 (JST)');
+ });
+});
diff --git a/tests/integration/helpers/header-date-test.js b/tests/integration/helpers/header-date-test.js
index ace4f6143cb..1589550b39e 100644
--- a/tests/integration/helpers/header-date-test.js
+++ b/tests/integration/helpers/header-date-test.js
@@ -8,7 +8,7 @@ module('Integration | Helper | header date', function(hooks) {
setupIntegrationTest(hooks);
test('it renders', async function(assert) {
- this.set('inputMomentValue', moment('2019-04-30T18:30:00+00:00'));
+ this.set('inputMomentValue', moment('2019-05-01T03:30:00+09:00'));
this.set('inputTimezoneValue', 'Japan');
await render(hbs`{{header-date inputMomentValue inputTimezoneValue}}`);
assert.equal(this.element.innerHTML.trim(), 'Wednesday, May 1st 2019, 3:30 AM (JST)');
diff --git a/yarn.lock b/yarn.lock
index feb4b1b36eb..f42ba528505 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3916,9 +3916,10 @@ caniuse-api@^3.0.0:
lodash.memoize "^4.1.2"
lodash.uniq "^4.5.0"
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000967:
- version "1.0.30000969"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000969.tgz#7664f571f2072657bde70b00a1fc1ba41f1942a9"
+caniuse-lite@^1.0.30000967, caniuse-lite@^1.0.30001006:
+ version "1.0.30001006"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001006.tgz#5b6e8288792cfa275f007b2819a00ccad7112655"
+ integrity sha512-MXnUVX27aGs/QINz+QG1sWSLDr3P1A3Hq5EUWoIt0T7K24DuvMxZEnh3Y5aHlJW6Bz2aApJdSewdYLd8zQnUuw==
capture-exit@^1.2.0:
version "1.2.0"