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
Jimmy
df729b7dde
[feat]Fullcalendar integration done
2021-04-26 17:33:31 +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
4ce418002d
rubocop fixed
2021-04-24 22:40:48 -07:00
rajavi-mishra
4307fa9538
testing
2021-04-24 22:33:59 -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
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
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
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
Michael Ball
b099246f78
delinting...space....
2021-04-17 17:45:55 -07:00
Michael Ball
59f534a010
fix hash style
2021-04-17 17:33:59 -07:00
Michael Ball
4c056f208e
Delinting
2021-04-17 17:29:58 -07:00
Michael Ball
5a3012f0b7
Add comiittee_review(_html) options to email spec
2021-04-17 17:08:16 -07:00
Michael Ball
4dedfdfe90
Merge branch 'master' of github.com:snap-cloud/snapcon
...
* 'master' of github.com:snap-cloud/snapcon:
Skip datatable spec because github actions is weird.
Add devise view files for email messages
Make the _mailbot_* files not depend on @conference
Tweak devise text for confirm emails
2021-04-15 22:22:23 -07:00
Michael Ball
68004c842e
Merge pull request #138 from snap-cloud/confirmation-email-update
...
Improve the Account Confirmation Email
2021-04-15 22:18:23 -07:00
Michael Ball
d4ffda5d58
merge master
2021-04-15 21:56:18 -07:00
Michael Ball
c0a086862a
Skip datatable spec because github actions is weird.
2021-04-15 20:32:21 -07:00
CactusPuppy
d6fe38bb2c
Merge branch 'master' into 176895554/mailbluster
2021-04-12 15:27:20 -07:00
kingdish
41a0193ad3
Merge pull request #45 from CactusPuppy/177261601-embed-happening-now-events-in-conference-splashpage
...
Embed happening now events in conference splashpage
2021-04-12 13:38:29 +08:00
CactusPuppy
34ac979109
Fix spec that was not updated with update to delete_lead
2021-04-09 11:53:54 -07:00
CactusPuppy
ce90dc5fc2
Add spec for query_api method
2021-04-07 14:50:34 -07:00
CactusPuppy
9361f0bfd5
Remove redundant comments
2021-04-07 14:50:33 -07:00
CactusPuppy
66c2728998
Fix Rubocop linting issues
2021-04-07 14:50:29 -07:00
CactusPuppy
f0582c25bf
Move Mailbluster business logic to services/ instead of helpers/
2021-04-07 14:50:28 -07:00
Ziyi
560a3dbe70
CAUTION: deleted user model spec for mailbluster
2021-04-07 14:50:26 -07:00
CactusPuppy
e620dadc1c
Fix some RSpec issues
2021-04-07 14:50:26 -07:00
CactusPuppy
2f9b3feabc
Fix Rubocop linting
2021-04-07 14:50:24 -07:00
