Commit graph

4661 commits

Author SHA1 Message Date
Ziyi
af4ec41f87
Fixed spec @user 2021-04-13 11:44:20 -07:00
Ziyi
7f60f8aace
Init create_lead, fix MailblusterHelper name 2021-04-13 11:44:19 -07:00
CactusPuppy
5739c05a94
Begin writing tests for Mailbluster API calls 2021-04-13 11:44:19 -07:00
CactusPuppy
5a1bbc2769
Prevent working test from causing failure, since Travis and Github Actions fail differently 2021-04-13 11:44:19 -07:00
CactusPuppy
c86ee453b2
Properly pend outputs context 2021-04-13 11:44:18 -07:00
Jimmy
ea7f1a7edb
[style]Fix style in user_datatable_spec 2021-04-13 11:44:18 -07:00
Jimmy
ffa088ee07
[fix]Revert github workflow; Change datatable tests to pending 2021-04-13 11:44:18 -07:00
Jimmy
5498d79ff9
fix syntax 2021-04-13 11:44:17 -07:00
Jimmy
0e41a733c3
try again 2021-04-13 11:44:17 -07:00
Jimmy
e0a1122552
try ignoring datatables 2021-04-13 11:44:17 -07:00
Jimmy
20da873c09
try running rspec instead of rake 2021-04-13 11:44:16 -07:00
Jimmy
ddda78d96c
ignore user datatable 2021-04-13 11:44:16 -07:00
Jimmy
32524a3f52
[style]Fix order of gem 2021-04-13 11:44:16 -07:00
Jimmy
a287c0415a
[fix]Fix ruby version and update mimemagic 2021-04-13 11:44:14 -07:00
Jimmy
c6e1082213
temp 2021-04-13 11:43:28 -07:00
Jimmy
d88609b8ae
[feat] Happening now JSON endpoint contains rendered abstract of event; Add corresponding tests 2021-04-13 11:43:28 -07:00
Jimmy
566b057e3c
[refactor] Change to_json to as_json 2021-04-13 11:43:28 -07:00
Jimmy
4199530c77
[fix] Fix event_schedule#happening_now? 2021-04-13 11:43:27 -07:00
Jimmy
5e006ca64e
[fix] Remove unmerged code 2021-04-13 11:43:23 -07:00
Jimmy
16b1a969cb
[fix] Use let in schedules_controller_spec; revert changes in event_schedule#happening_now? 2021-04-13 11:43:11 -07:00
Jimmy
0e460e76ec
[feat] happening_now json endpoint returns event embedded in event_schedule 2021-04-13 11:43:11 -07:00
Jimmy
39d4960b69
[fix] Fix style; Fix start_hour and end_hour in test 2021-04-13 11:43:11 -07:00
Jimmy
85fe894876
[fix] Fix time displayed in happening_now.haml; Make event_schedule#happening_now? more efficient 2021-04-13 11:43:09 -07:00
Jimmy
2628952142
[fix] Fix event_schedule# happening_now?; Add tests for happening_now JSON endpoint 2021-04-13 11:42:17 -07:00
Jimmy
6523eff5ab
[feat] Use existing #happening_now method; respond to both html and json requests 2021-04-13 11:42:17 -07:00
Jimmy
7fe1c597ff
[fix] live_events return json; use the provided happening_now? function 2021-04-13 11:42:15 -07:00
Jimmy
25af736868
[feat] Endpoint implementation done 2021-04-13 11:41:58 -07:00
Jimmy
badc6a3163
[fix] Fix function name 2021-04-13 11:40:29 -07:00
Jimmy
879510bc8c
[feat] Endpoint implementation done 2021-04-13 11:40:29 -07:00
Jimmy
018bbff7b8
implementation in progress 2021-04-13 11:40:28 -07:00
rajavi-mishra
f3db1288cf
happening now - model implementation 2021-04-13 11:40:28 -07:00
Jimmy
b70852e67e [fix]Add comma 2021-04-13 18:29:20 +08:00
Jimmy
d2f1720d70 [fix]Fix mailbot settings 2021-04-13 18:26:38 +08:00
kingdish
1118c3cbcc
Merge branch 'master' into 177717903-move-constants-to-configuration-file 2021-04-13 14:10:40 +08:00
kingdish
d8a1232dc8
Merge pull request #67 from CactusPuppy/177737586-add-precompiled-mailbot-css-to-production-environment
Add precompiled mailbot.css to production environment
2021-04-13 14:09:24 +08:00
Jimmy
25fc901128 [fix]Add mailbot.css to assets.rb 2021-04-13 13:51:18 +08:00
Michael Ball
a746a25b8f
Merge pull request #117 from snap-cloud/depfu/update/capybara-3.35.3
Update capybara: 3.26.0 → 3.35.3 (minor)
2021-04-12 22:14:42 -07:00
Jimmy
e08a465889 Merge branch 'master' into 177717903-move-constants-to-configuration-file 2021-04-13 12:06:59 +08:00
kingdish
e340758e6e
Merge pull request #66 from CactusPuppy/177736599-program#any_event_for_this_date
Fix program#any_event_for_this_date
2021-04-13 12:05:14 +08:00
Jimmy
7284f6f50d [fix]Fix empty string check 2021-04-13 11:47:13 +08:00
Jimmy
b3b5e890ee [fix]Fix program#any_event_for_this_date? 2021-04-13 11:41:13 +08:00
Jimmy
4fcc610b24 [feat]Config read from environment variables 2021-04-13 11:03:37 +08:00
CactusPuppy
db8cb3ea1a
Merge pull request #43 from CactusPuppy/176895554/mailbluster
Integrate Snapcon with Mailbluster
2021-04-12 15:46:25 -07:00
CactusPuppy
d6fe38bb2c
Merge branch 'master' into 176895554/mailbluster 2021-04-12 15:27:20 -07:00
Michael Ball
c64031e9b5 try pinning github to 2.6.6 2021-04-12 02:54:30 -07:00
Michael Ball
14b16b58eb tweak continue-on-error: true 2021-04-11 23:46:25 -07:00
Jimmy
b7fbba162b [refactor]Move constants to configuration file 2021-04-12 14:01:49 +08: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
272b5d20ce
Add newline at end of show.js.erb file 2021-04-11 13:46:56 -07:00
Michael Ball
878e0669a2 try continue on error: true 2021-04-10 18:22:06 -07:00