Commit graph

934 commits

Author SHA1 Message Date
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
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
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
nasia
b86472ac3c Add Call for Booths 2017-07-14 15:14:25 +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
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
siddhantbajaj
c5db5dba1e Ticket show page 2017-07-12 14:49:02 +05:30
Moisés Déniz Alemán
43b4204e30 Revert "Ticket show page" 2017-07-12 10:33:16 +02:00
siddhantbajaj
fbd4be3503 Ticket show page 2017-07-10 17:45:05 +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
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
3d4adb5683 Allow admin to show/generate ticket
Created physical ticket controller and views for admin.
2017-07-03 06:17:27 +05:30
shlok007
8839a928ed mending failing tests 2017-06-28 06:55:30 +05:30
shlok007
ad3d6f2f95 modify admin/conference_controller_spec and not authorized error messages 2017-06-28 06:55:30 +05:30
AEtherC0r3
f37d3095e1 Rework cfp abilities 2017-06-27 21:16:46 +03:00
AEtherC0r3
a1124546f1 Fix rspec tests because of the changes to the cfp
Remove redundant association
Note: a conference created with :full_conference already has a cfp
2017-06-27 21:16:46 +03:00
AEtherC0r3
2bff918556 Add index view for the cfp and modify existing ones
Add cfp_type to the form partial
Refactor Cfps#show to use partials for the different cfp types
Modify the rest of the view, where the cfp was used
2017-06-27 21:16:46 +03:00
Siddhant Bajaj
5c56683ae8 Introduced Physical Ticket
Added PhysicalTicket model and controller. It holds the information about each physical ticket bought at the purchase. Physical Tickets are created after every successfull payment.
2017-06-22 19:50:55 +05:30
Eugene Dubinin
1c38b091cc Fixes for PostreSQL support 2017-06-20 15:49:15 +03:00
Stella Rouzi
2f70a1ddd1 Avoid horizontal scroll bar 2017-06-15 13:54:06 +03:00
Dimitris
be72b9d02e Allow user to remove openid 2017-06-13 13:04:55 +03:00
shlok007
b29856a122 suggested changes 2017-06-12 19:43:44 +05:30
shlok007
cce3ff7aea creating default organization while creating a conference 2017-06-12 19:43:44 +05:30
shlok007
3fb316482c suggested changes 2017-06-12 19:43:44 +05:30
shlok007
e0d8e85808 suggested changes 2017-06-12 19:43:44 +05:30
shlok007
8edf896d86 introduce organizations 2017-06-12 19:43:44 +05:30
shlok007
ce9d2b3c5b fixes failing haml-lint in admin/conference/show 2017-06-12 18:37:50 +05:30