rajavi-mishra
|
0599da258e
|
rubocop fixes
|
2021-04-29 13:54:35 -07:00 |
|
rajavi-mishra
|
90d6bb016c
|
PR review change
|
2021-04-29 13:52:00 -07:00 |
|
rajavi-mishra
|
7444f86ce5
|
PR review changes
|
2021-04-29 13:51:45 -07:00 |
|
Rajavi Mishra
|
42882d852b
|
Merge branch 'master' into 176895077-Google-Calendar-Link-Should-Be-Visible-only-with-registration
|
2021-04-29 13:34:24 -07:00 |
|
Rajavi Mishra
|
b323018d43
|
Merge pull request #74 from CactusPuppy/176894823-Cleanup-Page-Title-on-Conference-Materials-Page
176894823 cleanup page title on conference materials page
|
2021-04-29 13:30:42 -07:00 |
|
Rajavi Mishra
|
7039bf852e
|
Merge pull request #72 from CactusPuppy/177571211-Embed-Happening-Now-Events-in-Event-Page
177571211 embed happening now events in event page
|
2021-04-29 13:29:45 -07:00 |
|
CactusPuppy
|
1c23033f1d
|
Move JS out of view and have calendar start on same day as horizontal schedule
|
2021-04-28 23:53:55 -07:00 |
|
CactusPuppy
|
2695aebc07
|
Remove Vertical Schedule tab
|
2021-04-28 23:21:53 -07:00 |
|
CactusPuppy
|
22961c4071
|
Revert "Commit to using Yarn over NPM"
This reverts commit dd6a2600e7.
|
2021-04-28 23:07:13 -07:00 |
|
CactusPuppy
|
a81519ce68
|
Allow users who are not signed-in to view vertical_schedule endpoint
|
2021-04-28 21:44:00 -07:00 |
|
CactusPuppy
|
dd6a2600e7
|
Commit to using Yarn over NPM
|
2021-04-28 21:42:16 -07:00 |
|
Michael Ball
|
d01dc9550b
|
Show ticket IDs on the admin ticket page
|
2021-04-28 10:20:03 -07:00 |
|
Jimmy
|
df729b7dde
|
[feat]Fullcalendar integration done
|
2021-04-26 17:33:31 +08:00 |
|
Jimmy
|
49cf115844
|
Fullcalendar integration in progress
|
2021-04-26 11:07:20 +08:00 |
|
Jimmy
|
4f2abd7e25
|
[feat]Add vertical schedule tab in Schedule
|
2021-04-26 10:41:54 +08:00 |
|
Jimmy
|
adb6eb8526
|
[feat]Implement FullCalendarFormatter#event_schedules_to_resources; Add tests
|
2021-04-26 10:34:14 +08:00 |
|
Jimmy
|
e1918fbf7e
|
[feat]Implement FullCalendar#rooms_to_resources and add tests
|
2021-04-26 09:48:16 +08:00 |
|
rajavi-mishra
|
aebbe5615f
|
rubocop fixes
|
2021-04-25 01:03:41 -07:00 |
|
rajavi-mishra
|
158cf85f72
|
testing
|
2021-04-25 01:02:41 -07:00 |
|
rajavi-mishra
|
4b2a2c5d5c
|
sign-in check added
|
2021-04-24 23:13:12 -07:00 |
|
rajavi-mishra
|
4ce418002d
|
rubocop fixed
|
2021-04-24 22:40:48 -07:00 |
|
rajavi-mishra
|
4307fa9538
|
testing
|
2021-04-24 22:33:59 -07:00 |
|
rajavi-mishra
|
6ebfdefbbd
|
fixed the title
|
2021-04-24 22:19:36 -07:00 |
|
Ziyi
|
54d7c31cac
|
FullCalendarFormatter spec init
|
2021-04-24 19:30:52 -07:00 |
|
Ziyi
|
147b7f4939
|
FullCalendar controller init, FullCalendarFormatter service
|
2021-04-24 19:21:07 -07:00 |
|
CactusPuppy
|
82ac50786c
|
Create route for vertical schedule and test confirming it works
|
2021-04-24 18:54:58 -07:00 |
|
Michael Ball
|
7ee69bc172
|
Remove h2 from conference about sections
|
2021-04-23 13:12:36 -07:00 |
|
CactusPuppy
|
6b186c074d
|
Add FullCalendar module
|
2021-04-22 20:17:40 -07:00 |
|
CactusPuppy
|
abad615f65
|
Merge pull request #73 from CactusPuppy/fix-heroku
Fix Heroku deploys
|
2021-04-22 20:05:58 -07:00 |
|
CactusPuppy
|
ab6916e913
|
Remove unnecessary dependence on WebMock within factories.
|
2021-04-22 19:48:38 -07:00 |
|
rajavi-mishra
|
6fa21fcba5
|
testing
|
2021-04-21 21:40:08 -07:00 |
|
rajavi-mishra
|
e73903b84f
|
commit merged
|
2021-04-21 10:53:52 -07:00 |
|
rajavi-mishra
|
690ea5b2a9
|
[style] changes to styling and wording
|
2021-04-21 10:47:49 -07:00 |
|
Jimmy
|
bafeca7ab9
|
[fix]Remove duplicate code
|
2021-04-22 01:24:14 +08:00 |
|
Jimmy
|
83e4601ddb
|
[fix]Add nil check for happening_now partial
|
2021-04-22 01:13:56 +08:00 |
|
Jimmy
|
74437ab1e5
|
[fix]Remove unnecessary check in happening_now partial
|
2021-04-22 00:59:38 +08:00 |
|
Jimmy
|
83e7321b69
|
[style]Fix rubocop
|
2021-04-22 00:43:27 +08:00 |
|
Jimmy
|
c4920ba85d
|
[fix]Fix ajax for pagination
|
2021-04-22 00:40:53 +08:00 |
|
rajavi-mishra
|
d564de7caa
|
show happening now and happening next on the events page
|
2021-04-21 09:01:12 -07:00 |
|
kingdish
|
014613248e
|
Merge pull request #70 from CactusPuppy/177555226-happening-next
Happening next events
|
2021-04-21 08:24:49 +08:00 |
|
Jimmy
|
ad5a6c264a
|
[style]Fix style
|
2021-04-20 13:52:44 +08:00 |
|
Jimmy
|
e4df68f2d8
|
[fix]Store current time to a variable to make sure timestamps are the same
|
2021-04-20 13:48:47 +08:00 |
|
Jimmy
|
2280d1f7b6
|
[fix]Change wording when no events is happening now or next
|
2021-04-20 13:21:19 +08:00 |
|
Jimmy
|
24d2fa89a8
|
[style]Remove unused code
|
2021-04-19 19:23:41 +08:00 |
|
Jimmy
|
47f183fc89
|
[style]Fix duplicate code in conference_helper
|
2021-04-19 19:01:31 +08:00 |
|
Jimmy
|
5de9f97ea8
|
[fix]Remove print
|
2021-04-19 18:54:01 +08:00 |
|
Jimmy
|
54e051be90
|
[fix]Use full_splashpage instead of splashpage
|
2021-04-19 18:47:21 +08:00 |
|
Jimmy
|
9af06715e1
|
[temp]Print page.html
|
2021-04-19 18:37:04 +08:00 |
|
Jimmy
|
bb665c934f
|
[test]Use scenario instead of it
|
2021-04-19 18:35:26 +08:00 |
|
Jimmy
|
d3ed87211a
|
[temp]Try feature:true
|
2021-04-19 18:26:54 +08:00 |
|