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

2847 commits

This branch
This branch
All branches
Author SHA1 Message Date
James Mason
5e0cffb811 Merge pull request #1699 from tobru/currency_chf 
Add currency CHF
 2017-10-19 15:37:15 -07:00
James Mason
23805abffe Merge branch 'master' into error_opening_revision_history 2017-10-19 12:11:32 -07:00
James Mason
58f7e60dba Merge branch 'master' into currency_chf 2017-10-19 11:55:30 -07:00
James Mason
7113d2440e Merge pull request #1770 from ud-jindal/master 
Fixed typo.
 2017-10-19 10:07:09 -07:00
Udit Jindal
613351378f Merge branch 'master' of https://github.com/openSUSE/osem 2017-10-19 01:46:15 +05:30
Udit Jindal
3d8b32d90b fixed doubly typed route 2017-10-19 01:41:40 +05:30
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
James Mason
b80f60ed33 Merge branch 'master' into openshift_compatibility 2017-10-16 08:24:03 -07:00
James Mason
eaa8ad8005 Merge pull request #1766 from rahul2240/venue 
Add link to venue when venue is not set
 2017-10-16 08:18:33 -07: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
James Mason
2f8454a837 Merge pull request #1760 from rishabhptr/role-link 
Fixed roles link in revision_history
 2017-10-13 12:03:49 -07:00
James Mason
fc72d9e84c Merge branch 'master' into role-link 2017-10-13 11:40:34 -07:00
James Mason
fc64542202 Stabilizing a randomly failing test 2017-10-13 15:21:34 +03:00
James Mason
f2b5c2627c Require a version of nokogiri with known vulnerabilities resolved 
re: https://hakiri.io/github/openSUSE/osem/master/78eb58c93eb766505dd12319d0502c10b40a811f/warnings/b532fbd10b687d
 2017-10-13 15:21:34 +03:00
James Mason
1ac751fc7b Merge pull request #1745 from namangupta01/adding_ds_store_to_gitignore 
DS_Store file is added into the gitignore
 2017-10-12 09:43:38 -07:00
James Mason
d4492138b2 Merge branch 'master' into adding_ds_store_to_gitignore 2017-10-12 09:14:59 -07:00
James Mason
c3cf936463 Merge pull request #1737 from ViditChitkara/byebug 
added byebug_history to gitignore
 2017-10-12 09:14:22 -07:00
James Mason
dad7aba973 Merge branch 'master' into byebug 2017-10-12 08:50:09 -07:00
James Mason
3cf44587a7 Merge branch 'master' into adding_ds_store_to_gitignore 2017-10-12 08:49:20 -07:00
rishabhptr
49503444e1 Fixed roles link in revision_history 2017-10-12 21:17:23 +05:30
James Mason
6d02af3f9b Merge pull request #1755 from akshitahluwalia/hakiri-fix 
fixed hakiri xss warnings.
 2017-10-12 08:36:51 -07:00
Akshit Ahluwalia
fc48769abb fixed hakiri xss warnings. 
Fixed Hakiri XSS Warnings.
 2017-10-12 04:55:01 +05:30
Christian Bruckmayer
904ab8d4d5 Merge pull request #1754 from bear454/fix-tests 
Fix intermittent failures in track tests
 2017-10-11 10:57:30 +02:00
James Mason
d95a786d9f
Fix intermittent failures in track tests 
Boostrap's off-screen rendering was interfering with finding links
in the page layout.

The included approach should be bulletproof.
 2017-10-10 20:23:54 -07:00
Your Name
36133a995a DS_Store file is added into the gitignore 2017-10-09 18:41:24 +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
f4a084ec54 added byebug_history to gitignore 
closes #1736
 2017-10-02 22:11:23 +05:30
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
Ana María Martínez Gómez
7bfb073702 Merge pull request #1710 from rahul2240/ajax-round 
Fix decimal part limit to 2
 2017-09-20 22:34:55 +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