Commit graph

511 commits

Author SHA1 Message Date
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
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
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
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
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
gotens1211
f4f05b4e9b Fixes #1195 Made the charts responsive for small screens 2017-07-17 13:25:13 +03:00
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
eb23d838b5 correct past and upcoming conferences in admin/organizations#index 2017-07-12 17:42:19 +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
L11
2cc97a92f5 Remove duplicated label - target/form 2017-07-05 18:39:29 +03:00
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
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
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
nasia
8cd3326520 Add charts about sold tickets 2017-06-12 15:24:27 +03:00
selini
071ed50acb Hide recent Registrations/Submissions when conference is over 2017-06-12 12:31:31 +03:00
AEtherC0r3
02d75ec729 Fix registration sorting
Sort the 'Actions' column by registration.attended
2017-06-03 12:37:56 +03:00
AEtherC0r3
36b8088726 Replace submitter with speakers in reports#index
Also, in events#show and proposals#index

It is more relevant to check if the speakers have registered to the
conference and filled their biographies than the submitter, because,
there can be multiple speakers and the submitter isn't necessarily one
of them

And, remove admin/events/reports.html.haml, since, it isn't used anymore

Fix #1477, fix #1479
2017-05-20 18:26:45 +03:00
hitman
e73baa2754 add validation for name, used and quantity 2017-05-13 18:30:30 +03:00
AEtherC0r3
fdff485b3e Allow confirmed speakers to register anytime
If the registration period is over then speakers of confirmed events
can't register anymore. They should be able to, since they are gonna be
there anyway.

* Allow the speakers of confirmed events to register regardless of the
registration period
* Provision for registrations of confirmed speakers, so as not to
exceed the registration limit
* Add scope for registered speakers

Fix #829 and fix #802
2017-05-13 17:47:22 +03:00
Ana María Martínez Gómez
0aff947f05 Fix haml-lint error
The error was introduced when merging

https://github.com/openSUSE/osem/pull/1469

as a offense was introduced since the tests there were run
and the PR got merged.
2017-05-11 11:59:33 +02:00
selini
8a0f3c99b0 Create links for speakers in admin/reports#index 2017-05-10 10:34:45 +03:00
Eugene Dubinin
93404d543f implement user creation by admin 2017-05-08 22:54:02 +03:00
Eugene Dubinin
790e2fd3a2 implement manual event management and support for multiple speakers per event 2017-04-13 17:15:21 +03:00
nasia
7497d0394e Fix Splashpages#show so it matches splashpages#edit 2017-04-05 19:18:17 +03:00