gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-15 20:54:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
2709 commits 15 branches 2 tags 50 MiB
Commit graph

1660 commits

Author SHA1 Message Date
Your Name
e607aca680 user ability for registration is used for chcking whether a user can register or not 2017-11-02 22:56:21 +05:30
namangupta01
b1f32caf7c speaker is only ask to register when registrations are open and speaker haven't registered yet 2017-11-02 22:56:21 +05:30
namangupta01
01abbfecc4 Speaker is ask to register only when registration_period is set 2017-11-02 22:56:21 +05:30
Ana María Martínez Gómez
1d07125e7d Merge pull request #1701 from rahul2240/amount 
Add paid option in physical ticket#index
 2017-10-27 14:22:40 +02:00
Naman Gupta
aaa34c64af link is corrected 2017-10-20 23:38:59 +05:30
James Mason
c33520dbdf Merge branch 'master' into error_opening_revision_history 2017-10-19 15:37:35 -07:00
James Mason
23805abffe Merge branch 'master' into error_opening_revision_history 2017-10-19 12:11:32 -07:00
James Mason
caf2215f5b Merge branch 'master' into currency_chf 2017-10-17 07:14:13 -07:00
ViditChitkara
f44e6e5ca5 fixed openid username 
closes #1747

minor changes for styling issue
 2017-10-17 15:49:04 +03:00
James Mason
e96a5338e2 Attempting to stabilize another flaky test. 2017-10-17 15:33:04 +03:00
James Mason
8ddcd695f0 Add vendor picture interface; include in splash 
Vendor has a picture atrribute, and was displayed in one form of the
splashpage, but it wasn't exposed in the vendor editing form, nor was it
included in the "map view" on the splash page.

Additionally, the map popup was rendered inline.

This commit:
* Adds a from input for editing Venue#picture, consistent with other
  form elements
* Displays the picture on the splash page in either style (map or
  static)
* Moves the splash page map popup from inline HTML to it's own partial
 2017-10-17 15:33:04 +03:00
rahul
03c9f7deb1 Add turnover for admin 
Admin can see the turnover amount for each ticket type.
 2017-10-14 23:07:09 +05:30
rahul
0d70832f5b Add total amount spent by user 
User can see the total amount that he paid for the tickets and total amount spent by him on each ticket
 2017-10-14 23:07:08 +05:30
rahul
b761e83b45 Add amount paid 
Amount paid colum is added to ticket purchase to keep the record of money paid by the user.
It is added to physical_ticket#index to show admin, price paid by each user for each ticket.
 2017-10-14 23:06:57 +05:30
rahul
3f3cdef520 Fix decimal limit of total to 2 
Decimal limit is fixed to 2 as earlier at some values the decimal limit were crossing this limit
 2017-10-14 21:41:54 +05:30
rahul
33bfb3d3c2 Add link to venue when venue is not set 
Link to create rooms is removed from schedules#show when venue is not set as creating room without venue will show error
Closes https://github.com/openSUSE/osem/issues/1729
 2017-10-14 20:41:41 +05:30
rishabhptr
49503444e1 Fixed roles link in revision_history 2017-10-12 21:17:23 +05:30
Akshit Ahluwalia
fc48769abb fixed hakiri xss warnings. 
Fixed Hakiri XSS Warnings.
 2017-10-12 04:55:01 +05:30
Your Name
e9109614ed error opening revision history is removed 2017-10-09 18:26:41 +05:30
Your Name
78eb58c93e event export options are grouped 2017-10-08 20:02:34 +03:00
rishabhptr
3b27a2a8fb Added amount check for payments#new 2017-10-08 16:23:52 +03:00
ViditChitkara
72afae6f2f fixed error in nested comments 
closes #1738
 2017-10-08 15:19:03 +03:00
ViditChitkara
d6c7e8d97f Fixed email overflow bug in tickets pdf 
closes #1691

minor changes
 2017-10-02 11:04:12 +03:00
rahul
99e5af3217 Add full address to the ticket 
Full address is added to the ticket as earlier it was showing venue name only
 2017-10-02 09:55:58 +03:00
rahul
8dd5a14b23 Remove to_s from conference.venue.name 
name is already a string so to_s in not required
 2017-10-02 09:55:58 +03:00
rahul
ec91db86f9 Fix error while generating pdf when venue is nil 
Error in generating pdf for ticket when venue is not set is fixed.Showing venue in pdf only if venue exist.
Closes https://github.com/opensuse/osem/issues/1683
 2017-10-02 09:55:58 +03:00
