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

1981 commits

Author SHA1 Message Date
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
e59d69a038 HACK: allow the registration page to work 2020-01-07 00:42:20 -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
Stella Rouzi
e38cfc55c4
Merge pull request #2586 from rahul2240/bug1 
add condition for booth rejection mail
 2020-01-07 00:34:38 +02: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
Brian
b828a9d6c6
fixes redirect loop 
Redirecting users to `/account/sign_in` caused a redirect loop which crashed the page, but still adds them to the `users` table correctly.. Forcing users to the `root_path` solves the redirect loop.
 2019-12-20 08:26:22 -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
904ca19878 More CSS-y things 2019-12-19 02:32:18 -08:00
Michael Ball
767b0bcd19 BJC-ify a bunch of styles 2019-12-19 02:21:09 -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
43b65cc509 Enable a bunch more markdown options. 
Allow Snap_!_ to be rendered right.
 2019-12-19 01:45:04 -08:00
Michael Ball
78394bb0d3 Delete some unnecessary files 2019-12-19 01:41:17 -08:00
Michael Ball
624ee6cf6e attempt one more fix 2019-12-19 01:29:17 -08:00
Michael Ball
20129e2e77 readd back the group by 2019-12-19 01:23:54 -08:00
Michael Ball
cdcf550ee0 more attempts to make datatables work 2019-12-19 01:13:58 -08:00
Michael Ball
29f6a41c98 Not ruby-ish but this should work 2019-12-17 12:56:51 -08:00
Michael Ball
dbe0b1c09c try again with the query 2019-12-17 12:45:41 -08:00
Michael Ball
2c1b11d2c7 Fix a comma 2019-12-17 12:25:13 -08:00
Michael Ball
34e3258086 attempt to fix groupby issue 2019-12-17 11:28:40 -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
Henne Vogelsang
1ce66a55bc
Merge pull request #2596 from snpd25/branch1 
Supports talks without speakers
 2019-10-31 12:52:20 +01:00
Stella Rouzi
8cf9c15a46 Revert change of active user definition 
Closes #2560

Active users are needed for selectize, and the active definition changed to show recent users in #2297

This reverts that change, and provides
* active scope (user not disabled)
* recent scope (for use in #2297 changes, ie user distribution)
 2019-10-24 18:34:12 +03: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
c1941ff35e add if condition to send booth rejection mail 2019-08-23 17:47:56 +05:30
Ana María Martínez Gómez
86440cb956
Merge pull request #2578 from rahul2240/master-alias 
add booth in alias
 2019-08-10 18:41:34 +02:00
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
Stella Rouzi
31ade45529
Merge pull request #2562 from rahul2240/update-button 
Add render in update method
 2019-07-21 18:29:31 +03:00
Rahul
49c59f1d7a add render in update method 
render edit is added so that error and flash message could trigger after the form is submitted.
 2019-07-21 20:43:26 +05:30
Rahul
341128c573 update condition to pluck users for booth responsibles 
Earlier we used active scope to pluck users for booth responsibles, that allows all users except those whose last seen are 3 months or more and are their is_disabled field is false but now we allow all users except those with is_disabled field false to be booth responsible.
 2019-07-21 20:23:04 +05:30
Henne Vogelsang
c5ad9525ed
Merge pull request #2551 from esparta/using_polimorfic_for_not_signed_abilities 
Improve overall performance on not_signed abilities
 2019-07-17 16:20:02 +02:00