Commit graph

291 commits

Author SHA1 Message Date
Stella Rouzi
32fa0bde6b Add mass import of commercials
Fix #1055
2017-12-12 12:23:16 +02:00
AEtherC0r3
c21c9af60f Use environment variable for the redis url in cable.yml
Move redis url from cable.yml to dotenv.example
2017-12-11 20:58:04 +02:00
AEtherC0r3
de646019fb Performance tuning in config/puma.rb 2017-12-11 20:58:04 +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
ee6040ffd6
Merge branch 'master' into ssl-opt 2017-11-16 18:13:38 -08:00
James Mason
207319ae57 Control config.force_ssl with an ENV variable 2017-11-14 14:12:23 -08: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
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
7048a37eb6
Merge branch 'master' into master 2017-10-27 18:26:21 -07:00
Udit Jindal
613351378f Merge branch 'master' of https://github.com/openSUSE/osem 2017-10-19 01:46:15 +05:30
Udit Jindal
3d8b32d90b fixed doubly typed route 2017-10-19 01:41:40 +05:30
rishabhptr
568d89b620 Changed physical_ticket to plural 2017-10-02 09:53:10 +03:00
Tobias Brunner
f14d5926e1 explicitely set log_level for production
Without this setting there is a warning displayed:

DEPRECATION WARNING: You did not specify a `log_level`
in `production.rb`
2017-08-29 09:06:51 +02:00
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
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
0ac5d18ef2 route to conference#show for custom domain 2017-08-22 21:18:58 +00:00
shlok007
a91c67be0a add views for organization admin role 2017-08-22 12:52:47 +00: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
AEtherC0r3
d9faffc96a Implement track request acceptance
Allow track submitter to request specific dates
Redirect to Tracks#edit if a track doesn't have a room or start/end date
before accepting it

Don't allow the submitter or the track organizers to edit the request
after it has been accepted or confirmed

Restrict track selection in proposals and move track selection from
Proposals form to events helper

Mark cfp_active of the tracks table as not null and fill in true if nil
2017-08-11 16:25:21 +03:00
Wexpo Lyu
88e31ad902 Expose enable_starttls_auto & openssl_verify_mode.
And align `ENV` calls to keep up with codes above.

My fault for using tabs.

which caused a real misalignment.
2017-08-11 12:03:02 +03:00
nasia
32c5af2a17 Add booths to non admin 2017-08-08 16:18:07 +03:00
nasia
f7c0b64eb5 Introduce Booths for admin 2017-07-18 14:18:42 +03:00
AEtherC0r3
68fc750e9f Implement track requests and add the track organizer role
About track requests:
Create migration that adds the fields submitter_id, state, and
cfp_active to Tracks
Add validations and the self_organized? method to the Track model
Create a new TracksController outide of the admin namespace
Create the relevant views for index, show, new and edit
Modify the admin views for tracks to include extra info for
self-organized tracks

About track organizers:
Create the role when a self-organized track is created
Define track organizer abilities
Modify the roles views and controller to handle the new role

The route for Roles#edit needs to have higher priority than the nested
routes for track roles, otherwise, the word edit in the url is matched
as a track with short_name edit
2017-07-14 12:38:53 +03:00
TheAssassin
f15fe9ddb0 Docker support for production use
This commit adds a Docker infrastructure that is ready for production
use. It is meant to simplify the deployment of OSEM for everyone who
wants to host their own instances.

It includes many features like data persistence, automatic secret key
generation and persistence and automatic database initialization and
upgrading. This should make updating the Docker container as easy as
possible.
2017-07-09 21:38:43 +02:00
shlok007
b33e9ed28e fix revision count and drop observers 2017-07-09 03:36:57 +05:30
siddhantbajaj
a327d2cbd2 Ticket Purchase Index Page
List all the unpaid ticket purchases of the user for that conference and allow user to pay for them.
2017-07-06 02:46:53 +05:30
siddhantbajaj
3d4adb5683 Allow admin to show/generate ticket
Created physical ticket controller and views for admin.
2017-07-03 06:17:27 +05:30
AEtherC0r3
2bff918556 Add index view for the cfp and modify existing ones
Add cfp_type to the form partial
Refactor Cfps#show to use partials for the different cfp types
Modify the rest of the view, where the cfp was used
2017-06-27 21:16:46 +03:00
Siddhant Bajaj
5c56683ae8 Introduced Physical Ticket
Added PhysicalTicket model and controller. It holds the information about each physical ticket bought at the purchase. Physical Tickets are created after every successfull payment.
2017-06-22 19:50:55 +05:30
Dimitris
be72b9d02e Allow user to remove openid 2017-06-13 13:04:55 +03:00
shlok007
3fb316482c suggested changes 2017-06-12 19:43:44 +05:30
shlok007
8edf896d86 introduce organizations 2017-06-12 19:43:44 +05:30
Henne Vogelsang
54609cabcf
Prepare settings for new deployment 2017-06-01 15:39:45 +02:00
AEtherC0r3
9341edd9cb Change mock accounts credentials
The names and usernames don't follow a canonical pattern
And the emails point to a valid domain not owned by osem and not
reserved for illustration purposes

Normalize the users' names and usernames and change the domain of the
email addresses to example.com

Fix #1365
2017-05-06 10:37:58 +03:00
Ana María Martínez Gómez
f3e712a1bc Merge pull request #1319 from JewelSam/master
#1220 adding the cell size attribute to the database
2017-04-03 10:23:49 +02:00
JewelSam
f6e74461ba Add schedule interval as attribute of a program
Also, the part of the schedule event is deleted and the length of the event types
changes to the nearest suitable after changing the length of the interval.

This closes #1220
2017-04-01 21:39:20 +03:00
nasia
962bbaedb2 Fix dublicated routes 2017-03-31 15:48:44 +03:00
Stella Rouzi
5e9bc683ae Move reports to separate controller 2017-03-20 17:51:37 +02:00
Chaitanya
123c9f6a6f Add mock_auth config for Github 2017-03-13 18:48:41 +05:30
Christian Bruckmayer
7844554817 Merge pull request #1193 from kormoc/contributing_updates
Minor Contributing documentation updates.
2017-03-02 14:07:19 +01:00
shlok007
3065766da9 ability to track resources used in conference 2017-02-07 14:58:45 +05:30
Eugene Dubinin
ff9ca4a817 implements configurable schedule granularity and improves the schedule grid for denser schedule grids on smaller screens 2017-01-31 16:24:45 +02:00
Stella Rouzi
46101228e7 Merge pull request #1169 from nishanthvijayan/reports
Add new page with organizer reports
2017-01-15 12:28:38 +02:00
Christian Bruckmayer
bb0639df14 Merge pull request #1175 from shlok007/replace-quiet-assets
using sprockets-rails instead of quiet-assets
2016-12-19 17:14:04 +01:00
richiethomas
daf1f805bd Rename 'ConferenceController' to 'ConferencesController', and 'ProposalController' to 'ProposalsController' 2016-09-30 18:49:44 -04:00