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
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
AEtherC0r3
e3b51dfc2b
Add TrackControllers specs
2017-07-14 12:38:53 +03:00
AEtherC0r3
9671696adf
Add to_param to the Track model
...
And update the urls
2017-07-14 12:38:53 +03:00
AEtherC0r3
68fc750e9f
Implement track requests and add the track organizer role
...
About track requests:
Create migration that adds the fields submitter_id, state, and
cfp_active to Tracks
Add validations and the self_organized? method to the Track model
Create a new TracksController outide of the admin namespace
Create the relevant views for index, show, new and edit
Modify the admin views for tracks to include extra info for
self-organized tracks
About track organizers:
Create the role when a self-organized track is created
Define track organizer abilities
Modify the roles views and controller to handle the new role
The route for Roles#edit needs to have higher priority than the nested
routes for track roles, otherwise, the word edit in the url is matched
as a track with short_name edit
2017-07-14 12:38:53 +03:00
shlok007
98fc1137e1
suggested changes
2017-07-13 23:45:13 +05:30
shlok007
05fdd443a4
fix failing tests for volunteers_coordinator
2017-07-13 23:45:13 +05:30
shlok007
d26a5dcf9b
fix failing tests about accessing admin area
2017-07-13 23:45:13 +05:30
shlok007
366fced200
Move abilities for admin views in separate model
2017-07-13 23:45:13 +05:30
Hernan Schmidt
8652a5cb78
Update Byebug to latest version
2017-07-12 16:40:13 +02:00
shlok007
ea43b19ef4
add tests for new conference links
2017-07-12 19:24:22 +05:30
shlok007
ddf6f4b4c9
fix new conference links
2017-07-12 19:24:22 +05:30
shlok007
eb23d838b5
correct past and upcoming conferences in admin/organizations#index
2017-07-12 17:42:19 +05:30
Moisés Déniz Alemán
76734b3aef
Merge branch 'master' into ticket-show-page
2017-07-12 12:06:43 +02:00
siddhantbajaj
c5db5dba1e
Ticket show page
2017-07-12 14:49:02 +05:30
Moisés Déniz Alemán
036b590823
Merge pull request #1579 from siddhantbajaj/ticket-scanning
...
Added TicketScanning Model
2017-07-12 11:07:22 +02:00
Ana María Martínez Gómez
da3846a727
Merge pull request #1581 from openSUSE/revert-1575-show-page
...
Revert "Ticket show page"
2017-07-12 10:33:44 +02:00
Moisés Déniz Alemán
43b4204e30
Revert "Ticket show page"
2017-07-12 10:33:16 +02:00
Ana María Martínez Gómez
17b72da38f
Merge pull request #1575 from siddhantbajaj/show-page
...
Ticket show page
2017-07-12 10:11:55 +02:00
siddhantbajaj
c066aadae2
Added TicketScanning Model
2017-07-11 17:05:07 +05:30
siddhantbajaj
fbd4be3503
Ticket show page
2017-07-10 17:45:05 +05:30
TheAssassin
93d5e360ca
Merge dockerize commands
2017-07-09 21:38:43 +02:00
TheAssassin
6dea37ec41
Add missing environment variable
2017-07-09 21:38:43 +02:00
TheAssassin
13d6bf471d
Wait for database to be started before running MySQL client command
2017-07-09 21:38:43 +02:00
TheAssassin
ad9ef4aba3
Fix secret key generation
2017-07-09 21:38:43 +02:00
TheAssassin
b5ca626873
Fix Git ignores
2017-07-09 21:38:43 +02:00
TheAssassin
dd993b7448
Fix issue mentioned in osem/pull/1407
...
After the rebase (to update the PR with the latest changes), I had the
same issue @lguerard has had. I noticed that the rails server didn't
lisen on all interfaces any more, but bound the port to the loopback
device only. By adding the parameter `-b 0.0.0.0`, I restored the
previous behavior, and OSEM could be reached with the browser after it
started up (takes a few seconds).
2017-07-09 21:38:43 +02:00
TheAssassin
c592a19f2d
Use rails secret to generate the secret key
2017-07-09 21:38:43 +02:00
