Commit graph

2657 commits

Author SHA1 Message Date
Your Name
36133a995a DS_Store file is added into the gitignore 2017-10-09 18:41:24 +05:30
ViditChitkara
d6c7e8d97f Fixed email overflow bug in tickets pdf
closes #1691

minor changes
2017-10-02 11:04:12 +03:00
rahul
99e5af3217 Add full address to the ticket
Full address is added to the ticket as earlier it was showing venue name only
2017-10-02 09:55:58 +03:00
rahul
8dd5a14b23 Remove to_s from conference.venue.name
name is already a string so to_s in not required
2017-10-02 09:55:58 +03:00
rahul
ec91db86f9 Fix error while generating pdf when venue is nil
Error in generating pdf for ticket when venue is not set is fixed.Showing venue in pdf only if venue exist.
Closes https://github.com/opensuse/osem/issues/1683
2017-10-02 09:55:58 +03:00
rahul
be6bfb6aad Add missing : to booths and events_cfp 2017-10-02 09:54:58 +03:00
rahul
407b1838cf Add cfp type in admin/cfp#show
@cfp.cfp_type is added to booths, events & tracks to show the cfp type.

Closes https://github.com/openSUSE/osem/issues/1679
2017-10-02 09:54:58 +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
Ana María Martínez Gómez
7e9d1dbf84 Merge pull request #1642 from siddhantbajaj/user-present
Improving check-in process
2017-09-20 22:37:07 +02:00
Ana María Martínez Gómez
7bfb073702 Merge pull request #1710 from rahul2240/ajax-round
Fix decimal part limit to 2
2017-09-20 22:34:55 +02:00
rahul
a07df4bdb0 Fix decimal numbers limit to 2
while calculating the row total, javascript was called and on some quantity, a number with a big decimal part was appearing.In this PR it is fixed
Fixes https://github.com/opensuse/osem/issues/1709
2017-09-20 21:53:55 +05:30
Ana María Martínez Gómez
9eeb482190 Merge pull request #1708 from rahul2240/total
Fix total price for tickets
2017-09-19 10:21:13 +02:00
rahul
82b5f9083a Fix total price for tickets
While buying the ticket, user was only able to see the integer part in total.So in javascript parseInt was replaced with parseFloat to show the decimal part too
Fixes https://github.com/openSUSE/osem/issues/1702
2017-09-18 20:39:41 +05:30
Ana María Martínez Gómez
ac0a33c2b6 Merge pull request #1698 from ViditChitkara/schedule-error
fixed schedule-page error
2017-09-17 22:41:37 +02:00
ViditChitkara
c929d8e68b fixed schedule-page error
closes #1693
2017-09-15 15:17:45 +05:30
namangupta01
ec8fbb21d7 Showing of tracks when there are no tracks in proposals is fixed Closes #1668 2017-09-15 11:50:38 +03:00
namangupta01
c317565ec7 proposals#edit form text in track field is added 2017-09-15 11:28:40 +03:00
siddhantbajaj
69e30e7ba9 Improving check-in process
mark user as present for the conference when user's registration ticket for that conference is scanned
2017-09-13 22:47:22 +05:30
Ana María Martínez Gómez
ca5d139dc2 Merge pull request #1695 from rahul2240/revhistory
Add missing argument
2017-09-13 00:19:05 +02:00
rahul
cceb11c73a Add missing argument
In version/object_desc_and_link line 108, the fourth argument was missing that is added in this commit.
Closes https://github.com/opensuse/osem/issues/1689
2017-09-12 19:40:12 +05:30
Henne Vogelsang
cb20dca10a Merge pull request #1694 from Ana06/fix-sql2
Update mariadb to 10.2 to solve Travis failures
2017-09-12 15:29:43 +02:00
Ana María Martínez Gómez
9f8836732d Update mariadb to 10.2 to solve Travis failures
Our test suite is failing in Travis as it complains about not finding
`libmysqlclient-dev` which is needed for mysql2. But installing
`libmysqlclient-dev` conflicts with MariaDB 10.1. So I updated MariaDB
to 10.2 and mysql to the last version as the old one is not compatible
with MariaDB 10.2. The missed `libmysqlclient-dev` is not needed any
more.
2017-09-12 13:29:16 +02:00
namangupta01
b4d376e7be expected_string_default_error is fixed 2017-09-12 12:11:43 +03:00
Ana María Martínez Gómez
135241a56c Merge pull request #1635 from siddhantbajaj/user-registration-ticket
One user one registration ticket
2017-09-07 10:30:50 +02:00
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
Ana María Martínez Gómez
30d3296a42 Merge pull request #1653 from rahul2240/tracks
Removed datatable if there is no data
2017-09-01 09:17:11 +02:00
rahul
fbd11a1402 Remove datatables if there is no data 2017-08-29 22:09:40 +05:30
Ana María Martínez Gómez
de1fa448a2 Merge pull request #1663 from tobru/set_loglevel
explicitely set log_level for production
2017-08-29 10:06:54 +02:00
Ana María Martínez Gómez
9baeaf4f73 Merge pull request #1661 from rahul2240/flash-message
Replace flash with flash.now
2017-08-29 09:29:07 +02: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
rahul
89509519ef Replace flash with flash.now 2017-08-29 00:00:17 +05:30
rahul
b7901e54d6 Fix layout for booths and tracks 2017-08-28 21:44:39 +05:30
rahul
ac87656f46 Add hint to responsibles 2017-08-27 19:46:02 +03: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
rahul
9c4892bfc8 Change room size to capacity 2017-08-27 15:07:56 +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
AEtherC0r3
c4eec6a3de Validate room and start_time for EventSchedule
Don't allow an event to be scheduled outside of it's track's room and
time slot
2017-08-26 00:31:44 +03:00
AEtherC0r3
7067803cb9 Validate that tracks don't overlap
Also, add scope for accepted tracks
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
Ana María Martínez Gómez
5985daf677 Merge pull request #1643 from rahul2240/fix-rspec
Fix warning in rspec
2017-08-24 08:57:40 +02:00
divyanshumehta
7af712f492 Made lodging cards of same height w.r.t. to its row. Fixes #1456. 2017-08-23 14:20:40 +03:00
nasia
bc45531efd Add My Booth Requests to user menu 2017-08-23 14:09:34 +03: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
66b48be968 controller tests for custom domain 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