Commit graph

2436 commits

Author SHA1 Message Date
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
Jimmy
bfc39fdbe4 [feat] happening_now json endpoint returns event embedded in event_schedule 2021-03-20 13:34:14 +08:00
Jimmy
1ab580e7e6 Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 176895124-happening-now-json-api-endpoint 2021-03-19 17:23:47 +08: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
d6e161b7e5 Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 176895124-happening-now-json-api-endpoint 2021-03-18 08:41:41 +08: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
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
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
Jimmy
ee7c906f17 [feat] Modify alt text for logo; Support user-defined color for header and footer 2021-03-11 21:10:26 -08:00
Michael Ball
558e5efe35 Hide stuff again on admin conf show 2021-03-11 12:16:48 -08:00
Michael Ball
e48dfb8880 update snapcon logo 2021-03-10 23:36:48 -08:00
Michael Ball
a76417fadf more delinting 2021-03-10 23:36:38 -08:00
Jimmy
899d4c91f6 [test] Simplify mailbot.rb; Add corresponding tests 2021-03-10 23:09:52 -08:00
Jimmy
ac4fb8a757 [feat] Refactor mailbot.rb and support displaying conf/org/default logo 2021-03-10 20:13:49 -08:00
Jimmy
ba4de34fa7 [fix] Add alt text to logo 2021-03-10 17:44:15 -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
3d5251cb75 Delint event page 2021-03-10 14:31:42 -08:00
Michael Ball
914de7bf1a Delint by re-enabling everying on the conference admin page 2021-03-10 14:28:14 -08:00
CactusPuppy
fe2e76e1dc
Merge branch 'snap-cloud-master' 2021-03-10 13:29:11 -08:00
CactusPuppy
c1fad244ef
Update comment in osem.js to be accurate 2021-03-10 13:26:45 -08:00
CactusPuppy
13b10cc9a3
Include help data for event types in new proposal view
(Why doesn't the new view use the proposal form partial?)
2021-03-10 13:26:45 -08:00
CactusPuppy
e00544e024
Add buttons for submission text template reset 2021-03-10 13:26:43 -08:00
CactusPuppy
07348cb08f
Create JS hook for template reset 2021-03-10 13:25:59 -08:00
CactusPuppy
a48e78da22
Fill submission text if the field is currently empty 2021-03-10 13:25:59 -08:00
rajavi-mishra
1c28f3839e image tag 2021-03-10 11:18:39 -08:00
rajavi-mishra
0a20f80d6e all layouts implemented in the emails 2021-03-10 10:25:41 -08:00