Commit graph

299 commits

Author SHA1 Message Date
Michael Ball
04154020a5 Merge master, resolve schema conflicts 2021-03-02 22:35:01 -08:00
Michael Ball
b41b77c676 Add Committee Review Text Column 2021-03-02 21:21:29 -08:00
Michael Ball
4d067add46 Add Committee Review Text Column 2021-03-02 21:21:20 -08:00
CactusPuppy
974d12db30
Fix some rubocop complaints 2021-02-25 20:30:27 -08:00
madhekare
46fa17b55c
submission_text field migration 2021-02-24 23:41:18 -08:00
CactusPuppy
7f5d06b23c
Fix Rubocop issues 2021-02-18 21:03:28 -08:00
Michael Ball
61be84a7f9 tidying up 2020-07-17 20:31:48 -07:00
Michael Ball
a9d6faf1a3 Support forcing the order of rooms in the schedule 2020-07-16 11:25:20 -07:00
Michael Ball
3883188dcd Support Users Directly Uploading Profile Pictures.
* Adds a `picture` attribute to `User`.
* Preserves Gravatar as a fallback option.
* Now, you should use `user.profile_picturer` instead of `gravatar_url`
* TODO: Ensure `profile_picture` handles sizing right for uploaded images.
2020-07-14 21:06:15 -07:00
Michael Ball
4c29d57aae Add a very basic custom_css property to a conference.
It is loaded on all pages for that conference.
2020-07-14 17:43:48 -07:00
Michael Ball
b553e0fed7 Tweak Materials to allow anything 2020-07-10 22:03:51 -07:00
Michael Ball
7d2135f851 Add the ability for Rooms to have a URL.
The URL is shown on the schedule and the event/proposal page.
The URL is only when a user is logged in and registered.
2020-07-10 20:18:10 -07:00
Michael Ball
d5f0063de6 Run migration; add apple pay verification 2020-07-08 02:14:11 -07:00
Michael Ball
0877aadb2e Merge some contributor fixes 2020-06-30 00:48:47 -07:00
Andrew Kvalheim
3f1c8068ee Merge #​2667 "Work around bug in migrations to non-null columns" 2020-06-26 20:19:40 -07:00
Andrew Kvalheim
86713f992e Merge #​2666 "Fix migration that fails on conferences without pictures" 2020-06-26 20:19:40 -07:00
Andrew Kvalheim
e11f634377 Merge #​2665 "Annotate past migrations with Rails version" 2020-06-26 20:19:39 -07:00
Andrew Kvalheim
16b7d6f69d Work around bug in migrations to non-null columns
When running migration 20170705075039 followed by 20170715131706, the
latter fails due to lingering null values in a newly non-null column—

    Mysql2::Error: Invalid use of NULL value: ALTER TABLE `tracks` CHANGE `state` `state` varchar(255) DEFAULT 'new' NOT NULL
    db/migrate/20170715131706_make_track_state_not_null_and_add_default_value.rb:17:in `change'

—despite having apparently converted any existing null values prior to
changing the column type. Investigation reveals that actually the
attempted conversion has had no effect, and that this can be resolved by
clearing ActiveRecord internal caches between migrations:

    connection.schema_cache.clear_data_source_cache! 'tracks'

The same problem also affects running 20170705075039 followed by
20170720134353, but in that case it leads to silent data corruption as
`change_column_null` automatically converts any lingering null values.

This commit 1) clears ActiveRecord internal caches at the beginning of
each affected migration, and 2) replaces `change_column_null` with
`change_column` to reflect that no automatic conversion is intended.
2020-05-12 08:18:12 -07:00
Andrew Kvalheim
63aa240e65 Fix migration that fails on conferences without pictures
CarrierWave documentation:

> Note: `recreate_versions!` will throw an exception on records without
> an image. To avoid this, scope the records to those with images or
> check if an image exists within the block.

Resolves #1976:

    NoMethodError: undefined method `read' for nil:NilClass
    …/carrierwave-1.3.1/lib/carrierwave/uploader/cache.rb:81:in `sanitized_file'
    …/carrierwave-1.3.1/lib/carrierwave/uploader/cache.rb:118:in `cache!'
    …/carrierwave-1.3.1/lib/carrierwave/uploader/versions.rb:234:in `recreate_versions!'
    db/migrate/20171130172334_rebuild_conference_pictures.rb:4:in `block in up'
2020-05-12 07:43:58 -07:00
Andrew Kvalheim
4a0961e88e Annotate past migrations with Rails version
Many migrations currently fail to run with:

> Directly inheriting from ActiveRecord::Migration is not supported.
> Please specify the Rails release the migration was written for:
>
>     class Example < ActiveRecord::Migration[4.2]

I've annotated those that I need to run with the Rails version at the
time each was committed:

    rake db:migrate:status \
    | grep --perl-regexp --only-matching '(?<=^  down    )\d{14}' \
    | while read -r id; do
      path="$(ls -1 db/migrate/${id}_*.rb)"
      version="$(git show "$(git log --diff-filter=A --pretty=format:%H -- "$path")":Gemfile.lock \
        | grep --perl-regexp --only-matching '(?<=^    rails \()\d+\.\d+(?=(\.\d+)+\))')"
      sed --in-place -e "s/\(< ActiveRecord::Migration\)$/\\1[$version]/" "$path"
    done
