Commit graph

4638 commits

Author SHA1 Message Date
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
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
Jimmy
b754d68692
[feat]Add url, background color, text color to events in vertical schedule 2021-04-30 15:14:46 +08: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
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
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
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
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
Jimmy
c7490dfe77
[fix]Fix splashpage spec 2021-04-19 17:50:01 +08:00
Jimmy
4e68989955
[test]Add integration tests for the happening now section on the splashpage 2021-04-19 14:24:54 +08:00
Jimmy
1fd1d395d5
[test]Add test for ConferenceHelper#get_happening_next_events_schedules 2021-04-19 13:33:00 +08:00
Jimmy
b32f2416da
[test]Add test for SchedulersController#happening_later? 2021-04-19 13:23:49 +08:00
Jimmy
ab15a3fb10
[refractor]Use ? methods instead of boolean variables; rename happening_next? to happening_later? 2021-04-17 08:30:07 +08:00
CactusPuppy
e1c10d16b0
Merge pull request #71 from CactusPuppy/fix-github-actions
Attempt to use stable release of codacy reporter
2021-04-16 10:04:57 -07:00
CactusPuppy
9774779fbc
Attempt to use stable release of codacy reporter 2021-04-16 09:47:42 -07:00
Jimmy
59c5d432ed
[style]Remove extra white space 2021-04-17 00:22:17 +08:00
Jimmy
2f8cee3c4f
[feat]Splashpage will display happening next event if no event is happening now 2021-04-17 00:00:52 +08:00
Jimmy
19af4e4f12
[fix]Fix rake data:test by including webmock 2021-04-16 23:08:44 +08:00
Michael Ball
eaf13b1b69
Merge branch 'master' into master 2021-04-15 20:29:54 -07:00
Michael Ball
5fe94c99af
Merge pull request #133 from snap-cloud/rails-updates-enhanced-template
Rails updates enhanced template
2021-04-15 20:17:15 -07:00
CactusPuppy
bf945c4b5a
Merge pull request #69 from CactusPuppy/migrate-on-deploy
Run database migrations on Heroku deploy
2021-04-13 16:30:08 -07:00
CactusPuppy
ad03f50200
Run database migrations on release 2021-04-13 15:45:51 -07:00