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
AEtherC0r3
0f154d07c9
Mark track state as not null and add default value
...
The regular tracks are marked as 'confirmed'
2017-08-11 16:25:21 +03:00
AEtherC0r3
fd93b04f16
Add room and dates to tracks
...
They are required only for accepted and confirmed self-organized tracks
2017-08-11 16:25:21 +03:00
AEtherC0r3
d616c66745
Define the track's finite state machine
2017-08-11 16:25:21 +03:00
Wexpo Lyu
33aee342b4
Add new envs to dotenv.example.
2017-08-11 12:03:02 +03:00
Wexpo Lyu
88e31ad902
Expose enable_starttls_auto & openssl_verify_mode.
...
And align `ENV` calls to keep up with codes above.
My fault for using tabs.
which caused a real misalignment.
2017-08-11 12:03:02 +03:00
Ana María Martínez Gómez
bd62df14c3
Fix vagrant broken after updating to Ruby 2.4
...
Ruby got updated in https://github.com/openSUSE/osem/pull/1588 ,
But there was a repo missed, so Ruby 2.4 can be installed in our Vagrant
machine.
Closes https://github.com/openSUSE/osem/issues/1601
Mob-programmed by @mdeniz, @DavidKang and @Ana06.
2017-08-11 11:57:01 +03:00
Ana María Martínez Gómez
6efcd04de1
Merge pull request #1627 from siddhantbajaj/registration-ticket
...
Added registration-ticket
2017-08-11 10:02:28 +02:00
siddhantbajaj
f31651ad9c
Added registration-ticket
...
Added registration type tickets that will used in the check-in process
2017-08-10 21:15:54 +05:30
shlok007
83abc9f71f
remove Organization suffix from navbar-brand in navigation
2017-08-10 11:17:36 +05:30
shlok007
28b55a9d72
remove OSEM_NAME from navigation
2017-08-10 11:17:36 +05:30
shlok007
17eacaec0d
add tests for organization name in conference views
...
remove tests for organization name in conference#edit
2017-08-10 11:17:36 +05:30
shlok007
cdc08052b1
display organization name in menu bar
2017-08-10 11:17:36 +05:30
shlok007
540c982771
mention organization in dashboard, splashpage and admin/conference#edit
2017-08-10 11:17:36 +05:30
nasia
32c5af2a17
Add booths to non admin
2017-08-08 16:18:07 +03:00
Wexpo Lyu
033dbe4c40
Fix the dropdown to get enough bottom padding.
2017-08-07 13:41:10 +03:00
AEtherC0r3
9b7562fe2e
Update autoprefixer-rails to 7.1.1
2017-08-07 12:23:01 +03:00
AEtherC0r3
cb8010bafe
Update omniauth-oauth2 to 1.4.0
2017-08-07 12:23:01 +03:00
AEtherC0r3
2824336ead
Update sprockets to 3.7.1
2017-08-07 12:23:01 +03:00
AEtherC0r3
2799653124
Update omniauth to 1.6.1
2017-08-07 12:23:01 +03:00
AEtherC0r3
4e1d45382c
Update awesome_nested_set to 3.1.3
2017-08-07 12:23:01 +03:00
AEtherC0r3
57f450e857
Update delayed_job_active_record to 4.1.2
2017-08-07 12:23:01 +03:00
AEtherC0r3
7e2bb8043f
Update coffee-rails to 4.2.2
2017-08-07 12:23:01 +03:00
AEtherC0r3
d9649a4446
Update jquery-rails to 4.3.1
2017-08-07 12:23:01 +03:00
AEtherC0r3
f74f2d3f52
Update responders to 2.4.0
2017-08-07 12:23:01 +03:00
AEtherC0r3
d94fdb2a28
Update dotenv-rails to 2.2.1
2017-08-07 12:23:01 +03:00
AEtherC0r3
da8b72343b
Update font-awesome-rails to 4.7.0.2
2017-08-07 12:23:01 +03:00
AEtherC0r3
a4b82bc830
Update sass-rails to 5.0.6
2017-08-07 12:23:01 +03:00
Ana María Martínez Gómez
3c6594cee9
Merge pull request #1623 from laosb/patch-4
...
Explicitly add `.pdf` to make it a PDF file.
2017-08-04 15:55:57 +02:00
Wexpo Lyu
50c66e2e02
Explicitly add .pdf to make it a PDF file.
...
Some SMTP providers would treat all files w/o suffix as `.txt`s. This patch would make it work in most cases.
2017-08-04 04:01:42 -05:00
shlok007
80a9544279
move admin/users to be accessed only by site admins
2017-08-01 13:52:17 +05:30
Ana María Martínez Gómez
edd0024a17
Merge pull request #1600 from siddhantbajaj/pdf-attachment
...
Send mail on ticket confirmation with attached ticket pdf.
2017-07-26 09:39:11 +02:00
siddhantbajaj
906f08baf8
Send mail on ticket confirmation.
...
Added mailer method to send ticket confirmation email along with the attached pdf for ticket.
2017-07-26 11:31:19 +05:30
Ana María Martínez Gómez
e2bad46d00
Merge pull request #1576 from siddhantbajaj/qr-code
...
Add token field in ticket
2017-07-25 11:46:04 +02:00
siddhantbajaj
9e154a1dcd
Added Token field for physical_ticket
...
Added token field in physical_ticket model. This token will also be stored in the qr code and will uniqely identify the ticket.
2017-07-24 16:58:36 +05:30
Dimitris
2bf7e4bbd3
Fix user already subscribed exception
...
Prevent excpetion at user subscription when already is subscribed to a conference and add hanling to the similar unsubscribe event.
remove double validation at app/models/subscription.rb
update subscription_controller_spec
2017-07-23 17:07:28 +03:00
Ana María Martínez Gómez
8bd066afbc
Merge pull request #1602 from siddhantbajaj/flickering-test
...
Fixed flickering test
2017-07-21 16:41:57 +02:00
nasia
c6b0a1f52e
Add tests for booth controller
2017-07-21 17:34:05 +03:00
siddhantbajaj
0501ecd8f6
Refactored proposal feature spec.
...
Fixes #1561 .
2017-07-20 17:47:45 +05:30
siddhantbajaj
4779bef9f7
Fixed flickering proposal feature test
...
Test were sometimes failing because of the delay between the click_link and the actual completion of the code that is run as a result of that click.
2017-07-20 17:47:45 +05:30
Ana María Martínez Gómez
0528dbf8e8
Merge pull request #1582 from siddhantbajaj/ticket-show-page
...
Ticket show page
2017-07-20 13:56:53 +02:00
nasia
d9b2ebfc36
Add paper_trail
2017-07-18 14:18:42 +03:00
nasia
f7c0b64eb5
Introduce Booths for admin
2017-07-18 14:18:42 +03:00
Moisés Déniz Alemán
121192d21a
Merge branch 'master' into ticket-show-page
2017-07-18 12:04:21 +02:00
Moisés Déniz Alemán
29aee82a14
Merge pull request #1595 from siddhantbajaj/mail-pdf
...
Added ticket pdf prawn document
2017-07-18 12:02:57 +02:00
Moisés Déniz Alemán
4a621c34e6
Merge branch 'master' into mail-pdf
2017-07-18 11:34:10 +02:00
Stella Rouzi
526b7ed2a3
Add code of conduct file
2017-07-17 19:25:14 +03:00
Stella Rouzi
003926ea8f
Move some contributing info on wiki
2017-07-17 19:25:14 +03:00
Ana María Martínez Gómez
86b8eff4c7
Merge pull request #1588 from rahul2240/ruby-update
...
Ruby updated to version 2.4
2017-07-17 16:31:00 +02:00
