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

450 commits

Author SHA1 Message Date
Michael Ball
d1b2ad3528 admins can update volunteers, show names 2020-07-26 23:23:23 -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
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
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
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
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
Rahul
c1941ff35e add if condition to send booth rejection mail 2019-08-23 17:47:56 +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
b8013661a2
Use render plain instead text 
`render text` is deprecated and it has been remvoed from Rails 5.1.
 2019-05-13 17:15:31 +02:00
Ana María Martínez Gómez
41d6fad7a5
s/redirect_to :back/redirect_back/ 
`redirect_to` has been removed in Rails 5.1 in favor of:

```
redirect_back(fallback_location: root_path)
```
 2019-05-05 09:40:50 +02:00
Stella Rouzi
9bdd889e32
Merge pull request #2471 from rahul2240/export 
Fix broken export
 2019-04-29 21:35:55 +03:00
Stella Rouzi
0c52f78b32
Merge pull request #2444 from snpd25/branch1 
fixed error submission of survey form
 2019-04-29 19:29:46 +03:00
Rahul
d92f442685 add layout false to prevent default layout rendering 
layout false is added so that application.haml doesnt render while generating pdf, xlsx or csv as it is not required in their templates
 2019-04-26 12:37:32 +05:30
Rahul
c27483301a add missing code for pdf csv xlsx in registrations 2019-04-26 12:37:32 +05:30
Rishabh Singh
0785b5c7e0 Add condition for missing_speakers in a track 
A user should be able to see the missing speakers of
only those events that are accessible to him.

Fixes #1942
 2019-04-06 20:58:43 +05:30
snpd
9c64774f26 Fixed error submission of survey form 
Fixed the redirect_to path in surveys_controller

Closes https://github.com/openSUSE/osem/issues/2412
 2019-04-01 13:39:56 +05:30
Henne Vogelsang
6ec905b666 Fix scheduling 
Can't cache the event as the data is changed the scheduling js.

We also can't verify the token in the EventSchedules controller
as we are making susequent ajax calls and have no means to refresh
the token for the second request.

Make draggables scrollable.

There also is no need to spam the console with debug code...

Partly fixes #2353
 2019-02-22 10:45:19 +01:00
James Mason
072116fffe Enable registration to proceed without requiring a ticket. 
Requiring a ticket after registration is convoluted; while it may be neccesary
for some workflows, it definitely isn't for others, and the core of osem
doesn't need it... so let's make it optional.
 2019-02-16 00:53:40 +01:00
Henne Vogelsang
334f84179f Use deliver_later in devise 
Do not send devise mails directly in the request but through the
delayed jobs.
 2019-02-01 01:00:56 +01:00
James Mason
516e53d9df Use chartkick globally 
* Clean up legacy charting imports
* Update existing donut and line charts
* Create helpers for parsing out existing chart data
* Move chart partials to a more common path
 2018-12-30 16:57:22 -08:00
James Mason
6f671b3933
Admins can give tickets. 
(cherry picked from commit aeeeb8e331673011842a35946a1bdba2611f901e)
 2018-12-28 17:55:54 -08:00
James Mason
26f0377c76
Add (admin-only) tickets via 'visibile' attribute [migration] 
(cherry picked from commit ce0db3d7a736e7bcde480721986dbfb4a82aa083)
 2018-12-28 16:54:02 -08:00
James Mason
03f7951676 Add a switch for allowing registration on events (proposals) 2018-12-19 13:18:24 -08:00
James Mason
75bf1380ba Select Call type when creating; don't switch types. 2018-12-19 13:18:24 -08:00
James Mason
43bef689fc Rubocop autocorrections 2018-11-16 09:06:05 -08:00
James Mason
a3adf8318d Add additional social media fields to contacts 
+ YouTube
+ Blog

Simplify logic in the view, and refactor the test #BetterPlace
 2018-11-14 15:01:03 +01:00
James Mason
b11001cdba Every campaign has an end. 
Drop ahoy, because it's more trouble than it's worth. This means dropping
visits, campaigns, targets.

Campaigns are better run to analytics, such as:
* https://matomo.org/docs/tracking-campaigns/
* https://matomo.org/docs/tracking-goals-web-analytics/
* https://support.google.com/analytics/answer/1012040?hl=en
 2018-10-16 21:34:04 +02:00
James Mason
d7a0936dd7 Convert admin/registrations datatable to AJAX-backed 
Supercedes https://github.com/openSUSE/osem/pull/2031 .

Note:

* "Questions" modals have been dropped from this view; questions are no
  longer asked on registration, since Surveys(PR#1100)  were added.
 2018-10-10 21:57:22 +02:00
James Mason
111fe83452 Reduce queries required for schedule. 2018-09-27 15:41:06 +02:00
Stella Rouzi
da91ff8371 Add email for proposal submission 2018-09-19 21:25:12 +02:00
James Mason
64ceaf50f4 Update Admin user datatables to use AJAX 2018-08-30 16:50:42 +02:00
Stella Rouzi
9908f88570 Add survey with target after_event 2018-07-03 08:46:15 +03:00
Stella Rouzi
683f62a27c Add more options for surveys 
* Survey period constraints
* Add abilities
* Enforce required questions
* Update survey_submssion updated_at
* Do a full match of possible answer and user reply
 2018-07-03 08:46:15 +03:00
Stella Rouzi
9f3c0eff5d Add surveys; custom generated by admins 
Available during registration or after conference

Co-authored-by: Shyukri <shshyukriev@suse.com>
Co-authored-by: Henne <hvogel@opensuse.org>
Co-authored-by: Moises <mdeniz@suse.com>
 2018-07-03 08:46:15 +03:00
Zach Kemp
7d5d935a65 optimize queries 2018-05-09 10:07:08 -07:00
James Mason
6d31dfeef4 Add frozen_string_literal magic comment 
re: https://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Style/FrozenStringLiteralComment
 2018-05-09 06:54:26 -07:00
James Mason
03ef28e74d Require code of conduct acceptance on registration 2018-05-08 13:23:00 +02:00
James Mason
a6daff8582 Add/edit org code of conduct, as admin 2018-05-08 13:23:00 +02:00
James Mason
98defe2d0f Use role caching for Rolify to avoid N+1 queries 
Resolves #2018

See https://github.com/RolifyCommunity/rolify#cached-roles-to-avoid-n1-issue
 2018-04-04 07:36:29 -07:00
James Mason
769cc6c970 Modify query to work better across databases 2018-03-14 18:00:37 -07:00
James Mason
4951d085f5 Tidying up. 2018-03-14 18:00:37 -07:00
James Mason
81bad2eb4d DRY up event export menus 2018-03-14 18:00:37 -07:00
James Mason
9e10678542 Clean up rating partials 2018-03-14 18:00:37 -07:00
AnkushMalik
913210347f Add error msg for null file while Adding Commercial for event 
Null file error message added for uploading empty file in CommercialsController#mass_upload

Closes #1959
 2018-03-02 11:36:52 -08:00