Commit graph

2021 commits

Author SHA1 Message Date
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
Espartaco Palma
6421916784
Avoid the use of :pluck on not_signed abilities
When using :pluck, ActiveRecord trigger the query immediately.
The above is a behavior we probably want to avoid, because
implies a query to the database regarless of the role or
permission.

** Before

    osem_1      | 07:39:11 web.1    | Started GET "/" for 172.20.0.1 at 2019-07-1207:39:11 +0000
    osem_1      | 07:39:11 web.1    |    (0.3ms)  SELECT
    "conferences"."custom_domain" FROM "conferences" WHERE
     ("conferences"."custom_domain" IS NOT NULL) ORDER BY start_date DESC
    osem_1      | 07:39:11 web.1    | Processing by ConferencesController#index as HTML
    osem_1      | 07:39:11 web.1    |    (1.3ms)  SELECT "events"."id" FROM
    "events" WHERE "events"."state" = $ 1  [["state", "confirmed"]]
    osem_1      | 07:39:11 web.1    |   ↳ app/models/ability.rb:39:in `not_signed_in'
    osem_1      | 07:39:11 web.1    |   Rendering layouts/application.html.haml
    osem_1      | 07:39:11 web.1    |   Rendering conferences/index.html.haml within layouts/application

** After

    osem_1      | 07:43:18 web.1    | Started GET "/" for 172.20.0.1 at 2019-07-1207:43:18 +0000
    osem_1      | 07:43:19 web.1    |    (0.2ms)  SELECT
    "conferences"."custom_domain" FROM "conferences" WHERE
     ("conferences"."custom_domain" IS NOT NULL) ORDER BY start_date DESC
    osem_1      | 07:43:19 web.1    | Processing by ConferencesController#index as HTML
    osem_1      | 07:43:19 web.1    |   Rendering layouts/application.html.haml
    osem_1      | 07:43:19 web.1    |   Rendering conferences/index.html.haml  within layouts/application
2019-07-16 22:24:20 -07:00
Ana María Martínez Gómez
014ff1acc3
Use new changed? Rails method
`attribute_changed?` inside of after callbacks has changed his
behaviour. The new return value will reflect the behavior of calling the
method after `save` returned. To maintain the current behavior, I have
`saved_change_to_attribute?` instead.
2019-07-17 00:13:24 +02:00
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
af1d5e4a3b
Do no use string in if conditional
Passing string to be evaluated in :if and :unless conditional options is
not supported. Pass a symbol for an instance method, or a lambda, proc
or block, instead.
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
47ce659a2f
Merge pull request #2374 from openSUSE/depfu/update/shoulda-matchers-4.0.1
Update shoulda-matchers: 3.1.2 → 4.0.1 (major)
2019-06-03 09:23:52 +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
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
Ana María Martínez Gómez
51c8af42ab
Fix event registatrion for rooms without size
If the room size is not set (which is possible as the size is not
mandatory), the events registrations page breaks because of a
comparison of nil with Integer.
2019-05-31 00:12:15 +02:00
Henne Vogelsang
e6049adc52
Fix gigitty link
The modal didn't really work on mobiles. On mobiles you also need the schedule
link because it's hard to point your mobile to a QR code on your mobile...
2019-05-24 15:19:37 +02:00
Henne Vogelsang
7338bc2648
Skip CSRF authenticity
The way we are handling adding commercials (preload with javascript)
leads to an outdated token otherwise.
2019-05-24 14:08:23 +02:00