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

719 commits

Author SHA1 Message Date
Michael Ball
d1ca21f479 Merge OSEM updates 2021-03-08 02:50:27 -08:00
Sasi Olin
56838b6eb0 Don't set venue related values without a venue 2021-03-07 10:19:10 +01:00
Henne Vogelsang
05adba0e35
Merge pull request #2705 from cycomachead/patch-3 
Fix Frozen String Error in Commercials Controller
 2021-03-06 22:04:48 +01:00
Michael Ball
258a2c1489
Fix Frozen String Error in Commercials Controller 
`errors_text` is a frozen string, so `<<` leads to an exception when trying to generate the error message.

https://sentry.cs10.org/share/issue/7867fdaf8eba4387ae2789fd5f1cff3b/
if you want a production example. :)
 2021-03-06 21:40:25 +01:00
Sasi Olin
d540092bfc
Add icalendar files (fixes #2147) 2021-03-06 21:18:39 +01:00
Espartaco Palma
490ea3c4b4
DRY on controllers/conferences_controller 
Conferences.incoming is defined on the model as scope:

  scope :upcoming, (-> { where('end_date >= ?', Date.current) })
Conference.past

  scope :past, (-> { where('end_date < ?', Date.current) })
 2021-03-06 19:00:47 +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
madhekare
b8f531783b
submission text control/model modifications 2021-02-24 23:41:18 -08:00
CactusPuppy
d63a22c54e
Fix Rubocop issues 2021-02-24 19:22:21 -08:00
Michael Ball
d4a2861051 Improve Registration Flow Some: 
* Trying to register when a ticket is required will now redirect you to buy tickets.
* #64 will then redirect you back to complete the registration
 2021-02-23 18:17:45 -08:00
Michael Ball
2892a56a1c merge master 2020-12-04 01:17:39 -08:00
Michael Ball
ec352604b8
Use += instead of << with frozen string 2020-12-04 01:12:26 -08:00
Hiroshi SHIBATA
ae98ac1430
Fixed some typos (#2695) 
* Fix typos
 2020-10-30 11:06:43 +02:00
Michael Ball
70bde86dd6 Add a Happening Now View 2020-07-30 22:31:45 -07:00
Michael Ball
0d4733b130 Update users controller 2020-07-30 02:20:10 -07:00
Michael Ball
047afa02d1 users before filter 2020-07-28 12:21:22 -07:00
Michael Ball
2daacea6ae remove the word free 2020-07-27 11:23:02 -07:00
Michael Ball
d1b2ad3528 admins can update volunteers, show names 2020-07-26 23:23:23 -07:00
Michael Ball
8e1d03a318 Allow scheduling volunteers for sessions. 
Also fix a small bug for admin registrations edit.
 2020-07-25 17:38:44 -07:00
Michael Ball
8195426c2c Fix registrations controller to accept params 2020-07-17 20:31:42 -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
61ca626df1 Improve the physical_tickets page 2020-07-13 04:21:31 -07:00
Michael Ball
cd88882714 upgrade datatables gem 2020-07-13 02:58:15 -07:00
Michael Ball
1964522f49 Add warnings when a user needs to register or complete a purchase 2020-07-11 01:50:17 -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
d5f0063de6 Run migration; add apple pay verification 2020-07-08 02:14:11 -07:00
Michael Ball
cff6e55c9c Reduce data on conference dashboard b/c of timeouts 2020-06-30 01:38:43 -07:00
Michael Ball
05fa9e8d3d set @user correctly 2020-06-18 12:02:59 -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
350371f79d Tweak CSS, fix loding order 2020-01-07 23:58:25 -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
e59d69a038 HACK: allow the registration page to work 2020-01-07 00:42:20 -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
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
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
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
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
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