gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4174 commits 2 branches 2 tags 50 MiB
Commit graph

2216 commits

Author SHA1 Message Date
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
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
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
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
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
Stella Rouzi
780d37eb41
Enable datepicker for readonly fields 
Remove minDate definition, so that value appears in readonly input
 2021-03-06 12:48:50 +01:00
Stella Rouzi
7495ca89ef
Change font for registration item in user menu 2021-03-06 12:48:47 +01:00
Stella Rouzi
cb7519f7a4
Check CfP existence in proposal form 2021-03-06 12:38:02 +01:00
Henne Vogelsang
823f41427f
Merge pull request #2591 from openSUSE/remove-travel-schedule 
Remove travel schedule from registration
 2021-03-06 05:04:07 +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
Espartaco Palma
e7452a9d31
Use New Install within their own template 
It used to be a partial inside #index, but having their own page
yields some extra benefits:

- Performance: Move logic from the view to the controller
  - Theres' no need to go extra steps inside the :index view
- UI: Remove the extra 'Upcoming Conferences' when the system needs
  to start the flow of the creation of the first user
 2021-03-06 03:58:32 +01:00
Michael Ball
c18531ca21
Merge branch 'master' into master 2021-03-02 21:59:34 -08:00
Michael Ball
d067221f57 Show all conferences by default on Conferences#index 2021-03-02 20:46:35 -08:00
Michael Ball
d40ab944c2 Render conference md without escaping description html 2021-03-02 20:46:14 -08:00
Michael Ball
06b05b8177 Fixup the last trapeziod on social media section 2021-03-02 18:55:41 -08:00
CactusPuppy
207046dc65
Merge pull request #11 from CactusPuppy/176894810/add_summision_text 
Add submission text to event proposals
 2021-03-01 23:38:06 -08:00
lzy-1006
9ee29f6daa
Merge pull request #12 from CactusPuppy/176895037-add-link-to-view-event-from-admin-page 
Add link to view event from admin page
 2021-03-01 21:45:32 -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
CactusPuppy
d46e1e7397
Add JavaScript to make placeholder text update along with word count 2021-02-24 23:41:19 -08:00
madhekare
b8f531783b
submission text control/model modifications 2021-02-24 23:41:18 -08:00
madhekare
baf488ad8a
sumbission text views 2021-02-24 23:41:18 -08:00