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 |
|
CactusPuppy
|
f6b026226a
|
Update comment in osem.js to be accurate
|
2021-03-09 19:08:13 -08:00 |
|
Jimmy
|
11a4d200f7
|
[test] Fix style; add test for user#count_registration_tickets
|
2021-03-09 18:25:15 -08:00 |
|
Michael Ball
|
332bf8f1df
|
Support the ability for admins to delete users
|
2021-03-08 20:19:57 -08:00 |
|
Michael Ball
|
331e0a1610
|
better hidden class for admin datatable
|
2021-03-08 19:28:12 -08:00 |
|
Michael Ball
|
676d10ce36
|
HACK! Show confirmed status in the all users export
|
2021-03-08 19:24:34 -08:00 |
|
Michael Ball
|
f3271f5cdc
|
Merge master
|
2021-03-08 16:48:06 -08:00 |
|
Michael Ball
|
743188d162
|
Merge pull request #107 from snap-cloud/michae/fixup-conferences-index-page
Cleanup All Conference Index
|
2021-03-08 15:56:22 -08:00 |
|
Michael Ball
|
d1ca21f479
|
Merge OSEM updates
|
2021-03-08 02:50:27 -08:00 |
|
Michael Ball
|
8242eb3338
|
Remove submission_limit validation for submission_text
|
2021-03-08 02:18:44 -08:00 |
|
CactusPuppy
|
2e61bc2948
|
Include help data for event types in new proposal view
(Why doesn't the new view use the proposal form partial?)
|
2021-03-07 23:02:49 -08:00 |
|
Michael Ball
|
1a24533b00
|
Display submission instructions on the new/edit forms
|
2021-03-07 12:56:45 -08:00 |
|
Henne Vogelsang
|
5e70690619
|
Merge pull request #2740 from differentreality/survey_question_validation
Fix JS error when saving survey_question
|
2021-03-07 14:43:11 +01:00 |
|
Sasi Olin
|
56838b6eb0
|
Don't set venue related values without a venue
|
2021-03-07 10:19:10 +01:00 |
|
CactusPuppy
|
8f465136c3
|
Add buttons for submission text template reset
|
2021-03-06 22:56:37 -08:00 |
|
CactusPuppy
|
71ce82c968
|
Create JS hook for template reset
|
2021-03-06 22:56:36 -08:00 |
|
CactusPuppy
|
1f9da86e39
|
Fill submission text if the field is currently empty
|
2021-03-06 22:56:36 -08:00 |
|
Stella Rouzi
|
ee5274b352
|
Fix JS error when saving survey_question
|
2021-03-07 07:32:52 +02:00 |
|
Henne Vogelsang
|
05adba0e35
|
Merge pull request #2705 from cycomachead/patch-3
Fix Frozen String Error in Commercials Controller
|
2021-03-06 22:04:48 +01:00 |
|
Michael Ball
|
bc4177154a
|
Add editing submission instructions
|
2021-03-06 12:45:00 -08:00 |
|
Henne Vogelsang
|
57360c183c
|
Merge pull request #2729 from hennevogel/bugfix/carrierwave-update
CarrierWave needs to be told where to store in 2.x
|
2021-03-06 21:44:33 +01:00 |
|
Michael Ball
|
258a2c1489
|
Fix Frozen String Error in Commercials Controller
`errors_text` is a frozen string, so `<<` leads to an exception when trying to generate the error message.
https://sentry.cs10.org/share/issue/7867fdaf8eba4387ae2789fd5f1cff3b/
if you want a production example. :)
|
2021-03-06 21:40:25 +01:00 |
|