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

1339 commits

Author SHA1 Message Date
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
536ec5b68a
Fix linters 2021-03-11 23:25:35 -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
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
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
CactusPuppy
8f465136c3
Add buttons for submission text template reset 2021-03-06 22:56:37 -08:00
Stella Rouzi
ee5274b352 Fix JS error when saving survey_question 2021-03-07 07:32:52 +02:00
Michael Ball
bc4177154a Add editing submission instructions 2021-03-06 12:45:00 -08:00
Sasi Olin
613161bbc7
Add buttons in the interface 2021-03-06 21:18:42 +01: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
Espartaco Palma
f5986f4160
Using new accessor for city, country_name, venue name & street 2021-03-06 19:06:36 +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
Jimmy
da8939dd3a [feat] remove unintended check; add auto-redirect to non-free ticket 2021-03-04 21:50:26 -08: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
d46e1e7397
Add JavaScript to make placeholder text update along with word count 2021-02-24 23:41:19 -08:00
madhekare
baf488ad8a
sumbission text views 2021-02-24 23:41:18 -08:00
Jimmy
e44714b06b Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 176917559-add-brand-elements-to-email 2021-02-24 22:08:12 -08:00
Jimmy
92d052970a Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 176895037-add-link-to-view-event-from-admin-page 2021-02-24 22:07:38 -08:00
Jimmy
a0532b5d9f [feat] Add a button in admin event view that links to user event view 2021-02-24 12:17:05 -08:00
Jimmy
17b1617df9 Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 176917559-add-brand-elements-to-email 2021-02-23 23:04:33 -08:00
Jimmy
e127007c67 [feat] Add design elements to all provided templates 2021-02-23 23:03:33 -08:00
Michael Ball
dbc0b80aa4 Consistently use "Submit Proposal" wording 2021-02-23 22:19:26 -08:00
Michael Ball
8745825436 Fixup the commericals dispaly, correct some labels 2021-02-23 20:20:28 -08:00
Michael Ball
2573dbee44 fix the alt text in the conference logo 2021-02-23 18:47:27 -08:00
Michael Ball
2dc3950cb0 Fix commericals feature specs (UI consistency). 2021-02-23 18:43:18 -08:00
Jimmy
e7eca161c7 [fix] Email will not error out when logo is nil 2021-02-23 16:02:49 -08:00
Jimmy
55f56495f4 [feat] Allow embedding user-defined logo and user-defined text in email template 2021-02-19 17:01:24 +08:00
Michael Ball
20ea622bd3 display all speakers in an event when highlighted 2020-12-10 23:27:16 -08:00