Commit graph

193 commits

Author SHA1 Message Date
namangupta01
c317565ec7 proposals#edit form text in track field is added 2017-09-15 11:28:40 +03:00
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
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
AEtherC0r3
3d250ecf75 UI/UX changes related to tracks
Add confirmed and cfp_active scopes to Track
Render markdown in track's description
Make the views more similar to the proposal/events views
Change the sequence of columns in admin/Tracks#index
Remove the short_name column from the index views
Add button "My Tracks" in the user menu
Fix track count in proposals
Add details of track in admin/Tracks#show
Use tabs to show track details and events
2017-08-11 16:25:21 +03:00
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
AEtherC0r3
2f9eb04219 Enable track requests 2017-08-11 16:25:21 +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
9c58397cd2 Enable Style/IndentationWidth cop
The offenses were fixed manually
2017-07-14 12:47:20 +03:00
Dimitris
7fd738bc7d Add option to render html at format_helper 2017-06-27 18:30:26 +03:00
Ana María Martínez Gómez
53040b3be9 Merge pull request #1498 from divyanshumehta/issue_1497
Added Style/SpaceInsideBrackets Rubocop cop
2017-06-12 17:45:30 +02:00
selini
9ff3601453 remove unnecessary functions 2017-06-12 12:31:31 +03:00
selini
071ed50acb Hide recent Registrations/Submissions when conference is over 2017-06-12 12:31:31 +03:00
divyanshumehta
1223fef87c Use of rubocop compliant unescaping methods in application_helper.rb 2017-06-11 22:57:52 +05:30
Agrim Mittal
255744268b shift relevant functions to versions_helper 2017-05-26 15:47:01 +03:00
Agrim Mittal
b4c2eeb772 change name to versions_helper 2017-05-26 15:47:01 +03:00
hitman
60afb2a474 refractor can_manage_volunteers? 2017-05-26 15:47:01 +03:00
hitman
dbffece956 remove !! from can_manage_volunteers 2017-05-26 15:47:01 +03:00
hitman
4fbb7db16b modify event_type function 2017-05-26 15:47:01 +03:00
hitman
b36d02ceec change to can_manage_volunteers? 2017-05-26 15:47:01 +03:00
hitman
85fa39870d relocate some functions 2017-05-26 15:47:01 +03:00
hitman
c6203a4ed4 rearrange helper functions 2017-05-26 15:47:01 +03:00
hitman
bb0857cbad remove unnecessary includes from ApplicationHelper 2017-05-26 15:47:01 +03:00
hitman
a5d637fcf1 add documentation for each helper 2017-05-26 15:47:01 +03:00
hitman
5dece1ea48 refractor code into different files 2017-05-26 15:47:01 +03:00
hitman
d9925f00e9 add volunteers helper 2017-05-26 15:47:01 +03:00
hitman
2e0f7e9b42 relocate some functions 2017-05-26 15:47:01 +03:00
hitman
5b1a730e19 rearrange helper functions 2017-05-26 15:47:01 +03:00
hitman
e2657bb10d refractor code into different files 2017-05-26 15:47:01 +03:00
AEtherC0r3
fa56ff7f6d Add helper function for speaker selection
The line '@users = User.all.order(:name)' is replicated a lot of times
in EventsController and ProposalsController.
So, this commit removes it and adds a helper function
'speaker_selector_input' that generates the field where the @users
variable was used.
Also, it makes the query more specific.

Fix #1455

Other changes:
* Include the username in the drop down menu
* Add .active scope to User and corresponding tests
* Add :disabled trait to User factory
2017-05-20 18:27:07 +03:00
hitman
e73baa2754 add validation for name, used and quantity 2017-05-13 18:30:30 +03:00
selini
8a0f3c99b0 Create links for speakers in admin/reports#index 2017-05-10 10:34:45 +03:00
Ana María Martínez Gómez
fd6d0bf39b Merge pull request #1446 from sunny-b/master
Enable Style/DotPosition Rubocop cop
2017-04-07 11:21:34 +02:00
Sunny
03fa299058 enable style/dotposition rubocop cop 2017-04-06 23:19:58 -04:00
gotens1211
73a6e06fd3 Show event time in conference timezone
Added an application helper method `time_with_timezone` to return time with the conference timezone which solves the issue of wrong timezone in `scheule.xml` and `admin/events#show`.

Fixes #1188
2017-03-31 13:13:57 +05:30
Stella Rouzi
cd997c8e88 Merge pull request #1275 from shlok007/intersecting-events
Display concurrent events
2017-03-08 10:51:53 +02:00
shlok007
4dd10d09ad display concurrent events on event#show 2017-03-07 20:56:38 +05:30
hitman
226d16dc63 fix markdown issue 2017-03-06 20:57:04 +05:30
hitman
040db7990b change escape_html: false to true 2017-03-06 18:38:45 +05:30
Christian Bruckmayer
ff65b3b601 Merge pull request #1243 from cniedzwiedz/squash_test
Fixed XSS in markdown() method
2017-03-02 14:01:51 +01:00
gotens1211
ec1adbada8 Removed duplicate methods date_range_string and date_string.
Added tests for date_string function

corrections in the test
2017-03-01 15:39:10 +05:30
shlok007
a2b3396897 rename intersecting_events to intersecting_event_schedules 2017-02-12 19:10:03 +05:30
shlok007
3065766da9 ability to track resources used in conference 2017-02-07 14:58:45 +05:30
Nishanth Vijayan
5111d9e937 Extract checking if event is replacement to event_schedule model 2017-01-20 18:54:56 +02:00
Nishanth Vijayan
9c7591adcd Add cancel/replacement labels in All Events
Extract replacement/canceled label & notice logic to helpers

Join replacement/canceled label and notice and move to top
2017-01-20 18:54:35 +02:00
Chris Niedzwiedz
d2e177cac4 Testing if I can squash this way (#1)
* Fixed XSS resulting from markdown() method
2017-01-09 12:27:11 -06:00
differentreality
ea868d4cc7 voting period is open when voting dates are not set 2016-11-24 19:09:35 +02:00