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

2725 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
Tobias Brunner
f14d5926e1 explicitely set log_level for production 
Without this setting there is a warning displayed:

DEPRECATION WARNING: You did not specify a `log_level`
in `production.rb`
 2017-08-29 09:06:51 +02:00
Tobias Brunner
5a2c87630c adapt dir permissions for openshift and add dumb-init 
This commit updates directory permissions to be compatible with
OpenShift which starts the container with an arbitrary uid which is
member of the root group. For more information please consult
https://docs.openshift.org/latest/creating_images/guidelines.html.

dumb-init is added to have a proper PID 1. bash should not run as PID 1
as this could lead to improper container shutdown.
 2017-08-28 21:09:42 +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