Commit graph

1712 commits

Author SHA1 Message Date
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
Ana María Martínez Gómez
952e8ac316
Merge pull request #1834 from bear454/fix-speaker-registration-issues
Fix speaker registration issues
2017-12-13 10:15:36 +01:00
Naman Gupta
ac8b187f1f Speaker is also able to see the proposal and able to modify it 2017-12-12 18:57:12 +02:00
rishabhptr
e5009f168c Fixed email text overflow in proposal#show
Email icon is used solve email text overflow.
Fixes #1838
2017-12-12 18:38:12 +02:00
Adriano Vieira
6d7e1f4865 autofill CFP end date
- automatically setting the end date to the start date when creating
  CFP for UX reasons (fix #1872)
2017-12-12 18:23:56 +02:00
Thaleia Tagaraki
9608e2032a Add autofocus in admin/tickets#new 2017-12-12 08:20:45 -08:00
Alexandros Pagonis
0bfb2130a9 Ticket_button added 2017-12-12 12:40:33 +02:00
Stella Rouzi
32fa0bde6b Add mass import of commercials
Fix #1055
2017-12-12 12:23:16 +02:00
James Mason
710010cb76
Use a picture format for ticketing
Instead of analyzing image size using the local file, rely on a
processed image of the appropriate dimensions.

Resolves #1828
2017-12-11 17:11:17 -08:00
James Mason
e01d849374 Add a picture format for conference tickets 2017-12-11 17:11:15 -08: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
Adriano Vieira
4859f8c64e Render CfP description column as plain text
- fix #1856
2017-12-09 17:36:33 -02:00
Ana María Martínez Gómez
0cb273749a
Merge pull request #1845 from adrianovieira/autofill_conference_end_date
autofill conference end date
2017-12-08 08:58:53 +01:00
foteinidd
52dcc6c474 Added autofocus on the name input in admin/lodgings#new 2017-12-07 20:43:19 +02:00
James Mason
9b32e9c165
Merge branch 'master' into fix_datetimepicker_navigation_for_conference_startend_fields 2017-12-07 09:30:52 -08:00
James Mason
b83c0032d3
Merge branch 'master' into autofill_conference_end_date 2017-12-07 09:22:56 -08:00
James Mason
ebcc2e9ed3
Merge branch 'master' into fix_datetimepicker_navigation_for_conference_startend_fields 2017-12-07 09:21:19 -08:00
Adriano Vieira
bbb09dd237 autofill conference end date
- automatically setting the end date to the start date when creating or
  modifying a conference for UX reasons (fix #1844)
2017-12-05 21:49:12 -02:00
Ismael Olea
166d1bda0d Fix the UI inconsistence documented at #1830
Fixes the UI but not touch the logic. I fear to mess up the database schema.
2017-12-06 00:00:56 +01:00
Sidharth
93fcf8893a Fix Style/UnneededInterpolation
Exclusions from .rubocop_todo.yml deleted.
This cop checks for string interpolated expressions. It supports autocorrection.
Fixes #1823
2017-12-04 23:45:37 +05:30
Sidharth
020dae3d49 Fix Style/ReductantReturn rubocop
Exclusions from .rubocop_todo.yml deleted.This cop checks for redundant return expressions.
Fixes #1824
2017-12-04 16:01:18 +05:30
Adriano Vieira
2e1fae0afb Fix datetimepicker navigation for manual clean up of conference start/end date fields (fix #1842) 2017-12-02 17:54:48 -02:00
ViditChitkara
38342cd557 fixed tickets turnover bug
closes #1473
2017-11-21 13:24:47 +05:30
James Mason
eca09dd7d6
Merge branch 'master' into recaptcha 2017-11-15 11:58:15 -08:00
James Mason
3490644a4d
Merge branch 'master' into switch-transifex 2017-11-14 08:06:50 -08:00
rahul
4785293bf1 Add hint in start and end hour in conference#edit 2017-11-14 17:53:44 +02:00
rahul
837d8ec0db Add popup confirmation on update button
Popup is added so user can confirm the changes
Closes https://github.com/openSUSE/osem/issues/1687
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
fba12aef24
Only include transifex JS if the ENV var is set
... otherwise, don't bother loading this blocking external resource.
2017-11-12 20:43:02 -08:00
Adriano Vieira
6fa709a4de Fix to only show speaker email if it's public 2017-11-12 01:55:03 -02:00
Naman Gupta
ada0f814a7 linting error is fixed 2017-11-09 02:00:49 +05:30
Naman Gupta
90edc648f8 programs.speakers is fixed 2017-11-09 01:40:56 +05:30
James Mason
ce4e993fe7
Merge branch 'master' into recaptcha 2017-11-08 09:33:03 -08:00
James Mason
aca8adf6e8
Merge branch 'master' into include_speaker_email_in_events 2017-11-07 17:19:42 -08:00
James Mason
1c623b1c8a
Merge branch 'master' into organization-link 2017-11-07 14:32:35 -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
1b8f864feb
Use organization name for title link if available, but link to / 2017-11-07 13:51:10 -08:00
Naman Gupta
2e07462d77 exports are made to be wrap_text 2017-11-08 00:49:03 +05:30
Your Name
6c8ebe586c speakers_names is made in sentense using join 2017-11-07 23:02:01 +05:30
Your Name
52a5cb2391 speakers email field is added to pdf 2017-11-07 23:02:01 +05:30
Your Name
5b7aa56f6b minor changes 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
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
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