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

691 commits

Author SHA1 Message Date
Michael Ball
f3271f5cdc Merge master 2021-03-08 16:48:06 -08:00
Michael Ball
d1ca21f479 Merge OSEM updates 2021-03-08 02:50:27 -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
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
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
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
madhekare
baf488ad8a
sumbission text views 2021-02-24 23:41:18 -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
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
Michael Ball
4c97dacf5c fix dynamic class name 2020-12-10 02:26:48 -08:00
Michael Ball
6522f46991 wider columns on the admin schedule page. 2020-12-10 02:14:36 -08:00
Michael Ball
6186eee1d5 fix versions? 2020-08-02 14:26:44 -07:00
Michael Ball
48a8aa37d1 ugh one more place to add the username 2020-07-27 19:14:34 -07:00
Michael Ball
61c107c244 Add username to admin users index 2020-07-27 18:51:41 -07:00
Michael Ball
35ef0dbae9 Add username to admin users index 2020-07-27 18:40:23 -07:00
Michael Ball
1e9027f22a Admin volunteers display 2020-07-27 00:43:29 -07:00
Michael Ball
d1b2ad3528 admins can update volunteers, show names 2020-07-26 23:23:23 -07:00
Michael Ball
e93a27d1f2 Show off track colors some more 2020-07-26 23:01:41 -07:00
Michael Ball
a9d6faf1a3 Support forcing the order of rooms in the schedule 2020-07-16 11:25:20 -07:00
Michael Ball
d5a9b79f6e Show profile pictures to admins and allow them to upload pics 2020-07-15 23:37:40 -07:00
Michael Ball
3883188dcd Support Users Directly Uploading Profile Pictures. 
* Adds a `picture` attribute to `User`.
* Preserves Gravatar as a fallback option.
* Now, you should use `user.profile_picturer` instead of `gravatar_url`
* TODO: Ensure `profile_picture` handles sizing right for uploaded images.
 2020-07-14 21:06:15 -07:00
Michael Ball
4c29d57aae Add a very basic custom_css property to a conference. 
It is loaded on all pages for that conference.
 2020-07-14 17:43:48 -07:00
Michael Ball
cd88882714 upgrade datatables gem 2020-07-13 02:58:15 -07:00
Michael Ball
bf189af6e2 Fix registrations csv 2020-07-10 22:30:01 -07:00
Michael Ball
7d2135f851 Add the ability for Rooms to have a URL. 
The URL is shown on the schedule and the event/proposal page.
The URL is only when a user is logged in and registered.
 2020-07-10 20:18:10 -07:00
Michael Ball
cff6e55c9c Reduce data on conference dashboard b/c of timeouts 2020-06-30 01:38:43 -07:00
Michael Ball
0877aadb2e Merge some contributor fixes 2020-06-30 00:48:47 -07:00
Andrew Kvalheim
04a77a6043 Merge #​2657 "Remove superfluous click to display Markdown editor" 2020-06-26 20:19:35 -07:00
Michael Ball
907cd182a0 Add purchase date to admin tickets 2020-06-09 02:51:05 -07:00
Andrew Kvalheim
5b3520801f 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.
 2020-04-04 22:09:48 -07:00
Andrew Kvalheim
fe2e5febe3 Deconflate organization/conference IDs in role versions 
Resolves failing test spec/features/versions_spec.rb:320.
 2020-04-03 16:19:36 -07:00
Michael Ball
4306fbe636 Merge branch 'master' into admin-ticketing 
* master: (61 commits)
  Replace more Commercials with Materials
  Rename more commericals to materials
  UI -- Repalce "Commerials" with "Materials".
  Re-order Conference Associations
  Cleanup CSS add Snap! style block attachments
  hide venue link if there is no venue link
  No dropshadow
  Text with drop shadow for now
  Tidy up the look of lodging panels
  Show reg status for tickets.
  Tweak CSS, fix loding order
  Move the venue description to below the map.
  Update lodging styling. Add description for venu when map is shown.
  CSS tweaks...
  Make the edit form not so wide.
  Support markdown in more fields
  Cleanup CSS ordering, fix coloring for navdropdowns
  dumb...fix order of link_to args
  ARRRGHHH, another typo...same line...
  fix typo
  ...
 2020-02-06 01:37:38 -08:00
Michael Ball
7586112f72 Merge master 2020-02-06 01:20:11 -08:00
Michael Ball
8a6bb87983 Replace more Commercials with Materials 2020-01-27 13:40:36 -08:00
Michael Ball
9a1739e86e UI -- Repalce "Commerials" with "Materials". 
This only replaces the UI facing wording. Specs will fail
as they have not been updated yet.
 2020-01-18 10:57:42 -08:00
Michael Ball
2c9645895e Make the edit form not so wide. 2020-01-07 15:47:10 -08:00
Michael Ball
bff830ec55 Support markdown in more fields 2020-01-07 15:38:17 -08:00
James Mason
3a94aeb073
Remove travel schedule from registration 
(cherry picked from commit d18cc02f0185df39bb4213d8a63a955dfb433dcb)
Re: https://github.com/openSUSE/osem/issues/2333
 2019-12-02 14:19:12 -08:00
snpd
997dc668e0 Supports talks without speakers 
Admins may want to have discussions or any other general activity
that does not have any particular speaker. Thus, speaker validation
is removed.

Closes https://github.com/openSUSE/osem/issues/2520
 2019-10-23 14:50:28 +05:30
Rahul
bf7a7932ba add booth in alias 
Booth can be replaced with any alias by replacing it in alias.en.yml.
 2019-08-10 21:40:25 +05:30
Ana María Martínez Gómez
085e33f495
Use url instead object in image_tag 
Before Rails 5.2, it was possible to pass an uploader object to
`image_tag` and Rails guessed the url. With Rails 5.2 this is not
possible anymore.
 2019-07-17 00:13:24 +02:00
Ana María Martínez Gómez
f7d7bfb2e2
Merge pull request #2476 from differentreality/url_helpers_in_switch_checkbox 
Use helpers instead of URLs in switch checkboxes
 2019-06-04 17:12:32 +02:00
Stella Rouzi
b590bc4145
Use helpers instead of URLs in switch checkboxes 
Absolute URLs may be potentially breaking functionality, eg in case of
sub-directory installation.

Fixes https://github.com/openSUSE/osem/issues/2472

Co-authored-by: Ana María Martínez Gómez <anamaria@martinezgomez.name>
 2019-05-31 00:24:21 +02:00
Ana María Martínez Gómez
f64cd7323f
Do not use readonly checkboxes to render information 
Just render `Yes` or `No` instead of a disabled checkbox with these two
options in the recent users section of conference#index.
 2019-05-31 00:24:14 +02:00