Commit graph

1386 commits

Author SHA1 Message Date
Jimmy
71d926b4a0
[feat]Center happening now events on the splashpage 2021-04-13 11:44:41 -07:00
Jimmy
3b96d9e63e
[feat] Display happening now events in splashpage 2021-04-13 11:44:40 -07:00
Jimmy
322a5b40bc
[temp] Add no events happening now in splashpage 2021-04-13 11:44:39 -07:00
Jimmy
f260139b2d
[temp]Ajax request of happening now JSON in progress 2021-04-13 11:44:39 -07:00
Jimmy
ca2e053fc4
[temp] Add happening_now placeholder in splashpage 2021-04-13 11:44:39 -07:00
Jimmy
6fd3c88f76
[feat]Add include_happening_now checkbox to the admin splashpage 2021-04-13 11:44:38 -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
5e006ca64e
[fix] Remove unmerged code 2021-04-13 11:43:23 -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
Michael Ball
617a4ad172 Control some lints 2021-03-24 13:54:20 -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
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
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
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
a76417fadf more delinting 2021-03-10 23:36:38 -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
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
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
Michael Ball
332bf8f1df Support the ability for admins to delete users 2021-03-08 20:19:57 -08:00