Commit graph

1002 commits

Author SHA1 Message Date
Naman Gupta
2e07462d77 exports are made to be wrap_text 2017-11-08 00:49:03 +05:30
Your Name
52a5cb2391 speakers email field is added to pdf 2017-11-07 23:02:01 +05:30
Your Name
7c0fa59a0a Speaker emails in Events CSV/XLS export is included 2017-11-07 23:02:01 +05:30
Your Name
e99287d18a export feature for tracks and booths are done 2017-11-07 19:14:47 +02:00
Naman Gupta
be1992a03a typos is fixed 2017-11-05 16:59:19 +02:00
James Mason
ae0538e1ad
Merge branch 'master' into error_opening_link_to_difficulty_level 2017-11-03 11:25:29 -07:00
Naman Gupta
a0e3ea75ed consecutive ruby lines are made into the ruby filter 2017-11-02 22:57:01 +05:30
Your Name
e607aca680 user ability for registration is used for chcking whether a user can register or not 2017-11-02 22:56:21 +05:30
namangupta01
b1f32caf7c speaker is only ask to register when registrations are open and speaker haven't registered yet 2017-11-02 22:56:21 +05:30
namangupta01
01abbfecc4 Speaker is ask to register only when registration_period is set 2017-11-02 22:56:21 +05:30
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
Naman Gupta
0cd8d21611 minor changes 2017-10-22 16:30:54 +05:30
Naman Gupta
15813f9be6 difficulty level code redundancy is removed 2017-10-22 13:09:43 +05:30
Naman Gupta
d00dc631f8 Error opening link to difficulty level in Revision history is removed 2017-10-21 02:42:08 +05:30
Naman Gupta
aaa34c64af link is corrected 2017-10-20 23:38:59 +05:30
James Mason
c33520dbdf Merge branch 'master' into error_opening_revision_history 2017-10-19 15:37:35 -07:00
James Mason
23805abffe Merge branch 'master' into error_opening_revision_history 2017-10-19 12:11:32 -07:00
James Mason
caf2215f5b Merge branch 'master' into currency_chf 2017-10-17 07:14:13 -07:00
James Mason
e96a5338e2 Attempting to stabilize another flaky test. 2017-10-17 15:33:04 +03:00
James Mason
8ddcd695f0 Add vendor picture interface; include in splash
Vendor has a picture atrribute, and was displayed in one form of the
splashpage, but it wasn't exposed in the vendor editing form, nor was it
included in the "map view" on the splash page.

Additionally, the map popup was rendered inline.

This commit:
* Adds a from input for editing Venue#picture, consistent with other
  form elements
* Displays the picture on the splash page in either style (map or
  static)
* Moves the splash page map popup from inline HTML to it's own partial
2017-10-17 15:33:04 +03:00
rahul
03c9f7deb1 Add turnover for admin
Admin can see the turnover amount for each ticket type.
2017-10-14 23:07:09 +05:30
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
rahul
b761e83b45 Add amount paid
Amount paid colum is added to ticket purchase to keep the record of money paid by the user.
It is added to physical_ticket#index to show admin, price paid by each user for each ticket.
2017-10-14 23:06:57 +05:30
rahul
33bfb3d3c2 Add link to venue when venue is not set
Link to create rooms is removed from schedules#show when venue is not set as creating room without venue will show error
Closes https://github.com/openSUSE/osem/issues/1729
2017-10-14 20:41:41 +05:30
rishabhptr
49503444e1 Fixed roles link in revision_history 2017-10-12 21:17:23 +05:30
Akshit Ahluwalia
fc48769abb fixed hakiri xss warnings.
Fixed Hakiri XSS Warnings.
2017-10-12 04:55:01 +05:30
Your Name
e9109614ed error opening revision history is removed 2017-10-09 18:26:41 +05:30
Your Name
78eb58c93e event export options are grouped 2017-10-08 20:02:34 +03:00
ViditChitkara
72afae6f2f fixed error in nested comments
closes #1738
2017-10-08 15:19:03 +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
Tobias Brunner
c9b70c22ed add CHF currency 2017-09-15 22:44:43 +02:00
namangupta01
ec8fbb21d7 Showing of tracks when there are no tracks in proposals is fixed Closes #1668 2017-09-15 11:50:38 +03: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
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
rahul
fbd11a1402 Remove datatables if there is no data 2017-08-29 22:09:40 +05:30
rahul
b7901e54d6 Fix layout for booths and tracks 2017-08-28 21:44:39 +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
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
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
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
1a5aa14e2c Mention organization name while creating a conference 2017-08-22 18:33:05 +00:00
shlok007
a91c67be0a add views for organization admin role 2017-08-22 12:52:47 +00:00
siddhantbajaj
157c270497 Registration tickets to be set for registration period
Admin must create at least one registration ticket before creating registration period.
2017-08-22 15:20:37 +05:30