Commit graph

4640 commits

Author SHA1 Message Date
rajavi-mishra
c21965b67f trying to fix hakiri 2021-04-29 22:32:51 -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
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
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
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
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