rahul
be6bfb6aad Add missing : to booths and events_cfp 2017-10-02 09:54:58 +03:00
rahul
407b1838cf Add cfp type in admin/cfp#show 
@cfp.cfp_type is added to booths, events & tracks to show the cfp type.

Closes https://github.com/openSUSE/osem/issues/1679
 2017-10-02 09:54:58 +03:00
rishabhptr
568d89b620 Changed physical_ticket to plural 2017-10-02 09:53:10 +03:00
rishabhptr
2247231d6e Added amount check for payments#new 2017-10-02 09:53:10 +03:00
Ana María Martínez Gómez
7e9d1dbf84 Merge pull request #1642 from siddhantbajaj/user-present 
Improving check-in process
 2017-09-20 22:37:07 +02:00
rahul
a07df4bdb0 Fix decimal numbers limit to 2 
while calculating the row total, javascript was called and on some quantity, a number with a big decimal part was appearing.In this PR it is fixed
Fixes https://github.com/opensuse/osem/issues/1709
 2017-09-20 21:53:55 +05:30
Ana María Martínez Gómez
9eeb482190 Merge pull request #1708 from rahul2240/total 
Fix total price for tickets
 2017-09-19 10:21:13 +02:00
rahul
82b5f9083a Fix total price for tickets 
While buying the ticket, user was only able to see the integer part in total.So in javascript parseInt was replaced with parseFloat to show the decimal part too
Fixes https://github.com/openSUSE/osem/issues/1702
 2017-09-18 20:39:41 +05:30
Tobias Brunner
c9b70c22ed add CHF currency 2017-09-15 22:44:43 +02:00
ViditChitkara
c929d8e68b fixed schedule-page error 
closes #1693
 2017-09-15 15:17:45 +05:30
namangupta01
ec8fbb21d7 Showing of tracks when there are no tracks in proposals is fixed Closes #1668 2017-09-15 11:50:38 +03:00
namangupta01
c317565ec7 proposals#edit form text in track field is added 2017-09-15 11:28:40 +03:00
siddhantbajaj
69e30e7ba9 Improving check-in process 
mark user as present for the conference when user's registration ticket for that conference is scanned
 2017-09-13 22:47:22 +05:30
rahul
cceb11c73a Add missing argument 
In version/object_desc_and_link line 108, the fourth argument was missing that is added in this commit.
Closes https://github.com/opensuse/osem/issues/1689
 2017-09-12 19:40:12 +05:30
Ana María Martínez Gómez
135241a56c Merge pull request #1635 from siddhantbajaj/user-registration-ticket 
One user one registration ticket
 2017-09-07 10:30:50 +02:00
siddhantbajaj
27bf79996d One user one registration ticket 
A user cannot have more than one registration ticket per conference.
 2017-09-04 03:14:24 +05:30
Ana María Martínez Gómez
30d3296a42 Merge pull request #1653 from rahul2240/tracks 
Removed datatable if there is no data
 2017-09-01 09:17:11 +02:00
rahul
fbd11a1402 Remove datatables if there is no data 2017-08-29 22:09:40 +05:30
Ana María Martínez Gómez
9baeaf4f73 Merge pull request #1661 from rahul2240/flash-message 
Replace flash with flash.now
 2017-08-29 09:29:07 +02:00
rahul
89509519ef Replace flash with flash.now 2017-08-29 00:00:17 +05:30
rahul
b7901e54d6 Fix layout for booths and tracks 2017-08-28 21:44:39 +05:30
rahul
ac87656f46 Add hint to responsibles 2017-08-27 19:46:02 +03:00
AEtherC0r3
27fa79a826 Track related refactoring 
Add roles as nested routes to track (for the track organizer role)
Allow transition from to_accept to to_reject and backwards
Split Track#valid_dates validation to many independent ones
Show all the confirmed tracks in the conference's splashpage
Add comment in admin/Tracks#toggle_cfp_inclusion
Rewrite admin/TracksController#accept spec
Add feature spec for track requests
Change 'In' to 'Room' in Tracks#index
Rewrite Track#overlapping
Refactor code in ProposalsController
Fix typos
 2017-08-27 18:20:16 +03:00
rahul
9c4892bfc8 Change room size to capacity 2017-08-27 15:07:56 +03:00