Commit graph

910 commits

Author SHA1 Message Date
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
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
fa56ff7f6d Add helper function for speaker selection
The line '@users = User.all.order(:name)' is replicated a lot of times
in EventsController and ProposalsController.
So, this commit removes it and adds a helper function
'speaker_selector_input' that generates the field where the @users
variable was used.
Also, it makes the query more specific.

Fix #1455

Other changes:
* Include the username in the drop down menu
* Add .active scope to User and corresponding tests
* Add :disabled trait to User factory
2017-05-20 18:27:07 +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
Chaitanya
008ccf8b6d Add user path to Attendee and Speaker avatar in registration show page
Avatars of attendee and speaker are not linked to respective attendee and speaker. Add user path to each avatar to give more information of attendee and speaker
2017-05-13 22:14:57 +03:00
hitman
e73baa2754 add validation for name, used and quantity 2017-05-13 18:30:30 +03:00
Siddhant Bajaj
53a2246ff2 Fixed issue in notification drop down menu
Fixed an indentation issue in notification drop down layout.
2017-05-13 17:48:05 +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
divyanshumehta
f057900fb1 Added link to lodging section in splashpage's navbar 2017-05-08 15:28:28 +03:00
David Sedeño
ec71b111fe Add description to xml. fixes #1435 2017-04-25 13:35:09 +03:00
gotens1211
3ead7ef586 Removed the extra condition for displaying the first speaker image
Removed the if statement in schedule_item.html.haml file which was generating an extra img_tag for the first speaker

Fixes #1454
2017-04-17 17:40:23 +05:30
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
gotens1211
eb1e8ed238 Changed the default state of components in splashpage to selected
Mark the splashpage components to checked for the new action, also modified the display changes in splashpages test

Fixes #1340
2017-04-05 17:11:11 +05:30
Stella Rouzi
d90d2344d6 Merge pull request #1423 from nikhilgupta1211/splashpage
Added Include Venue and Lodgings to the Splashpage components
2017-04-03 13:59:44 +03:00
Ana María Martínez Gómez
f3e712a1bc Merge pull request #1319 from JewelSam/master
#1220 adding the cell size attribute to the database
2017-04-03 10:23:49 +02:00
JewelSam
f6e74461ba Add schedule interval as attribute of a program
Also, the part of the schedule event is deleted and the length of the event types
changes to the nearest suitable after changing the length of the interval.

This closes #1220
2017-04-01 21:39:20 +03:00
Ana María Martínez Gómez
93b185e8d8 Merge pull request #1370 from alator21/move_proposal_edit_to_admin
Move proposal edit to admin
2017-03-31 15:53:49 +02:00
gotens1211
bd51be45e5 Added Include Venue and Lodgings to Splashpage components
Fixes #1422
2017-03-31 15:26:59 +05:30
gotens1211
73a6e06fd3 Show event time in conference timezone
Added an application helper method `time_with_timezone` to return time with the conference timezone which solves the issue of wrong timezone in `scheule.xml` and `admin/events#show`.

Fixes #1188
2017-03-31 13:13:57 +05:30