Commit graph

2351 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
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
Michael Ball
617a4ad172 Control some lints 2021-03-24 13:54:20 -07:00
Michael Ball
7106e1fc21 more delinting 2021-03-24 03:05:08 -07:00
Michael Ball
2dc6da87e5 Fix indentation on admin show page 2021-03-24 03:02:43 -07:00
Michael Ball
81b963ddc8 Delint some more 2021-03-24 02:50:44 -07:00
Michael Ball
de607fc262 Cleanup conferences show page 2021-03-24 02:37:07 -07:00
Michael Ball
05a04427c2 delint 2021-03-24 02:33:50 -07:00
Michael Ball
e810fd442f Cleanup the submission form, fix reset button 2021-03-23 23:06:34 -07:00
Michael Ball
df0aa087fb Fix remember me checkbox. 2021-03-23 22:53:30 -07:00
Michael Ball
ed20ff3b51 Refactor the new/edit submission forms 2021-03-23 22:43:11 -07:00
Michael Ball
c55eff4eec Improve the new proposal flow 2021-03-23 18:28:34 -07:00
Michael Ball
df5a767494 Improve the look of the conf dashboard 2021-03-23 17:37:04 -07:00
Michael Ball
1806a04b69 Conf Admin: Allow for stats to reflow on small screens 2021-03-23 16:30:13 -07:00
Michael Ball
20a80c2c31 tidy up the conference edit page 2021-03-23 16:26:09 -07:00
Michael Ball
f5e099501c Minor updates to the conf edit page 2021-03-23 13:00:22 -07:00
Michael Ball
6e3e1199ef Restore and cleanup the admin conf todo list 2021-03-23 12:54:07 -07:00
Michael Ball
586c6dff29 Cleanup todo.haml 2021-03-23 02:50:39 -07:00
Michael Ball
1658046a19 Do not show diffculty level in the progress checker 2021-03-23 02:47:18 -07:00
Michael Ball
e542bda8ef tweak emails 2021-03-23 02:21:31 -07:00
Michael Ball
048207cd38 Some re-delinting 2021-03-22 03:18:47 -07:00
Michael Ball
75b60c2578 Use 'Description' on the submissions page. Fill template from submission_instructions 2021-03-22 02:59:35 -07:00
Michael Ball
f22ad296af resolve conflicts with master 2021-03-21 12:59:43 -07:00
CactusPuppy
652381a0b8
Update annotate_models comments 2021-03-18 20:36:39 -07:00
Jimmy
362853f4df Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 177195121-improve-email-templates 2021-03-18 08:40:49 +08:00
Jimmy
fdb08b0c9a [refactor] Move Mailbot#logo_url and #conference_color to ConferenceHelper 2021-03-12 00:14:29 -08:00
Jimmy
33ce7a61c6 [style] Fix style 2021-03-11 23:39:06 -08:00
CactusPuppy
536ec5b68a
Fix linters 2021-03-11 23:25:35 -08:00
Jimmy
fc0494c1f3 Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 177195121-improve-email-templates 2021-03-11 23:23:24 -08:00
Jimmy
54cee7f103 [style] Remove extraneous check 2021-03-11 21:39:51 -08:00
Jimmy
11d4255c67 merge 2021-03-11 21:28:17 -08:00