Commit graph

4352 commits

Author SHA1 Message Date
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
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
Michael Ball
0e033e7074
Merge pull request #130 from snap-cloud/depfu/update/mimemagic-0.3.6
⚠️ [fixing yanked version] Update mimemagic: 0.3.5 → 0.3.6 (minor)
2021-04-01 12:16:10 -07:00
Michael Ball
048881fa48 Merge branch 'master' of github.com:snap-cloud/snapcon
* 'master' of github.com:snap-cloud/snapcon:
  Update icalendar to version 2.7.1
  Update byebug to version 11.1.3
2021-03-24 13:55:32 -07:00
Michael Ball
617a4ad172 Control some lints 2021-03-24 13:54:20 -07:00
depfu[bot]
0cca5e4679
Update mimemagic to version 0.3.6 2021-03-24 20:44:48 +00:00
Michael Ball
cedf995fd0
Merge pull request #116 from snap-cloud/depfu/update/byebug-11.1.3
Update byebug: 11.0.1 → 11.1.3 (minor)
2021-03-24 04:21:08 -07:00
Michael Ball
fcac944c31
Merge pull request #121 from snap-cloud/depfu/update/icalendar-2.7.1
Update icalendar: 2.7.0 → 2.7.1 (patch)
2021-03-24 04:20:36 -07:00
Michael Ball
676d16ef27
Merge pull request #124 from snap-cloud/michael/fixes
Snap!Con Updates
2021-03-24 03:12:36 -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
82e45fff0a fix typo in spec 2021-03-24 02:28:43 -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
76df9c9782 Fix typo in spec 2021-03-23 12:33:41 -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
2899da9823 Update spec with submission instructions. 2021-03-22 03:21:11 -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
depfu[bot]
225da34f76
Update icalendar to version 2.7.1 2021-03-21 20:06:24 +00:00
Michael Ball
b4a174944e Codecov removed from gemfile 2021-03-21 13:02:38 -07:00