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
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
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
nasia
c6b0a1f52e
Add tests for booth controller
2017-07-21 17:34:05 +03:00
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
4a621c34e6
Merge branch 'master' into mail-pdf
2017-07-18 11:34:10 +02:00
gotens1211
f4f05b4e9b
Fixes #1195 Made the charts responsive for small screens
2017-07-17 13:25:13 +03:00
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
nasia
b86472ac3c
Add Call for Booths
2017-07-14 15:14:25 +03: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
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
siddhantbajaj
c066aadae2
Added TicketScanning Model
2017-07-11 17:05:07 +05:30
shlok007
b33e9ed28e
fix revision count and drop observers
2017-07-09 03:36:57 +05:30
shlok007
9c6286182e
caching comment counts
2017-07-09 01:57:44 +05:30
siddhantbajaj
dd52a9b2ab
Make ticket layout configurable
...
Added option for conference organizer to switch between ticket layouts (horizontal or vertical). Added test for the same.
2017-07-07 14:19:51 +05:30
Ana María Martínez Gómez
e25de318bd
Merge pull request #1559 from siddhantbajaj/purchase-index
...
[WIP] Ticket Purchase Index Page
2017-07-06 09:28:32 +02:00
Ana María Martínez Gómez
570fec5a9f
Merge pull request #1539 from siddhantbajaj/PdfTicket
...
Sample prototype for ticket pdf
2017-07-06 09:06:33 +02:00
siddhantbajaj
a327d2cbd2
Ticket Purchase Index Page
...
List all the unpaid ticket purchases of the user for that conference and allow user to pay for them.
2017-07-06 02:46:53 +05:30
L11
2cc97a92f5
Remove duplicated label - target/form
2017-07-05 18:39:29 +03:00
siddhantbajaj
72537ba2a8
Fixed user abilities in Physical Ticket
2017-07-05 16:39:31 +05:30
siddhantbajaj
b9a540f4e2
Sample prototype for ticket pdf
...
Added verticl layout of ticket pdf without QR code.
2017-07-05 16:39:31 +05:30
AEtherC0r3
95fbd10153
Friendly urls for tracks
...
Don't use tracks ids in urls
Add short_name to tracks and use that in urls as the identifier
2017-07-04 20:42:10 +03:00
Hernán Schmidt
85a021ef05
Merge branch 'master' into org-admins-backend
2017-07-04 15:30:30 +02:00
shlok007
7d472f2ad5
fix failing tests
2017-07-04 05:55:41 +05:30
siddhantbajaj
6b3a6fa967
Fixed ticket_sold method of ticket model
2017-07-03 06:17:32 +05:30
siddhantbajaj
3d4adb5683
Allow admin to show/generate ticket
...
Created physical ticket controller and views for admin.
2017-07-03 06:17:27 +05:30
shlok007
f68fd39095
fixed abilities for conference#new and organization#new
2017-07-03 04:17:06 +05:30
shlok007
651abcab87
split feature tests for abilities and suggested changes
2017-06-30 09:18:17 +05:30
shlok007
7d408ee33c
suggested changes
...
change description of organization_admin
remove assign_role callback
2017-06-28 06:55:30 +05:30