divyanshumehta
3409d246a8
Removed delete action from abiltiy.rb and other places
...
There was no delete action defined for proposals, but it was there in ability.rb So the ability was deleted. Fixes #1608
2017-08-09 17:16:52 +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
gotens1211
f4f05b4e9b
Fixes #1195 Made the charts responsive for small screens
2017-07-17 13:25:13 +03:00
rahul
5c0a565e8d
webmock updated
...
Updated Webmock as previous version was not compatible with the new gems
2017-07-16 22:57:51 +05:30
rahul
d4d1512c61
Updated rspec-rails and guard rspec
...
Updated this gem to fix nomethoderror old version of rspec use last_comment method which is deprecated in latest versions
2017-07-16 22:43:56 +05:30
rahul
a6f9fdbb43
Updated rails to 4.2.8
...
Rails update to 4.2.8 is necessary to get rid of Bignum and Fixnum warnings.
Ruby had two visible Integer classes: Fixnum and Bignum.
Ruby 2.4 unifies them into Integer. All C extensions which touch the Fixnum or Bignum class need to be fixed.
2017-07-16 22:43:01 +05:30
rahul
7f28ff3ac9
Updated rdoc-generator-fivefish gem
...
This update is required to update yajl-ruby 1.2 to yajl-ruby 1.3 that support ruby 2.4
2017-07-16 22:39:11 +05:30
rahul
e71b06bd57
Add ruby 2.4 to travis and vagrant
2017-07-16 22:39:11 +05:30
Svante
f9d8c9715c
Add bootstrap styling to sign in form
...
Add class `.form-control` to inputs and remove additional width styling
2017-07-15 16:15:01 +03:00
siddhantbajaj
e2a4cfd9fd
Added ticket pdf prawn document
2017-07-15 03:37:32 +05:30
Hernan Schmidt
d9a3b0de72
Fix Style/ConditionalAssignment errors
...
They did not get excluded by `--auto-gen-config`
2017-07-14 15:16:43 +02:00
Hernan Schmidt
523203ac74
Update rubocop_todo.yml
...
Generated automatically by `rubocop --auto-gen-config`
2017-07-14 15:16:43 +02:00
Hernan Schmidt
b2bd6080c2
Update Rubocop to 0.49.1
2017-07-14 15:16:43 +02:00
nasia
b86472ac3c
Add Call for Booths
2017-07-14 15:14:25 +03:00
Hernán Schmidt
4615505fcd
Merge pull request #1584 from openSUSE/update-byebug
...
Update Byebug to latest version
2017-07-14 12:51:43 +02:00
AEtherC0r3
9c58397cd2
Enable Style/IndentationWidth cop
...
The offenses were fixed manually
2017-07-14 12:47:20 +03:00
