Commit graph

617 commits

Author SHA1 Message Date
Marie-Elise
afff7e1c66 Refactored condition to check if splashpage is present. 2018-01-17 19:18:39 -08:00
Marie-Elise
34af9b840b Added condition to check for existing splashpage. Will redirect user if splashpage is not found. 2018-01-17 19:18:39 -08:00
Jan-Frederik Rieckers
e1e0bdb4fc Add possibility to link to mastodon 2018-01-06 18:55:27 +01:00
James Mason
fa55224163 Break up the one-query-of-doom
The single query was producing a tremendously large ActiveRecord allocation.

While this isn't nearly as cool as one query, it's still a significant
reduction in SQL trips, and now has the bonus of only loading what is
actually going to be displayed.
2017-12-22 10:48:55 -08:00
James Mason
754d201b01 FIXUP fragment caching issues 2017-12-22 10:48:55 -08:00
James Mason
995176ffe5 Fewer queries for for Conference#show
Reduces SQL wait times by >90% on splash pages.
2017-12-22 10:48:55 -08:00
Ronaq13
505d9da3d4 Fix Performance/HashEachMethods offenses
values.each and keys.each methods are depreciated, so they have replaced by
each_value and each_key respectively. This has done manually.

Closes https://github.com/openSUSE/osem/issues/1825
2017-12-18 17:30:37 +01:00
ViditChitkara
83053f4626 added email presence validation to openid
closes #1658

added test for openid

fixed robocup offences

written tests for email presence validation

minor changes

shifted omniauth callback tests to rspec controllers

fixed linting bug

minor changes

minor changes
2017-12-15 23:07:03 +02:00
Stella Rouzi
4289f699ac Add enabled to event_schedules
To show scheduled events that have been cancelled/withdrawn as 'cancelled', and consequently also show when an event is their replacement.

admin/schedules#show does not show events that were scheduled and then cancelled/withdrawn, however a record in event_schedules exists for those events, but event_schedule.enabled = false
2017-12-15 12:31:58 -08:00
Stella Rouzi
32fa0bde6b Add mass import of commercials
Fix #1055
2017-12-12 12:23:16 +02:00
AEtherC0r3
efaf07178f Upgrade to Rails 5
Update config with rails app:update
Update schema.rb rails db:migrate
Add puma
Make jobs and models inherit from ApplicationJob and ApplicationRecord
Update acts_as_list to 0.9.7 in order to fix
"undefined method `sanitize_sql_hash_for_conditions'" error
Update web-console to 2.3.0 to fix a 500 internal server error
Replace before_filter with before_action
Add rails-controller-testing gem
Add prepend: :true to protect_from_forgery in ApplicationController to
avoid ActionController::InvalidAuthenticityToken exceptions
Remove activeuuid
Update formtastic to 3.1.5 to fix deprecation warnings and issues
with the Input class
Update ahoy_matey to 1.6.0
Update cancancan to 2.0.0 to fix issues with malformed sql queries
Fix program spec
Fix issue with the picture being nil in admin/Organizations#new and #edit
and Organizations#show
Fix ActiveRecord::Base.raise_in_transactional_callbacks= deprecation
warning by removing an unnecessary line in application.rb
Fix failing versions specs
2017-12-11 20:58:04 +02:00
James Mason
eca09dd7d6
Merge branch 'master' into recaptcha 2017-11-15 11:58:15 -08:00
rahul
4785293bf1 Add hint in start and end hour in conference#edit 2017-11-14 17:53:44 +02:00
ViditChitkara
bd045c2976 added description field to cfps
closes #1650

done some changes

minor changes

added markdown format to cfp#show

fixed description text  position in proposals

fixed truncated description text in show action

minor changes on non-admin side
2017-11-14 17:31:08 +02:00
James Mason
ce4e993fe7
Merge branch 'master' into recaptcha 2017-11-08 09:33:03 -08:00
James Mason
714f89f6ba
Fix missing link on public organizations page
When viewing a conference, the Instance Name in the header points to
/organizations. On the organizations index, there's a button to see
conferences, but it does nothing. This makes it easy for public users to
get lost.