2020-05-12 07:09:28 -07:00
Andrew Kvalheim
fe2e5febe3 Deconflate organization/conference IDs in role versions
Resolves failing test spec/features/versions_spec.rb:320.
2020-04-03 16:19:36 -07:00
Michael Ball
d06c3ce035 Run db:migrate 2020-02-06 01:41:09 -08:00
Michael Ball
4306fbe636 Merge branch 'master' into admin-ticketing
* master: (61 commits)
  Replace more Commercials with Materials
  Rename more commericals to materials
  UI -- Repalce "Commerials" with "Materials".
  Re-order Conference Associations
  Cleanup CSS add Snap! style block attachments
  hide venue link if there is no venue link
  No dropshadow
  Text with drop shadow for now
  Tidy up the look of lodging panels
  Show reg status for tickets.
  Tweak CSS, fix loding order
  Move the venue description to below the map.
  Update lodging styling. Add description for venu when map is shown.
  CSS tweaks...
  Make the edit form not so wide.
  Support markdown in more fields
  Cleanup CSS ordering, fix coloring for navdropdowns
  dumb...fix order of link_to args
  ARRRGHHH, another typo...same line...
  fix typo
  ...
2020-02-06 01:37:38 -08:00
Michael Ball
7586112f72 Merge master 2020-02-06 01:20:11 -08:00
James Mason
3a94aeb073
Remove travel schedule from registration
(cherry picked from commit d18cc02f0185df39bb4213d8a63a955dfb433dcb)
Re: https://github.com/openSUSE/osem/issues/2333
2019-12-02 14:19:12 -08:00
Rishabh Singh
85e3184361 Update schema.rb formatting 2019-07-21 15:11:53 +05:30
James Mason
26f0377c76
Add (admin-only) tickets via 'visibile' attribute [migration]
(cherry picked from commit ce0db3d7a736e7bcde480721986dbfb4a82aa083)
2018-12-28 16:54:02 -08:00
James Mason
03f7951676 Add a switch for allowing registration on events (proposals) 2018-12-19 13:18:24 -08:00
James Mason
43bef689fc Rubocop autocorrections 2018-11-16 09:06:05 -08:00
James Mason
a3adf8318d Add additional social media fields to contacts
+ YouTube
+ Blog

Simplify logic in the view, and refactor the test #BetterPlace
2018-11-14 15:01:03 +01:00
James Mason
b11001cdba Every campaign has an end.
Drop ahoy, because it's more trouble than it's worth. This means dropping
visits, campaigns, targets.

Campaigns are better run to analytics, such as:
* https://matomo.org/docs/tracking-campaigns/
* https://matomo.org/docs/tracking-goals-web-analytics/
* https://support.google.com/analytics/answer/1012040?hl=en
2018-10-16 21:34:04 +02:00
James Mason
ed6b2d8c93 Default to keeping user's email addresses private. 2018-09-25 22:11:38 +02:00
Stella Rouzi
da91ff8371 Add email for proposal submission 2018-09-19 21:25:12 +02:00
Stella Rouzi
683f62a27c Add more options for surveys
* Survey period constraints
* Add abilities
* Enforce required questions
* Update survey_submssion updated_at
* Do a full match of possible answer and user reply
2018-07-03 08:46:15 +03:00
Stella Rouzi
9f3c0eff5d Add surveys; custom generated by admins
Available during registration or after conference

Co-authored-by: Shyukri <shshyukriev@suse.com>
Co-authored-by: Henne <hvogel@opensuse.org>
Co-authored-by: Moises <mdeniz@suse.com>
2018-07-03 08:46:15 +03:00
Stella Rouzi
3bb73f27cf Fix ahoy tracking and visits 2018-07-02 09:42:40 -06:00
James Mason
24396d35c2 Use Ruby safe navigation over Rails try
re: https://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Style/SafeNavigation
2018-06-01 09:15:57 -07:00
James Mason
d8bd269a64 Add frozen_string_literal magic comment
re: https://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Style/FrozenStringLiteralComment
2018-06-01 09:15:57 -07:00
James Mason
6d31dfeef4 Add frozen_string_literal magic comment
re: https://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Style/FrozenStringLiteralComment
2018-05-09 06:54:26 -07:00
James Mason
03ef28e74d Require code of conduct acceptance on registration 2018-05-08 13:23:00 +02:00
James Mason
a6daff8582 Add/edit org code of conduct, as admin 2018-05-08 13:23:00 +02:00
James Mason
0d4c9e32cf Add timestamp columns to event_types
... required for Rails to calculate cache keys
2018-03-14 18:00:37 -07:00
James Mason
0865b39c38 Add timestamps to tickets
Resolves #1997
2018-03-14 23:57:52 +01:00
ViditChitkara
0ec937e43e fixed failing tests 2018-01-23 18:26:03 -08:00
Jan-Frederik Rieckers
e1e0bdb4fc Add possibility to link to mastodon 2018-01-06 18:55:27 +01:00
Ronaq13
505d9da3d4 Fix Performance/HashEachMethods offenses
values.each and keys.each methods are depreciated, so they have replaced by
each_value and each_key respectively. This has done manually.

Closes https://github.com/openSUSE/osem/issues/1825
2017-12-18 17:30:37 +01:00
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
James Mason
e01d849374 Add a picture format for conference tickets 2017-12-11 17:11:15 -08:00
AEtherC0r3
364be55412 Change visit_id type of ahoy_events to integer
The id column of the visits table is of type integer
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