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
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
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
Ana María Martínez Gómez
ac0a33c2b6
Merge pull request #1698 from ViditChitkara/schedule-error
...
fixed schedule-page error
2017-09-17 22:41:37 +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
Ana María Martínez Gómez
ca5d139dc2
Merge pull request #1695 from rahul2240/revhistory
...
Add missing argument
2017-09-13 00:19:05 +02:00
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
Henne Vogelsang
cb20dca10a
Merge pull request #1694 from Ana06/fix-sql2
...
Update mariadb to 10.2 to solve Travis failures
2017-09-12 15:29:43 +02:00
Ana María Martínez Gómez
9f8836732d
Update mariadb to 10.2 to solve Travis failures
...
Our test suite is failing in Travis as it complains about not finding
`libmysqlclient-dev` which is needed for mysql2. But installing
`libmysqlclient-dev` conflicts with MariaDB 10.1. So I updated MariaDB
to 10.2 and mysql to the last version as the old one is not compatible
with MariaDB 10.2. The missed `libmysqlclient-dev` is not needed any
more.
2017-09-12 13:29:16 +02:00
namangupta01
b4d376e7be
expected_string_default_error is fixed
2017-09-12 12:11:43 +03:00
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
de1fa448a2
Merge pull request #1663 from tobru/set_loglevel
...
explicitely set log_level for production
2017-08-29 10:06:54 +02:00
