Commit graph

788 commits

Author SHA1 Message Date
CactusPuppy
58f130c132
Fix Rubocop linting issues 2021-04-07 14:50:24 -07:00
Ziyi
f98f35ec8d
Called create_lead in model, FactoryBot errors 2021-04-07 14:50:22 -07:00
Ziyi
125c17838c
delete_lead WIP 2021-04-07 14:50:20 -07:00
Jimmy
c3167a3503 [feat] Happening now JSON endpoint contains rendered abstract of event; Add corresponding tests 2021-03-31 17:35:25 +08:00
Jimmy
010f72d42f [fix] Fix event_schedule#happening_now? 2021-03-31 08:34:04 +08:00
Jimmy
e2f5b5e933 Merge master 2021-03-31 07:49:30 +08:00
Jimmy
0ede07dfaa [fix] Use let in schedules_controller_spec; revert changes in event_schedule#happening_now? 2021-03-31 07:45:26 +08:00
Michael Ball
1658046a19 Do not show diffculty level in the progress checker 2021-03-23 02:47:18 -07:00
Jimmy
3019a022c7 [fix] Fix style; Fix start_hour and end_hour in test 2021-03-19 17:22:08 +08:00
Jimmy
1c54d38094 [fix] Fix time displayed in happening_now.haml; Make event_schedule#happening_now? more efficient 2021-03-19 17:13:34 +08:00
CactusPuppy
652381a0b8
Update annotate_models comments 2021-03-18 20:36:39 -07:00
Jimmy
cab293e947 [fix] Fix event_schedule# happening_now?; Add tests for happening_now JSON endpoint 2021-03-18 18:53:55 +08:00
Jimmy
871457f65b [feat] Use existing #happening_now method; respond to both html and json requests 2021-03-17 21:02:35 +08:00
Jimmy
034313cccb [fix] live_events return json; use the provided happening_now? function 2021-03-17 07:34:51 +08:00
Jimmy
4e1e9bdfbd [fix] Fix function name 2021-03-16 22:16:21 +08:00
Jimmy
8e95325119 [feat] Endpoint implementation done 2021-03-16 22:13:55 +08:00
Jimmy
7475a40775 implementation in progress 2021-03-12 10:38:47 -08:00
rajavi-mishra
51f9ba0206 happening now - model implementation 2021-03-12 09:51:24 -08:00
Jimmy
85c7b31a77 Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 176895512-automatically-redirect-to-registration-after-buying-a-ticket 2021-03-10 14:58:01 -08:00
Michael Ball
f3271f5cdc Merge master 2021-03-08 16:48:06 -08:00
Michael Ball
d1ca21f479 Merge OSEM updates 2021-03-08 02:50:27 -08:00
Stella Rouzi
ee5274b352 Fix JS error when saving survey_question 2021-03-07 07:32:52 +02:00
Michael Ball
3d99661d02 Add a submission instructions columns 2021-03-06 11:30:57 -08:00
Espartaco Palma
fd2635509f
Introducing delegation for city and country name (Conference - Venue
Using ActiveSupport delegate macro.
2021-03-06 19:06:36 +01:00
James Mason
7a04f3582f
Remove travel schedule from registration
(cherry picked from commit d18cc02f0185df39bb4213d8a63a955dfb433dcb)
Re: https://github.com/openSUSE/osem/issues/2333
2021-03-06 04:09:02 +01:00
Jimmy
da8939dd3a [feat] remove unintended check; add auto-redirect to non-free ticket 2021-03-04 21:50:26 -08:00
Jimmy
1ca58961c1 [style] Rubocop 2021-03-04 16:34:47 -08:00
Jimmy
7d70462542 [refactor] Clean up unused code 2021-03-04 15:47:48 -08:00
Jimmy
189c2ec75f [fix] Fix user.count_registration_tickets 2021-03-04 15:34:06 -08:00
rajavi-mishra
b72dfdabf8 conditions completed 2021-03-04 11:55:45 -08:00
Jimmy
c1fe73df03 temp 2021-03-04 11:33:27 -08:00
CactusPuppy
626eaee761
Remove unnecessary self 2021-02-27 23:03:29 -08:00
CactusPuppy
16f5ed6138
Refactor calculation of submission limit and abstract limit into helper function 2021-02-27 22:54:35 -08:00
CactusPuppy
b94894fe87
Update annotate_models 2021-02-26 11:04:20 -08:00
CactusPuppy
42d43319c5
fix indentation error 2021-02-25 20:12:20 -08:00
madhekare
b8f531783b
submission text control/model modifications 2021-02-24 23:41:18 -08:00
CactusPuppy
d63a22c54e
Fix Rubocop issues 2021-02-24 19:22:21 -08:00
Michael Ball
e0fd14e0ce Cleanup omniauth specs 2021-02-23 19:49:34 -08:00
Michael Ball
d4a2861051 Improve Registration Flow Some:
* Trying to register when a ticket is required will now redirect you to buy tickets.
* #64 will then redirect you back to complete the registration
2021-02-23 18:17:45 -08:00
Michael Ball
d7e24f6521 Run annotate_models 2021-02-20 09:57:27 -08:00
Michael Ball
20ea622bd3 display all speakers in an event when highlighted 2020-12-10 23:27:16 -08:00
Michael Ball
01612a73cf Tighten up happening now 2020-07-31 12:24:25 -07:00
Michael Ball
0b0518d67d A better happening now, with admin debug on. LOL 2020-07-31 10:58:37 -07:00
Michael Ball
61f5c9e0ee More consistent happening now formatting 2020-07-31 10:26:23 -07:00
Michael Ball
70bde86dd6 Add a Happening Now View 2020-07-30 22:31:45 -07:00
Michael Ball
0d4733b130 Update users controller 2020-07-30 02:20:10 -07:00
Michael Ball
e4c31633c5 i hate life 2020-07-29 22:51:26 -07:00
Michael Ball
32ef4a294b GDI...typo. 2020-07-29 22:42:45 -07:00
Michael Ball
899d973020 ugh timezones 2020-07-29 22:21:26 -07:00
Michael Ball
7181b05a83 Tweak timezone check and minor style tweaks 2020-07-29 22:16:34 -07:00