Commit graph

4836 commits

Author SHA1 Message Date
Jimmy
6e045061e7
[feat]Splashpage will display happening next event if no event is happening now 2021-05-01 17:59:06 -07:00
Jimmy
25bc05b20c
[fix]Fix rake data:test by including webmock 2021-05-01 17:58:57 -07:00
Rajavi Mishra
7ae22d6d2a
Merge pull request #77 from CactusPuppy/176895045-clarify-registration-status-somehow
176895045 clarify registration status somehow
2021-05-01 17:35:12 -07:00
CactusPuppy
33552a5afa
[fix] Fix typo in header 2021-05-01 14:50:03 -07:00
CactusPuppy
f60b07eb32
Merge pull request #76 from CactusPuppy/176894996-vertical-schedule
Vertical schedule
2021-05-01 11:00:44 -07:00
Jimmy
3a3619cb52
[fix]Remove license key in schedules_controller 2021-05-01 01:46:06 +08:00
Jimmy
4a0da37a96
merge 2021-05-01 01:42:03 +08:00
Jimmy
bc115d6f90
[feat]Properly add timezone to events starttime and endtime; set now to be the time in conference timezone instead of the user s time zone in fullcalendar 2021-05-01 01:37:52 +08:00
CactusPuppy
5b06b4d8bb
[feat] Prevent license key from being embedded in view 2021-04-30 09:56:40 -07:00
Michael Ball
62f2b64e1c Resolve CVE in rexml 2021-04-30 09:55:53 -07:00
Michael Ball
04f7b088a0 Remove mimemagic pinned version. That was a fun time.... 2021-04-30 09:39:27 -07:00
Michael Ball
3aa00d5afc
Merge pull request #145 from snap-cloud/ticket-purchase-ids
Show ticket IDs on the admin ticket page
2021-04-30 09:36:00 -07:00
Jimmy
66767c33a2
[feat]Change border color of event 2021-04-30 19:19:30 +08:00
Jimmy
8aaabe4435
[feat]Add valid date range to fullcalendar 2021-04-30 19:06:50 +08:00
Jimmy
5197ddbe24
[feat]Add now indicator to fullcalendar 2021-04-30 18:59:21 +08:00
Jimmy
ccbc2ed0d5
[style]Fix haml-lint 2021-04-30 18:01:33 +08:00
Jimmy
c223959ffb
[feat]Read fullcalendar license key from ENV 2021-04-30 17:58:52 +08:00
Jimmy
a35badb2ca
[feat]Restrict fullcalendar to display time from the start hour to end hour of a conference 2021-04-30 17:33:16 +08:00
Rajavi Mishra
982d62c93d
Merge pull request #75 from CactusPuppy/176895077-Google-Calendar-Link-Should-Be-Visible-only-with-registration
176895077 google calendar link should be visible only with registration
2021-04-30 01:53:33 -07:00
Jimmy
a0e3770dc3
[feat]Remove All Day in fullcalendar view 2021-04-30 16:50:18 +08:00
rajavi-mishra
4478bef67d hariki, dependencies, pronto 2021-04-30 01:49:10 -07:00
Jimmy
fdfa540a65
[style]Fix style 2021-04-30 16:48:15 +08:00
rajavi-mishra
b450abddd1 linter changes 2021-04-30 01:43:31 -07:00
Jimmy
d54f6c540c
[fix]Fix Gemfile 2021-04-30 16:38:35 +08:00
Jimmy
1de29c4df1
[doc]Add comment in fullcalendar.js so that if events are added to database with timezone info explicitly, the fullcalendar can be fixed 2021-04-30 16:32:06 +08:00
Jimmy
92d6365f71
[chore]Update rexml in Gemfile.lock for security reasons 2021-04-30 16:31:02 +08:00
Jimmy
38bac34583
[fix]Fix route helpers in tests 2021-04-30 16:20:49 +08:00
Jimmy
e4abc009e2
[test]Move conference_schedule_spec to schedules_controller_spec 2021-04-30 16:17:39 +08:00
rajavi-mishra
a754f6040a rubocop/linter fixes 2021-04-30 01:15:55 -07:00
rajavi-mishra
c635ccfbaf addition test 2021-04-30 01:05:57 -07:00
rajavi-mishra
1318930ab8 added tests 2021-04-30 01:04:17 -07:00
rajavi-mishra
c9721aa4f9 changes to the feature 2021-04-30 01:04:05 -07:00
Jimmy
c2981eab7b
[CI]Add more description to npm install 2021-04-30 15:56:06 +08:00
Jimmy
96f9cf1c4e
[CI]Try fixing travis by running npm install 2021-04-30 15:55:25 +08:00
Jimmy
de43982b44
[CI]Try fixing github workflow by adding npm install 2021-04-30 15:49:32 +08:00
Jimmy
96944f704f
[style]Fix rubocop 2021-04-30 15:41:06 +08:00
Jimmy
b8f0db4a00
[chore]Clean up package.json and remove yarn.lock 2021-04-30 15:39:14 +08:00
rajavi-mishra
981c798e60 [feat] show alert when user has 0 ticket purchases 2021-04-30 00:23:47 -07:00
Jimmy
b754d68692
[feat]Add url, background color, text color to events in vertical schedule 2021-04-30 15:14:46 +08:00
Michael Ball
c20e1f6f37 boo, bad linters 2021-04-29 23:00:33 -07:00
rajavi-mishra
ed723239fd gemfile changes for hakiri fix 2021-04-29 22:56:47 -07:00
rajavi-mishra
5edb1ce491 gemfile changes to pass the hakiri check 2021-04-29 22:37:09 -07:00
Michael Ball
df118b9ae8 Address comment lints 2021-04-29 22:35:43 -07:00
rajavi-mishra
c21965b67f trying to fix hakiri 2021-04-29 22:32:51 -07:00
Michael Ball
4cc2ead074 Hide the proposal task list since it is confusing to people 2021-04-29 21:17:05 -07:00
Michael Ball
016a2c4ef3 Improve the proposals task list slightly 2021-04-29 21:15:28 -07:00
rajavi-mishra
f0e3b2ca0c hakiri fix 2021-04-29 14:29:17 -07:00
rajavi-mishra
89e87a1be9 rubocop fixes 2021-04-29 14:14:56 -07:00
rajavi-mishra
40fd23e11b remove whitespaces 2021-04-29 13:57:03 -07:00
rajavi-mishra
0599da258e rubocop fixes 2021-04-29 13:54:35 -07:00