Commit graph

2825 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
rishabh92
4409610a89 Add database config examples for all supported databases
Example for MySQL and PostgreSQL added.
Fixes #1676

Update comments based on code review
2017-12-13 17:27:23 +02: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
Sidharth Bansal
b93613fcc5 Updated link 2017-12-12 17:45:14 +02:00
Sidharth
d813470995 Contribution.md broken url
The link to capybara was broken in CONTRIBUTION.md file
Fixes #1862
2017-12-12 17:45:14 +02:00
James Mason
447718d6fa
Merge pull request #1814 from jesmg/patch-1
Fixing admin user creation in docker
2017-12-12 07:31:15 -08:00
Stella Rouzi
f28a3517e6
Merge branch 'master' into patch-1 2017-12-12 16:56:33 +02: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
efb12b02e8
Merge pull request #1836 from adrianovieira/fix_bootstrap_dbsetup_user
Fix bootstrap dbsetup user
2017-12-11 18:09:01 -08:00
James Mason
aa5a7b2781
Merge branch 'master' into fix_bootstrap_dbsetup_user 2017-12-11 17:13:25 -08: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
James Mason
418088cc04
Merge branch 'master' into patch-1 2017-12-11 16:49:40 -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
c21c9af60f Use environment variable for the redis url in cable.yml
Move redis url from cable.yml to dotenv.example
2017-12-11 20:58:04 +02:00
AEtherC0r3
de646019fb Performance tuning in config/puma.rb 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
Ana María Martínez Gómez
b4fcec07be
Merge pull request #1874 from adrianovieira/fix_1856_Description_of_the_CFP_should_not_be_rendered_as_markdown
Render CfP description column as plain text
2017-12-11 08:51:30 +01: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
d464e48085
Merge pull request #1843 from adrianovieira/fix_datetimepicker_navigation_for_conference_startend_fields
Fix datetimepicker navigation in conference start/end fields
2017-12-07 09:57:55 -08: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
bd95c5e628
Merge pull request #1859 from olea/issue-1830
Fix the UI inconsistence documented at #1830
2017-12-07 09:29:03 -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
Ana María Martínez Gómez
b97122097f
Merge pull request #1852 from SidharthBansal/ui
Fix Style/UnneededInterpolation
2017-12-05 09:18:53 +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
Ana María Martínez Gómez
666f5ab2dc
Merge pull request #1850 from SidharthBansal/new
Fix Style/ReductantReturn rubocop
2017-12-04 14:40:01 +01:00
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
Ana María Martínez Gómez
05735a7f67
Merge pull request #1848 from rishabh92/fix-orderedgem-offenses1816
Fix Bundler/OrderedGems Rubocop offenses
2017-12-04 09:55:50 +01:00
Ana María Martínez Gómez
51be0c3f65
Merge pull request #1849 from esquith/patch-1
Update INSTALL.md
2017-12-04 09:26:07 +01:00
Esquith Allen
56afd4e22b
Update INSTALL.md
typo
2017-12-03 22:19:01 -05:00
rishabh92
97749fc195 Fix Bundler/OrderedGems Rubocop offenses
This cop checks that gems are alphabetically sorted within groups. The offenses were fixed using rubocop autocorrection.
2017-12-03 18:19:21 -06:00
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
Adriano Vieira
fe8483b92e Fix user to run rake task for dbsetup 2017-11-30 17:23:51 -02:00
Adriano Vieira
92f27561df Update current directory for centos box 2017-11-30 15:55:36 -02:00
Ana María Martínez Gómez
c0e4d54415
Merge pull request #1826 from olea/master
Variables better be quoted in the configuration examples.
2017-11-30 09:58:23 +01:00
Ismael Olea
da735fe1c9 Yes: it's a trivial change in just an example. But not trivial for non rubyists
But if I had had it before I could have saved a dozen hours of my life :-/
2017-11-29 19:35:54 +01:00
Ana María Martínez Gómez
2be553c547
Merge pull request #1817 from rahul2240/rubocop
Update to Rubocop 0.51
2017-11-29 09:20:47 +01:00
Jesús
e40cdeb94b
Update init.sh 2017-11-28 17:27:42 +01:00
rahul2240
2affec9614 Regenerate rubocop_todo file
Todo file is regenerated because of the changes in the new version of Rubocop.
We are following the default Rubocop configuration.
closes https://github.com/openSUSE/osem/issues/1815
2017-11-28 16:18:06 +05:30
rahul2240
9cf3f63bae Update rubocop to 0.51.0
Rubocop is updated to version 0.51 from 0.49
2017-11-28 16:17:11 +05:30