This commit:
* Adds a function to the organizations controller to show child
  conferences
* Adds a public permission to see conferences through an organization
* Represents a subset of conferences, reusing conferences/index view,
  for the organization
2017-11-07 14:11:13 -08:00
Your Name
e99287d18a export feature for tracks and booths are done 2017-11-07 19:14:47 +02:00
James Mason
0aa782711d
Use 'Feature's to toggle optional functionality
TODO: Wrap every incomplete project in a feature, and _turn it off_.
2017-11-03 20:40:36 -07:00
James Mason
a7fce677fc
Add reCAPTCHA support to registration.
Because I *hate* spam bots.
2017-11-03 20:36:57 -07:00
Ana María Martínez Gómez
1d07125e7d Merge pull request #1701 from rahul2240/amount
Add paid option in physical ticket#index
2017-10-27 14:22:40 +02:00
ViditChitkara
f44e6e5ca5 fixed openid username
closes #1747

minor changes for styling issue
2017-10-17 15:49:04 +03:00
rahul
0d70832f5b Add total amount spent by user
User can see the total amount that he paid for the tickets and total amount spent by him on each ticket
2017-10-14 23:07:08 +05:30
rishabhptr
3b27a2a8fb Added amount check for payments#new 2017-10-08 16:23:52 +03:00
rishabhptr
568d89b620 Changed physical_ticket to plural 2017-10-02 09:53:10 +03:00
rishabhptr
2247231d6e Added amount check for payments#new 2017-10-02 09:53:10 +03:00
ViditChitkara
c929d8e68b fixed schedule-page error
closes #1693
2017-09-15 15:17:45 +05:30
siddhantbajaj
27bf79996d One user one registration ticket
A user cannot have more than one registration ticket per conference.
2017-09-04 03:14:24 +05:30
rahul
89509519ef Replace flash with flash.now 2017-08-29 00:00:17 +05:30
AEtherC0r3
27fa79a826 Track related refactoring
Add roles as nested routes to track (for the track organizer role)
Allow transition from to_accept to to_reject and backwards
Split Track#valid_dates validation to many independent ones
Show all the confirmed tracks in the conference's splashpage
Add comment in admin/Tracks#toggle_cfp_inclusion
Rewrite admin/TracksController#accept spec
Add feature spec for track requests
Change 'In' to 'Room' in Tracks#index
Rewrite Track#overlapping
Refactor code in ProposalsController
Fix typos
2017-08-27 18:20:16 +03:00
AEtherC0r3
7eea930269 Implement track scheduling
Add track association to schedule
Show schedules in admin sidebar to track organizers
Allow track organizers to manage the schedules of their tracks
Don't allow self-organized track events to be dragged or unscheduled in
a conference schedule
Make scheduled events of self-organized tracks appear semitransparent in
conference schedules
Make the rooms of confirmed self_organized tracks appear semitransparent
and don't allow events to be scheduled to it in the conference schedules
during the dates of its track
Create admin/SchedulesController#new action
Add a button in admin/Schedules#index to create schedules for tracks
Add self_organized scope to Track
Modify Schedules#show to handle track schedules and show a unified
schedule
Allow track organizers to create new schedules for their tracks
Correctly identify scheduled and unscheduled events in Schedules#events
Fix Event#room and Event#time for when the event is scheduled in a track
schedule
Modify Program#selected_event_schedules to include the event_schedules
of selected track schedules
Modify Track#revoke_role_and_cleanup to destroy the track's schedules
and revert its events' state to new
Add tabs for conference and track schedules in admin/Schedules#index
Add button to Create/Show a tracks schedule in Tracks#index and #show
Fix concurrent_events in application_helper because of changes in
Program#selected_event_schedules
Do not take into account cfp_active in Event#valid_track
Modify EventsController#get_tracks accordingly
Enforce cfp_active of track to be enabled for proposals in
ProposalsController#create and #update
Add support for multiple schedules per track
Add selected_schedule_id to Track
Load EventSchedules of selected track schedules for conference schedules
in admin/SchedulesController#show
Modify SchedulesController#show to take into account only the selected
track schedules
Create Event#selected_schedule_id and use it in Event#scheduled? and
Event#time
Validate that an EventSchedule for an event of a self-organized track
belongs to one of the track's schedules
Add 'Manage' button in Tracks#index, #show that sends you to the admin
side of things
Add admin/TracksController#update_selected_schedule to update the
selected_schedule_id of tracks
2017-08-26 00:31:44 +03:00
AEtherC0r3
af7efdb6fe Allow the track organizer to manage events
He/She can manage the events of his/her tracks and their commercials
2017-08-26 00:31:44 +03:00
AEtherC0r3
a87c6e55f7 Remove unnecessary ability from adminAbilities
CanCanCan can load @events and @event in EventsController by itself
2017-08-26 00:31:44 +03:00
shlok007
16f294f3e8 minor inprovements and included organizations in changelog 2017-08-24 10:24:13 +00:00
Nishanth Vijayan
68788ce9fc Show conference changelog
Use load_and_authorize_resource in versions controlller
Add conference specifc route to revision history page
Users with role can view revision_history only for the versions they have access to
Handle versions where conference_id is not set (records before papertrail was introduced)
2017-08-24 10:24:13 +00:00
nasia
834e9d96e4 Add booths to admin sidebar 2017-08-23 14:09:34 +03:00
shlok007
835859e350 refactored DomainConstraint and conference_controller_spec
use params id instead of OSEM_HOSTNAME to load conference
2017-08-22 21:18:58 +00:00
shlok007
f4775f8e6a fix access denied error for program in custom domains 2017-08-22 21:18:58 +00:00
shlok007
0ac5d18ef2 route to conference#show for custom domain 2017-08-22 21:18:58 +00:00
shlok007
1a5aa14e2c Mention organization name while creating a conference 2017-08-22 18:33:05 +00:00
shlok007
db8fdb3d38 add permissions and actions to assign and unassign organization admin role 2017-08-22 12:52:47 +00:00
Ana María Martínez Gómez
84522a999a Merge pull request #1606 from siddhantbajaj/ticket-purchase
Refactor ticket purchase
2017-08-22 14:07:57 +02:00
siddhantbajaj
4b735cff69 Added qr code
Added qr code on ticket pdf and ticket show page.
2017-08-21 16:49:50 +05:30
nasia
52cde784fa Add :accept booth to ability 2017-08-18 23:41:38 +03:00
nasia
e73218b5ca Add booth limit 2017-08-18 23:41:38 +03:00
nasia
8b5ebb3dd7 Add confirmed booths to splashpage 2017-08-16 16:51:52 +03:00
Ana María Martínez Gómez
3f324d4e6f Merge pull request #1613 from siddhantbajaj/read-qr
Scan QR code.
2017-08-16 10:05:06 +02:00
siddhantbajaj
1391668c0f Add routes and controller to scan Qr code
Added TicketScanning controller and routes to scan qr code on PhysicalTickets. Added test for the same
2017-08-15 13:16:46 +05:30
nasia
7107f9a35f Add emails for booth's acceptance and rejection 2017-08-14 22:34:17 +03:00
AEtherC0r3
b717018b31 Track related fixes
Make the message in admin/Tracks form more visible by making it bold and
adding links to venue and rooms
Make papertrail track changes for all the track's attributes
Add validation to require presence of description for self-organized
tracks
Add ID column to admin/Tracks#index
Make the cfp inclusion column sortable
Show success/error flash messages after toggling cfp inclusion
2017-08-11 16:25:21 +03:00
AEtherC0r3
2ff4c6d6b2 Add relevance field for track requests
The requester can now provide more info about the track and himself
2017-08-11 16:25:21 +03:00