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

1211 commits

Author SHA1 Message Date
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
3eeaebbdc8 Rename more commericals to materials 2020-01-27 13:37:23 -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
843ec586ed Cleanup CSS add Snap! style block attachments 2020-01-08 23:18:03 -08:00
Michael Ball
843bd60026 Text with drop shadow for now 2020-01-08 01:47:27 -08:00
Michael Ball
e9b1086f13 Tidy up the look of lodging panels 2020-01-08 01:20:18 -08:00
Michael Ball
0b512b1385 Show reg status for tickets. 2020-01-08 00:07:25 -08:00
Michael Ball
350371f79d Tweak CSS, fix loding order 2020-01-07 23:58:25 -08:00
Michael Ball
722bd8c008 Move the venue description to below the map. 2020-01-07 16:21:15 -08:00
Michael Ball
9a811b4a6c Update lodging styling. Add description for venu when map is shown. 2020-01-07 16:16:18 -08:00
Michael Ball
7553c15e5e CSS tweaks... 2020-01-07 16:06:51 -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
Michael Ball
1bcf1b8f06 dumb...fix order of link_to args 2020-01-07 02:47:33 -08:00
Michael Ball
bea9f79544 ARRRGHHH, another typo...same line... 2020-01-07 02:31:38 -08:00
Michael Ball
d9155da176 fix typo 2020-01-07 02:26:32 -08:00
Michael Ball
be657c45a4 Merge branch 'remove-travel-schedule' into remove-schedule 
* remove-travel-schedule:
  Remove travel schedule from registration
  Correct variable error
  fixes redirect loop
  add if condition to send booth rejection mail
 2020-01-07 00:58:53 -08:00
Michael Ball
dbeebe50c1 make lodiging name a link, too 2020-01-07 00:23:42 -08:00
Michael Ball
2fc88b3555 Order lodgings by created_at. A temporary hack 2020-01-07 00:19:50 -08:00
Michael Ball
5f1f93d221 Add a snap logo to the navbar 2020-01-07 00:08:05 -08:00
James Mason
5a88299f76
Remove travel schedule from registration 
(cherry picked from commit d18cc02f0185df39bb4213d8a63a955dfb433dcb)
Re: https://github.com/openSUSE/osem/issues/2333
 2020-01-06 15:04:59 -08:00
Michael Ball
b49bddafb6 Merge branch 'misc-release-tweaks' into remove-schedule 
* misc-release-tweaks: (38 commits)
  Improve markdown support and tweak sponsorship langage
  Use Ruby 2.5.5 since that is in the docker dev container
  Do not need to specify callback url
  attempt to fix the discourse callback URL
  use a div with padding.
  Help button is weird.
  Dropdown menu style tweaks
  fix logic for snap sso link
  tweak form display in dropdown
  Tweak devise modules list
  Work on omniauth setup
  Minor HTML cleanup
  More CSS-y things
  BJC-ify a bunch of styles
  More wording tweaks
  Tweak some wording, html and descriptions for Snap!Con
  Enable a bunch more markdown options.
  Delete some unnecessary files
  attempt one more fix
  readd back the group by
  ...
 2020-01-05 15:44:35 -08:00
Michael Ball
2e817d8739 Improve markdown support and tweak sponsorship langage 2020-01-05 15:43:11 -08:00
Brian
2d31ababaa
Correct variable error 
Line 30 was missing the `@` in `@event.speakers.any`, which caused a 500 error when clicking on a session in the program. Corrected the typo.
 2019-12-20 10:38:14 -05:00
Michael Ball
4ea5fb0892 use a div with padding. 2019-12-19 03:58:07 -08:00
Michael Ball
0c232ffc9d Help button is weird. 2019-12-19 03:53:09 -08:00
Michael Ball
55057686ec Dropdown menu style tweaks 2019-12-19 03:49:23 -08:00
Michael Ball
46a35cf704 fix logic for snap sso link 2019-12-19 03:42:41 -08:00
Michael Ball
640d33f187 tweak form display in dropdown 2019-12-19 03:42:10 -08:00
Michael Ball
2e62aaf0c8 Tweak devise modules list 2019-12-19 03:32:52 -08:00
Michael Ball
4d4bdd00c6 Work on omniauth setup 2019-12-19 03:06:12 -08:00
Michael Ball
8a35bb377e Minor HTML cleanup 2019-12-19 02:36:42 -08:00
Michael Ball
5b5e10ba50 More wording tweaks 2019-12-19 02:12:44 -08:00
Michael Ball
cd2e2066f4 Tweak some wording, html and descriptions for Snap!Con 2019-12-19 02:00:32 -08:00
Michael Ball
8d6c9978b9 Hide the small image for now 2019-12-17 03:15:05 -08:00
Michael Ball
beb1b8ae26 ugh fix js again 2019-12-17 02:48:47 -08:00
Michael Ball
9a21d4016d try again for picture_url 2019-12-17 02:18:44 -08:00
Michael Ball
94168ec23e JS conf picture URL try 2 2019-12-17 01:59:42 -08:00
Michael Ball
ccc9e9c98e Try 3 for the image background 2019-12-17 01:51:15 -08:00
Michael Ball
7657ddf27f attempt to fix style syntax 2019-12-17 01:41:01 -08:00
Michael Ball
de7a6036d1 Tweak the top heading if there is a image 2019-12-17 01:32:16 -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
Ana María Martínez Gómez
9303375f7e
Merge pull request #2525 from Ana06/fix_event_registrations 
Fix event registatrion for rooms without size
 2019-06-01 11:09:42 +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