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
Henne Vogelsang
2c238365d6
CarrierWave needs to be told where to store in 2.x
2021-03-06 21:34:48 +01:00
Sasi Olin
613161bbc7
Add buttons in the interface
2021-03-06 21:18:42 +01:00
Sasi Olin
d540092bfc
Add icalendar files ( fixes #2147 )
2021-03-06 21:18:39 +01:00
Michael Ball
3d99661d02
Add a submission instructions columns
2021-03-06 11:30:57 -08:00
Henne Vogelsang
995db101b3
Merge pull request #2657 from AndrewKvalheim/bootstrap-markdown
...
Remove superfluous click to display Markdown editor
2021-03-06 20:00:50 +01:00
Andrew Kvalheim
ce59c37ff6
Use correct loading mode of Bootstrap-Markdown
...
data-provide="markdown-editable" is intended for inline editing of page
content à la contenteditable. When this is applied to a textarea, the
editor is loaded only after the user clicks on the field. This behavior
breaks focus and is incompatible with keyboard navigation.
2021-03-06 19:35:23 +01:00
Stella Rouzi
c4da5cc31d
Fix chart legend position
2021-03-06 19:27:28 +01:00
Henne Vogelsang
0646e41a82
Merge pull request #2632 from esparta/delegation_for_conference_venue
...
Introducing Delegation for Conference-Venue properties
2021-03-06 19:21:36 +01:00
Espartaco Palma
f5986f4160
Using new accessor for city, country_name, venue name & street
2021-03-06 19:06:36 +01: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
Espartaco Palma
490ea3c4b4
DRY on controllers/conferences_controller
...
Conferences.incoming is defined on the model as scope:
scope :upcoming, (-> { where('end_date >= ?', Date.current) })
Conference.past
scope :past, (-> { where('end_date < ?', Date.current) })
2021-03-06 19:00:47 +01:00
